From d5d83f24aee2cdf43f3d5a10611dda6af157a9bb Mon Sep 17 00:00:00 2001
From: Tasia Iso <tasiaiso@proton.me>
Date: Fri, 17 May 2024 17:11:50 +0200
Subject: [PATCH] stable home manager & import home-manager version per user

---
 common/base.nix                      |  2 --
 flake.lock                           | 30 ++++++++++++++++++++++++----
 flake.nix                            |  8 +++++++-
 home/46d1/home.nix                   |  9 ++++++++-
 home/tasia-but-old-username/home.nix |  9 ++++++++-
 home/tasia/home.nix                  |  9 ++++++++-
 home/user/home.nix                   |  9 ++++++++-
 hosts/stuff/configuration.nix        |  1 -
 8 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/common/base.nix b/common/base.nix
index 71d565f..7c3ab6c 100644
--- a/common/base.nix
+++ b/common/base.nix
@@ -7,8 +7,6 @@
   ...
 }: {
   imports = [
-    inputs.home-manager.nixosModules.home-manager
-
     ./components/bootloader.nix
     ./components/networking.nix
     ./components/packages-base.nix
diff --git a/flake.lock b/flake.lock
index 8ee8f49..a979a3b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,15 +3,15 @@
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs"
+          "unstable"
         ]
       },
       "locked": {
-        "lastModified": 1715486357,
-        "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
+        "lastModified": 1715930644,
+        "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
+        "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
         "type": "github"
       },
       "original": {
@@ -41,6 +41,7 @@
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "stable": "stable",
+        "stable-home-manager": "stable-home-manager",
         "unstable": "unstable"
       }
     },
@@ -60,6 +61,27 @@
         "type": "github"
       }
     },
+    "stable-home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "stable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1715381426,
+        "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-23.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "unstable": {
       "locked": {
         "lastModified": 1715787315,
diff --git a/flake.nix b/flake.nix
index a83cde2..f83032e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,7 +9,12 @@
 
     home-manager = {
       url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "unstable";
+    };
+
+    stable-home-manager = {
+      url = "github:nix-community/home-manager/release-23.11";
+      inputs.nixpkgs.follows = "stable";
     };
 
     # nixos-conf-editor.url = "github:snowfallorg/nixos-conf-editor";
@@ -22,6 +27,7 @@
     stable,
     unstable,
     home-manager,
+    stable-home-manager,
     # nixos-conf-editor,
     # nix-software-center,
     ...
diff --git a/home/46d1/home.nix b/home/46d1/home.nix
index 4b3302c..dbfe688 100644
--- a/home/46d1/home.nix
+++ b/home/46d1/home.nix
@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  imports = [
+    inputs.stable-home-manager.nixosModules.home-manager
+  ];
   users.users.user = {
     isNormalUser = true;
     description = "User";
diff --git a/home/tasia-but-old-username/home.nix b/home/tasia-but-old-username/home.nix
index c97361b..98a0ccd 100644
--- a/home/tasia-but-old-username/home.nix
+++ b/home/tasia-but-old-username/home.nix
@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+  ];
   users.users.user = {
     isNormalUser = true;
     description = "User";
diff --git a/home/tasia/home.nix b/home/tasia/home.nix
index 467fe9e..b75415a 100644
--- a/home/tasia/home.nix
+++ b/home/tasia/home.nix
@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+  ];
   users.users.tasia = {
     isNormalUser = true;
     description = "User";
diff --git a/home/user/home.nix b/home/user/home.nix
index 6609705..e8956fe 100644
--- a/home/user/home.nix
+++ b/home/user/home.nix
@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+  ];
   users.users.user = {
     isNormalUser = true;
     description = "User";
diff --git a/hosts/stuff/configuration.nix b/hosts/stuff/configuration.nix
index 7e1e292..8c1b3dd 100644
--- a/hosts/stuff/configuration.nix
+++ b/hosts/stuff/configuration.nix
@@ -17,7 +17,6 @@ in {
 
     ../../common/services/syncthing.nix
     ../../common/services/nix-gc.nix
-    # ../../common/services/sshd.nix
 
     ../../home/46d1/home.nix
   ];