Merge remote-tracking branch 'origin/main'

disko/default.nix

@@ -183,9 +183,9 @@
             format = "gpt";
             partitions = [
               {
+                label = "EFI";
                 name = "ESP";
-                start = "1M";
+                size = "512M";
-                end = "500M";
                 bootable = true;
                 content = {
                   type = "filesystem";

modules/home-manager/dragon.nix

@@ -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";
-    };
-  };
-}

modules/home-manager/melee.nix

@@ -1,18 +1,6 @@
-{
+{inputs, ...}: {
-  # flake,
-  inputs,
-  # outputs,
-  # lib,
-  # config,
-  # pkgs,
-  # system,
-  # modulesPath,
-  ...
-}: {
   imports = [
-    {
+    {nixpkgs.overlays = [inputs.ssbm.overlay];}
-      nixpkgs.overlays = [inputs.ssbm.overlay];
-    }
     inputs.ssbm.homeManagerModule
   ];
 

modules/nixos/default.nix

@@ -9,7 +9,7 @@ with builtins;
       "desktop-usage"
       "intel"
       "pipewire"
-      "pipewire"
+      "pipewire-low-latency"
       "podman"
       "postgres"
       "sway"

modules/nixos/melee.nix

@@ -1,18 +1,11 @@
-{
+{inputs, ...}: {
-  # flake,
+  imports = [
-  inputs,
+    inputs.ssbm.nixosModule
-  # outputs,
+  ];
-  # lib,
-  # config,
-  # pkgs,
-  # system,
-  # modulesPath,
-  ...
-}: {
-  imports = [inputs.ssbm.nixosModule];
 
   ssbm = {
     cache.enable = true;
+    overlay.enabled = true;
 
     gcc = {
       rules.enable = true;

modules/nixos/sway.nix

@@ -8,10 +8,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 = {

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;
 }

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"
   ]))

nixos/dragon.nix

@@ -1,10 +1,10 @@
 {
+  # config,
   flake,
   inputs,
   outputs,
   lib,
   pkgs,
-  modulesPath,
   ...
 }: {
   networking.hostName = "dragon";
@@ -12,18 +12,12 @@
   # support interacting with the windows drive
   boot.supportedFilesystems = ["ntfs"];
 
-  imports =
+  imports = with outputs.nixosModules; [
-    [
-      (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
@@ -31,7 +25,77 @@
     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;
 

nixos/foxtrot.nix

@@ -11,18 +11,15 @@
 in {
   networking.hostName = "foxtrot";
 
-  imports =
+  imports = with outputs.nixosModules; [
-    [
     flake.diskoConfigurations.standard
     inputs.hardware.nixosModules.framework-13-7040-amd
-    ]
-    ++ (with outputs.nixosModules; [
     desktop-usage
     podman
     postgres
     wifi
     # hyprland
-    ]);
+  ];
 
   programs.steam.enable = true;
   programs.steam.remotePlay.openFirewall = true;