From 2c4885b53d776bbf789371c9e967fc20634f0a17 Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 28 Nov 2025 00:46:01 -0500 Subject: [PATCH] [def-config] remove nh --- nixosModules/default-config/nixConfig.nix | 6 ++---- nixosModules/default-config/programs/default.nix | 1 - nixosModules/default-config/programs/nh.nix | 7 ------- 3 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 nixosModules/default-config/programs/nh.nix diff --git a/nixosModules/default-config/nixConfig.nix b/nixosModules/default-config/nixConfig.nix index 1de5451e..2ba49a8b 100644 --- a/nixosModules/default-config/nixConfig.nix +++ b/nixosModules/default-config/nixConfig.nix @@ -15,8 +15,7 @@ in { nix = { enable = true; - # We use `nh.clean` instead, so this is disabled - gc.automatic = false; + gc.automatic = true; registry = lib.mapAttrs (_: v: { flake = v; }) flakeInputs; settings = { # Don't auto-accept flake-defined nix settings, they're a CVE waiting to happen. @@ -58,8 +57,7 @@ in keep-going = true; # More direnv gc root stuff keep-outputs = true; - # Show fewer log lines from failed builds since I get them from nh - log-lines = 10; + log-lines = 20; # Limit the max amount of builds max-jobs = lib.mkDefault 4; # Extra system features diff --git a/nixosModules/default-config/programs/default.nix b/nixosModules/default-config/programs/default.nix index a35dc6a1..7193f837 100644 --- a/nixosModules/default-config/programs/default.nix +++ b/nixosModules/default-config/programs/default.nix @@ -1,7 +1,6 @@ { imports = [ ./ssh.nix - ./nh.nix ]; programs.fish.enable = true; } diff --git a/nixosModules/default-config/programs/nh.nix b/nixosModules/default-config/programs/nh.nix deleted file mode 100644 index 11aebf1a..00000000 --- a/nixosModules/default-config/programs/nh.nix +++ /dev/null @@ -1,7 +0,0 @@ -_: { - programs.nh = { - enable = true; - clean.enable = true; - clean.extraArgs = "-k 5"; - }; -} -- 2.51.2