Fix(home-manager): Import home-manager correctly

2 files changed, 42 insertions, 2 deletions

diff --git a/flake.lock b/flake.lock
index 94284b5a..e68df48b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -91,7 +91,8 @@
       "inputs": {
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "strip_js_comments": "strip_js_comments"
+        "strip_js_comments": "strip_js_comments",
+        "user_js": "user_js"
       }
     },
     "strip_js_comments": {
@@ -117,6 +118,22 @@
         "url": "https://codeberg.org/ene/strip_js_comments.git"
       }
     },
+    "user_js": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1675728165,
+        "narHash": "sha256-ebSx6DaXoGKcCoK6UcDnWvdAW6J2X6pJRPD1Pw7UNOw=",
+        "owner": "arkenfox",
+        "repo": "user.js",
+        "rev": "73884850632ffe284f76881786f7d5903b917f58",
+        "type": "github"
+      },
+      "original": {
+        "owner": "arkenfox",
+        "repo": "user.js",
+        "type": "github"
+      }
+    },
     "utils": {
       "locked": {
         "lastModified": 1667395993,
diff --git a/flake.nix b/flake.nix
index 7514aeca..0ff5d4b4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,6 +12,11 @@
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    user_js = {
+      url = "github:arkenfox/user.js";
+      flake = false;
+    };
   };
 
   outputs = {
@@ -19,12 +24,30 @@
     nixpkgs,
     home-manager,
     strip_js_comments,
+    user_js,
     ...
   } @ inputs: {
     nixosConfigurations.Tiamat = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = inputs;
-      modules = [./hosts/desktop/configuration.nix (import ./home-manager/home.nix {})];
+      modules = [
+        ./hosts/desktop/configuration.nix
+        home-manager.nixosModules.home-manager
+        {
+          home-manager = {
+            useGlobalPkgs = true;
+            useUserPackages = true;
+            users.soispha = import ./home-manager;
+            extraSpecialArgs = {
+              inherit strip_js_comments;
+              inherit user_js;
+            };
+          };
+
+          # Optionally, use home-manager.extraSpecialArgs to pass
+          # arguments to home.nix
+        }
+      ];
     };
     #    nixosConfigurations.Apzu = nixpkgs.lib.nixosSystem {
     #      system = "x86_64-linux";