From c6d82e32ae7c8e210849b13b81c57f10aadacbca Mon Sep 17 00:00:00 2001
From: macronova <trivial@invariantspace.com>
Date: Tue, 16 Apr 2024 21:53:55 -0700
Subject: [PATCH] Update flake

---
 common/default.nix |  1 -
 common/users.nix   |  5 +++-
 flake.lock         | 69 ++++++++++++----------------------------------
 flake.nix          |  1 -
 4 files changed, 21 insertions(+), 55 deletions(-)

diff --git a/common/default.nix b/common/default.nix
index 41888ca..f31187a 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -3,7 +3,6 @@
 {
   imports = with inputs; [
     home-manager.nixosModules.default
-    nh.nixosModules.default
     sops-nix.nixosModules.default
   ] ++ [
     ./constants.nix
diff --git a/common/users.nix b/common/users.nix
index fe68018..1d60093 100644
--- a/common/users.nix
+++ b/common/users.nix
@@ -86,7 +86,10 @@ in
       };
   };
 
-  programs.fish.enable = true;
+  programs = {
+    fish.enable = true;
+    nh.enable = true;
+  };
 
   services = {
     openssh = {
diff --git a/flake.lock b/flake.lock
index 847685e..6ba70db 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,11 +21,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1713152224,
-        "narHash": "sha256-k1aV06cotPwWO3FW+ho+dEoGjxNM303+UmhiG2o6XPs=",
+        "lastModified": 1713204594,
+        "narHash": "sha256-5yyHYBWFZUKXkJvOccPBeX83hH2iED54NLnWs2eWgS0=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "bb5ba68ebb73b5ca7996b64e1457fe885891e78e",
+        "rev": "d51114dc1bf3cfaba2b6644aabd16ff0c9909af5",
         "type": "github"
       },
       "original": {
@@ -88,11 +88,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1713131281,
-        "narHash": "sha256-/Jm1X9MPfLXAxZSCdWmQAFNUQggEfNWHol5jSyyzFzw=",
+        "lastModified": 1713294767,
+        "narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9f32c66a51d05e6d4ec0dea555bbff9135749ec7",
+        "rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7",
         "type": "github"
       },
       "original": {
@@ -141,28 +141,10 @@
         "type": "gitlab"
       }
     },
-    "nh": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_5"
-      },
-      "locked": {
-        "lastModified": 1712645404,
-        "narHash": "sha256-uEVd15WsX+Wti9PXW724puFcsFO72VTiJyBwW2WXT9M=",
-        "owner": "viperML",
-        "repo": "nh",
-        "rev": "fe4a96a0b0b0662dba7c186b4a1746c70bbcad03",
-        "type": "github"
-      },
-      "original": {
-        "owner": "viperML",
-        "repo": "nh",
-        "type": "github"
-      }
-    },
     "nix-custom": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_5",
         "wallpaper-engine-plasma5-plugin": "wallpaper-engine-plasma5-plugin",
         "wallpaper-engine-plasma6-plugin": "wallpaper-engine-plasma6-plugin",
         "yorha-grub-theme": "yorha-grub-theme",
@@ -284,22 +266,6 @@
       }
     },
     "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1711668574,
-        "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
       "locked": {
         "lastModified": 1711163522,
         "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
@@ -315,13 +281,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_6": {
       "locked": {
-        "lastModified": 1712963716,
-        "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
+        "lastModified": 1713248628,
+        "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
+        "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
         "type": "github"
       },
       "original": {
@@ -331,7 +297,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1712883908,
         "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=",
@@ -354,23 +320,22 @@
         "home-manager": "home-manager",
         "jovian": "jovian",
         "mailserver": "mailserver",
-        "nh": "nh",
         "nix-custom": "nix-custom",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_6",
         "sops-nix": "sops-nix"
       }
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": "nixpkgs_7",
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1713066950,
-        "narHash": "sha256-ZaefFyvt5369XdjzSw43NhfbPM9MN5b9YXhzx4lFIRc=",
+        "lastModified": 1713174909,
+        "narHash": "sha256-APoDs2GtzVrsE+Z9w72qpHzEtEDfuinWcNTN7zhwLxg=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "226062b47fe0e2130ba3ee9f4f1c880dc815cf87",
+        "rev": "cc535d07cbcdd562bcca418e475c7b1959cefa4b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index c5ef734..fabb2d8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,6 @@
     home-manager.url = "github:nix-community/home-manager";
     jovian.url = "github:Jovian-Experiments/Jovian-NixOS";
     mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
-    nh.url = "github:viperML/nh";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nix-custom.url = "git+https://forgejo.invariantspace.com/macronova/nix-custom";
     sops-nix.url = "github:Mic92/sops-nix";