@@ -86,27 +86,6 @@ "repo": "deploy-rs",         "type": "github"
       }
     },
-    "devshell": {
-      "inputs": {
-        "nixpkgs": [
-          "nh-darwin",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1722113426,
-        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
     "emacs-overlay": {
       "inputs": {
         "nixpkgs": "nixpkgs_2",
@@ -155,27 +134,6 @@ },       "original": {
         "owner": "edolstra",
         "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nh-darwin",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1725234343,
-        "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
         "type": "github"
       }
     },
@@ -324,26 +282,6 @@ "repo": "home-manager",         "type": "github"
       }
     },
-    "nh-darwin": {
-      "inputs": {
-        "devshell": "devshell",
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1734649198,
-        "narHash": "sha256-ZgHTep4WPfIeCQYP6y7ls3YFYmLxBZckZ6aPiZ1mqVA=",
-        "owner": "ToyVo",
-        "repo": "nh_darwin",
-        "rev": "5549630d2a9556209f287c6982865875a87f3e77",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ToyVo",
-        "repo": "nh_darwin",
-        "type": "github"
-      }
-    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
@@ -461,22 +399,6 @@ }     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1731755305,
-        "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
         "lastModified": 1736523798,
         "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=",
         "owner": "NixOS",
@@ -491,7 +413,7 @@ "repo": "nixpkgs",         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1734424634,
         "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
@@ -507,7 +429,7 @@ "repo": "nixpkgs",         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1730768919,
         "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=",
@@ -527,7 +449,7 @@ "pre-commit-hooks": {       "inputs": {
         "flake-compat": "flake-compat_2",
         "gitignore": "gitignore",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
@@ -552,10 +474,9 @@ "deploy-rs": "deploy-rs",         "emacs-overlay": "emacs-overlay",
         "golink": "golink",
         "home-manager": "home-manager_2",
-        "nh-darwin": "nh-darwin",
         "nix-index-database": "nix-index-database",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-small": "nixpkgs-small",
         "searchix": "searchix",
         "utils": "utils_2"
@@ -565,7 +486,7 @@ "searchix": {       "inputs": {
         "flake-utils": "flake-utils_2",
         "gomod2nix": "gomod2nix",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_4",
         "pre-commit-hooks": "pre-commit-hooks",
         "simple-css": "simple-css"
       },

@@ -10,7 +10,6 @@ darwin.inputs.nixpkgs.follows = "nixpkgs";     emacs-overlay.url = "github:nix-community/emacs-overlay";
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    nh-darwin.url = "github:ToyVo/nh_darwin";
     utils.url = "github:numtide/flake-utils";
     agenix.url = "github:ryantm/agenix";
     agenix.inputs.nixpkgs.follows = "nixpkgs";
@@ -32,7 +31,6 @@ , nixos-hardware     , emacs-overlay
     , home-manager
     , darwin
-    , nh-darwin
     , nix-index-database
     , agenix
     , deploy-rs
@@ -114,7 +112,6 @@ specialArgs = { inherit inputs; };         modules = [
           ./system/marvin.nix
           ./packages/modules/darwin/caddy
-          nh-darwin.nixDarwinModules.prebuiltin
         ];
       };
       homeConfigurations."alan@marvin" = mkHomeConfiguration {

@@ -2,7 +2,6 @@ { pkgs, ... }: {   imports = [
     ./settings/darwin.nix
     ./settings/dev.nix
-    ./settings/programs/nh.nix
     ./settings/programs/shell.nix
   ];
 

@@ -1,20 +0,0 @@-{ config, ... }: {
-  programs.nh =
-    let
-      flake = builtins.toString ../../..;
-    in
-    {
-      enable = true;
-      os = {
-        inherit flake;
-      };
-      home = {
-        inherit flake;
-      };
-      clean = {
-        enable = true;
-        extraArgs = "--keep-since 14d";
-      };
-    };
-  nix.gc.automatic = !config.programs.nh.clean.enable;
-}

@@ -97,8 +97,8 @@ };   };
 
   home.shellAliases = {
-    rb = "nh os";
-    rbs = "nh os switch";
+    rb = "darwin-rebuild";
+    rbs = "darwin-rebuild switch --flake '.?submodules=1'";
 
     dig = "dig +noall +answer";
 

@@ -5,9 +5,8 @@ ./nixpkgs.nix   ];
 
   home.shellAliases = {
-    srb = "nh os";
-    rbs = "nh os switch";
-    rbb = "nh os boot";
+    rbs = "nixos-rebuild switch --flake '.?submodules=1'";
+    rbb = "nixos-rebuild boot --flake '.?submodules=1'";
     rbr = "nixos-rebuild switch --rollback";
   };
 }

@@ -113,8 +113,8 @@ gmup = "git mup";       grup = "git rup";
 
       ho = "home-manager";
-      hob = "nh home build";
-      hos = "nh home switch -b hm_bak_$(date +%Y%m%d%H%M)";
+      hob = "home-manager build";
+      hos = "home-manager switch --flake '.?submodules=1' -b hm_bak_$(date +%Y%m%d%H%M)";
       hon = "home-manager news";
       hoh = "home-manager help";
       hop = "home-manager packages";