From 62db411fddcd8e522319d93d8b8724572c01d5d7 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Sat, 10 Dec 2022 12:09:55 +0100
Subject: [PATCH] update home-manager

---
 flake.lock              | 26 +++++++++++++++++++++-----
 flake.nix               |  2 +-
 home/configurations.nix | 35 -----------------------------------
 home/home/default.nix   |  2 ++
 hydra-jobs.nix          |  4 ----
 outputs.nix             |  2 --
 6 files changed, 24 insertions(+), 47 deletions(-)
 delete mode 100644 home/configurations.nix

diff --git a/flake.lock b/flake.lock
index 78d245f..e59a885 100644
--- a/flake.lock
+++ b/flake.lock
@@ -482,19 +482,20 @@
       "inputs": {
         "nixpkgs": [
           "myNixpkgs"
-        ]
+        ],
+        "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1667907331,
-        "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
+        "lastModified": 1670253003,
+        "narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
+        "rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-22.05",
+        "ref": "release-22.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -973,6 +974,21 @@
         "type": "github"
       }
     },
+    "utils_2": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "ws-butler": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 5882872..4bc1215 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
     myNixpkgs.url = github:NixOS/nixpkgs/nixos-22.11;
     flake-utils.url = github:numtide/flake-utils;
     home-manager = {
-      url = github:nix-community/home-manager/release-22.05;
+      url = github:nix-community/home-manager/release-22.11;
       inputs.nixpkgs.follows = "myNixpkgs";
     };
     nix-doom-emacs = {
diff --git a/home/configurations.nix b/home/configurations.nix
deleted file mode 100644
index 7b086a8..0000000
--- a/home/configurations.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ self
-, nixpkgs
-, home-manager
-, nix-doom-emacs
-, helix
-, ...
-} @ inputs:
-let
-  hmConfiguration =
-    { homeDirectory ? "/home/dadada"
-    , extraModules ? [ ]
-    , system ? "x86_64-linux"
-    , username ? "dadada"
-    , stateVersion
-    }: (home-manager.lib.homeManagerConfiguration {
-      configuration = { ... }: {
-        imports = (nixpkgs.lib.attrValues self.hmModules) ++ extraModules;
-
-        nixpkgs = {
-          config = import ./nixpkgs-config.nix {
-            pkgs = nixpkgs;
-          };
-        };
-
-        manual.manpages.enable = false;
-      };
-      inherit system homeDirectory username stateVersion;
-    });
-in
-{
-  home = hmConfiguration {
-    extraModules = [ ./home nix-doom-emacs.hmModule ];
-    stateVersion = "20.09";
-  };
-}
diff --git a/home/home/default.nix b/home/home/default.nix
index 6968409..a870c6b 100644
--- a/home/home/default.nix
+++ b/home/home/default.nix
@@ -21,6 +21,8 @@ let
   ];
 in
 {
+  home.stateVersion = "20.09";
+
   programs.git = {
     signing = {
       key = "D68C84695C087E0F733A28D0EEB8D1CE62C4DFEA";
diff --git a/hydra-jobs.nix b/hydra-jobs.nix
index 078386e..135b95e 100644
--- a/hydra-jobs.nix
+++ b/hydra-jobs.nix
@@ -2,8 +2,4 @@
 (nixpkgs.lib.mapAttrs'
   (name: config: nixpkgs.lib.nameValuePair name config.config.system.build.toplevel)
   self.nixosConfigurations
-) //
-(nixpkgs.lib.mapAttrs'
-  (name: config: nixpkgs.lib.nameValuePair name config.activation-script)
-  self.hmConfigurations
 ) // self.checks.x86_64-linux
diff --git a/outputs.nix b/outputs.nix
index 7b78694..dff9822 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -59,8 +59,6 @@
   }))
   // {
 
-  hmConfigurations = import ./home/configurations.nix inputs;
-
   hmModules = import ./home/modules;
 
   nixosConfigurations = import ./nixos/configurations.nix inputs;