From ee1eabbd15ecb68947afb1f4a5dfc5491b777a9d Mon Sep 17 00:00:00 2001
From: Lillian-Violet <git@lillianviolet.dev>
Date: Fri, 27 Oct 2023 13:58:20 +0200
Subject: [PATCH] Update to make home-manager hopefully work

---
 flake.lock                  |  6 +++---
 flake.nix                   |  4 +++-
 nixos/EDI/configuration.nix | 12 ++++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6555b64..c9c92d4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1698250431,
-        "narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=",
+        "lastModified": 1698392685,
+        "narHash": "sha256-yx/sbRneR2AfSAeAMqUu0hoVJdjh+qhl/7dkirp8yo8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5",
+        "rev": "1369d2cefb6f128c30e42fabcdebbacc07e18b3f",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 0316422..1ee144d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,7 +82,8 @@
 
     # Standalone home-manager configuration entrypoint
     # Available through 'home-manager --flake .#your-username@your-hostname'
-    homeConfigurations = {
+    /*
+       homeConfigurations = {
       "lillian@EDI" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
         extraSpecialArgs = {inherit inputs outputs;};
@@ -103,5 +104,6 @@
         ];
       };
     };
+    */
   };
 }
diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix
index 96c084f..63c5586 100644
--- a/nixos/EDI/configuration.nix
+++ b/nixos/EDI/configuration.nix
@@ -10,7 +10,8 @@
 }: {
   # You can import other NixOS modules here
   imports = [
-    <home-manager/nixos>
+    # Import home-manager's NixOS module
+    inputs.home-manager.nixosModules.home-manager
     # If you want to use modules your own flake exports (from modules/nixos):
     # outputs.nixosModules.example
 
@@ -23,9 +24,16 @@
 
     # Import your generated (nixos-generate-config) hardware configuration
     ./hardware-configuration.nix
-    ./././home-manager/EDI-Lillian.nix
   ];
 
+  home-manager = {
+    extraSpecialArgs = { inherit inputs outputs; };
+    users = {
+      # Import your home-manager configuration
+      lillian = import .../home-manager/EDI-Lillian.nix;
+    };
+  };
+
   nixpkgs = {
     # You can add overlays here
     overlays = [