From e27cd1b85d1d94405910d8390508ced08f52c7c8 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Sat, 6 Jan 2024 09:52:13 -0600 Subject: [PATCH 1/2] Sway --- modules/nixos/sway.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/nixos/sway.nix b/modules/nixos/sway.nix index 831559a..ffbce40 100644 --- a/modules/nixos/sway.nix +++ b/modules/nixos/sway.nix @@ -4,10 +4,13 @@ # services.xserver.libinput.enable = true; services.gnome.gnome-keyring.enable = true; + programs.gnupg.agent = { enable = true; - pinentryFlavor = "gnome3"; enableSSHSupport = true; + # settings = { + # pinentry-program = "/run/current-system/sw/bin/pinentry"; + # }; }; programs.sway = { From 58a425fe272fcfd38e254257e4580b4e99d8657c Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Sat, 6 Jan 2024 11:43:30 -0600 Subject: [PATCH 2/2] Dragon updates --- disko/default.nix | 4 +- modules/home-manager/dragon.nix | 71 --------------------- modules/home-manager/melee.nix | 16 +---- modules/nixos/default.nix | 2 +- modules/nixos/melee.nix | 17 ++--- nixos/base.nix | 2 +- nixos/default.nix | 11 ++-- nixos/dragon.nix | 106 +++++++++++++++++++++++++------- nixos/foxtrot.nix | 21 +++---- 9 files changed, 111 insertions(+), 139 deletions(-) delete mode 100644 modules/home-manager/dragon.nix diff --git a/disko/default.nix b/disko/default.nix index c88c0ca..03bcd39 100644 --- a/disko/default.nix +++ b/disko/default.nix @@ -183,9 +183,9 @@ format = "gpt"; partitions = [ { + label = "EFI"; name = "ESP"; - start = "1M"; - end = "500M"; + size = "512M"; bootable = true; content = { type = "filesystem"; diff --git a/modules/home-manager/dragon.nix b/modules/home-manager/dragon.nix deleted file mode 100644 index 3aabc21..0000000 --- a/modules/home-manager/dragon.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - config, - lib, - outputs, - ... -}: { - imports = with outputs.homeManagerModules; [ - melee - sway - hyprland - ]; - - wayland.windowManager.hyprland = { - settings = { - env = [ - "EWW_BAR_MON,1" - ]; - # See https://wiki.hyprland.org/Configuring/Keywords/ for more - monitor = [ - "DP-3,3840x2160@120,0x0,1" - ]; - input = { - force_no_accel = true; - sensitivity = 1; # -1.0 - 1.0, 0 means no modification. - }; - }; - }; - - wayland.windowManager.sway = { - config = { - output = { - "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307" = { - mode = "3840x2160@120Hz"; - position = "${toString (builtins.ceil (2160 / 1.5))},0"; - }; - - "Dell Inc. DELL U2720Q D3TM623" = { - # desktop left vertical monitor - mode = "3840x2160@60Hz"; - transform = "90"; - scale = "1.5"; - position = "0,0"; - }; - }; - - workspaceOutputAssign = - ( - map - (ws: { - output = "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307"; - workspace = toString ws; - }) - (lib.range 1 7) - ) - ++ ( - map - (ws: { - output = "Dell Inc. DELL U2720Q D3TM623"; - workspace = toString ws; - }) - (lib.range 8 9) - ); - }; - }; - - ssbm = { - slippi-launcher = { - isoPath = "${config.home.homeDirectory}/../games/roms/dolphin/melee.iso"; - }; - }; -} diff --git a/modules/home-manager/melee.nix b/modules/home-manager/melee.nix index 34856d1..0b8f00f 100644 --- a/modules/home-manager/melee.nix +++ b/modules/home-manager/melee.nix @@ -1,18 +1,6 @@ -{ - # flake, - inputs, - # outputs, - # lib, - # config, - # pkgs, - # system, - # modulesPath, - ... -}: { +{inputs, ...}: { imports = [ - { - nixpkgs.overlays = [inputs.ssbm.overlay]; - } + {nixpkgs.overlays = [inputs.ssbm.overlay];} inputs.ssbm.homeManagerModule ]; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index d87d117..4afed8b 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -9,7 +9,7 @@ with builtins; "desktop-usage" "intel" "pipewire" - "pipewire" + "pipewire-low-latency" "podman" "postgres" "sway" diff --git a/modules/nixos/melee.nix b/modules/nixos/melee.nix index 71d9c7e..26413f3 100644 --- a/modules/nixos/melee.nix +++ b/modules/nixos/melee.nix @@ -1,18 +1,11 @@ -{ - # flake, - inputs, - # outputs, - # lib, - # config, - # pkgs, - # system, - # modulesPath, - ... -}: { - imports = [inputs.ssbm.nixosModule]; +{inputs, ...}: { + imports = [ + inputs.ssbm.nixosModule + ]; ssbm = { cache.enable = true; + overlay.enabled = true; gcc = { rules.enable = true; diff --git a/nixos/base.nix b/nixos/base.nix index 3fc083c..332c866 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -11,6 +11,6 @@ wifi ]; - # TODO: may not work for UEFI? + # TODO: may not work for non-UEFI? boot.loader.systemd-boot.enable = true; } diff --git a/nixos/default.nix b/nixos/default.nix index 3ae4b0a..f77db56 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -6,11 +6,12 @@ with builtins; (listToAttrs (map (name: { }; }) [ "base" + "beefcake" + "dragon" + "foxtrot" + "musicbox" + "rascal" + "router" "thablet" "thinker" - "foxtrot" - "beefcake" - "rascal" - "musicbox" - "router" ])) diff --git a/nixos/dragon.nix b/nixos/dragon.nix index 709cb4b..1d71e09 100644 --- a/nixos/dragon.nix +++ b/nixos/dragon.nix @@ -1,10 +1,10 @@ { + # config, flake, inputs, outputs, lib, pkgs, - modulesPath, ... }: { networking.hostName = "dragon"; @@ -12,26 +12,90 @@ # support interacting with the windows drive boot.supportedFilesystems = ["ntfs"]; - imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") - inputs.disko.nixosModules.disko - flake.diskoConfigurations.standard - inputs.hardware.nixosModules.common-cpu-amd - inputs.hardware.nixosModules.common-pc-ssd - outputs.nixosModules.pipewire-low-latency - ] - ++ (with outputs.nixosModules; [ - common - melee - desktop-usage - podman - postgres - wifi - hyprland - printing - ewwbar - ]); + imports = with outputs.nixosModules; [ + flake.diskoConfigurations.standard + inputs.hardware.nixosModules.common-cpu-amd + inputs.hardware.nixosModules.common-pc-ssd + outputs.nixosModules.pipewire-low-latency + + desktop-usage + podman + postgres + wifi + hyprland + printing + ewwbar + melee + ]; + + home-manager.users.daniel = { + imports = with outputs.homeManagerModules; [ + sway + pass + # melee + # sway-laptop + # hyprland + ]; + + # ssbm = { + # slippi-launcher = { + # isoPath = "${config.home.homeDirectory}/../games/roms/dolphin/melee.iso"; + # }; + # }; + + wayland.windowManager.hyprland = { + settings = { + env = [ + "EWW_BAR_MON,1" + ]; + # See https://wiki.hyprland.org/Configuring/Keywords/ for more + monitor = [ + "DP-3,3840x2160@120,0x0,1" + ]; + input = { + force_no_accel = true; + sensitivity = 1; # -1.0 - 1.0, 0 means no modification. + }; + }; + }; + + wayland.windowManager.sway = { + config = { + output = { + "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307" = { + mode = "3840x2160@120Hz"; + position = "${toString (builtins.ceil (2160 / 1.5))},0"; + }; + + "Dell Inc. DELL U2720Q D3TM623" = { + # desktop left vertical monitor + mode = "3840x2160@60Hz"; + transform = "90"; + scale = "1.5"; + position = "0,0"; + }; + }; + + workspaceOutputAssign = + ( + map + (ws: { + output = "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307"; + workspace = toString ws; + }) + (lib.range 1 7) + ) + ++ ( + map + (ws: { + output = "Dell Inc. DELL U2720Q D3TM623"; + workspace = toString ws; + }) + (lib.range 8 9) + ); + }; + }; + }; services.printing.enable = true; diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix index 34d457f..8d80bb1 100644 --- a/nixos/foxtrot.nix +++ b/nixos/foxtrot.nix @@ -11,18 +11,15 @@ in { networking.hostName = "foxtrot"; - imports = - [ - flake.diskoConfigurations.standard - inputs.hardware.nixosModules.framework-13-7040-amd - ] - ++ (with outputs.nixosModules; [ - desktop-usage - podman - postgres - wifi - # hyprland - ]); + imports = with outputs.nixosModules; [ + flake.diskoConfigurations.standard + inputs.hardware.nixosModules.framework-13-7040-amd + desktop-usage + podman + postgres + wifi + # hyprland + ]; home-manager.users.daniel = { imports = with outputs.homeManagerModules; [