flake.lock

@@ -7,16 +7,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1703367386,
+        "lastModified": 1703838268,
-        "narHash": "sha256-FMbm48UGrBfOWGt8+opuS+uLBLQlRfhiYXhHNcYMS5k=",
+        "narHash": "sha256-SRg5nXcdPnrsQR2MTAp7en0NyJnQ2wB1ivmsgEbvN+o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224",
+        "rev": "2aff324cf65f5f98f89d878c056b779466b17db8",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
         "repo": "home-manager",
         "type": "github"
       }

flake.nix

@@ -7,28 +7,27 @@
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs: 
+  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }: 
   let
     lib = nixpkgs.lib;
     lib-unstable = nixpkgs-unstable.lib;
     username = "nullbite";
-    hmModule = home-manager.nixosModules.home-manager;
+
-    hmModuleDefaults = {
+    # to use this add `homeModules <username> [ ... ]` to a system's modules.
+    homeModules = user: modules: home-manager.nixosModules.home-manager {
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
+      home-manager.users."${user}" = {lib, config, pkgs, osConfig, ...}:
+      {
+        imports = modules;
+      };
     };
   in {
-    # for repl debugging via :lf .
-    inherit inputs;
-    vars = {
-      inherit lib lib-unstable username;
-    };
-
     nixosConfigurations = {
       slab = lib.nixosSystem {
         system = "x86_64-linux";
@@ -49,11 +48,6 @@
           ./roles/plasma.nix
           ./fragments/hardware/nvidia-modeset.nix
           ./roles/gaming.nix
-
-          hmModule (hmModuleDefaults // {
-            home-manager.users."${username}" = import ./home.nix;
-          })
-
         ];
       };
     };

home.nix

@@ -1,12 +0,0 @@
-{ lib, pkgs, osConfig, ... }:
-{
-
-  # home.username = "nullbite";
-  # home.homeDirectory = "/home/nullbite";
-
-  home.packages = with pkgs; [
-    btop
-  ];
-
-  home.stateVersion = "23.11";
-}