From c0717cd0fc05dd7fc88e6941923570b00ed55f18 Mon Sep 17 00:00:00 2001
From: ene <ene@sils.li>
Date: Sat, 11 Feb 2023 16:48:09 +0100
Subject: Fix(home-manager): Import home-manager correctly

---
 flake.nix | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'flake.nix')

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";
-- 
cgit 1.4.1