simplify and inline a lot of home-manager stuff

home-manager/flake.lock

@@ -54,11 +54,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744008831,
-        "narHash": "sha256-g3mHJLB8ShKuMaBBZxiGuoftJ22f7Boegiw5xBUnS8E=",
+        "lastModified": 1744038920,
+        "narHash": "sha256-9a4V1wQXS8hXZtc7mRtz0qINkGW+C99aDrmXY6oYBFg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f463902a3f03e15af658e48bcc60b39188ddf734",
+        "rev": "a4d8020820a85b47f842eae76ad083b0ec2a886a",
         "type": "github"
       },
       "original": {
@@ -100,11 +100,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1743943715,
-        "narHash": "sha256-9xCTf79Naq7mxvqtjgbcU9ZlNwubAep0qlwrL3GqZQQ=",
+        "lastModified": 1744068309,
+        "narHash": "sha256-4RAoQhztUI+M3XKzINEozxXWom4HOr+rvVfYaHk1Brw=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "f53eac2ea3c72dd4e9739228660f661eb27359d0",
+        "rev": "b1beb4d118baf1a31c9744ab58402ff9eeb6a333",
         "type": "github"
       },
       "original": {
@@ -148,11 +148,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743827369,
-        "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
+        "lastModified": 1743964447,
+        "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "42a1c966be226125b48c384171c44c651c236c22",
+        "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8",
         "type": "github"
       },
       "original": {
@@ -164,11 +164,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1743813633,
-        "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=",
+        "lastModified": 1743975612,
+        "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6",
+        "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928",
         "type": "github"
       },
       "original": {

home-manager/flake.nix

@@ -77,23 +77,6 @@
 
         modules = [
           ./system-${hostname}.nix
-          niri.homeModules.config
-          agenix.homeManagerModules.age
-
-          (
-            { ... }:
-            {
-              nixpkgs.overlays = [
-                rust-overlay.overlays.default
-                inputs.niri.overlays.niri
-              ];
-
-              # home-manager stuff
-              home = {
-                inherit username homeDirectory;
-              };
-            }
-          )
         ];
       };
     };

home-manager/no-gui.nix

@@ -4,6 +4,7 @@
   lib,
   homeDirectory,
   config,
+  username,
   ...
 }:
 let
@@ -48,6 +49,20 @@ in
   imports = [
     ./progs/fish.nix
     ./progs/helix.nix
+    inputs.agenix.homeManagerModules.age
+    (
+      { ... }:
+      {
+        nixpkgs.overlays = [
+          inputs.rust-overlay.overlays.default
+        ];
+
+        # home-manager stuff
+        home = {
+          inherit username homeDirectory;
+        };
+      }
+    )
   ];
 
   home.stateVersion = "24.11";

home-manager/progs/niri.nix

@@ -2,9 +2,22 @@
   config,
   pkgs,
   lib,
+  inputs,
   ...
 }:
 {
+  imports = [
+    inputs.niri.homeModules.config
+    (
+      { ... }:
+      {
+        nixpkgs.overlays = [
+          inputs.niri.overlays.niri
+        ];
+      }
+    )
+  ];
+
   programs.niri = {
     package = pkgs.niri;
     settings = {