From 2e761cb0c22103d2609deac45c88017a756c5b6e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 20:46:51 -0400 Subject: [PATCH] nh --- etcnixos/common.nix | 14 +++++++------- etcnixos/flake.lock | 6 +++--- home-manager/flake.lock | 6 +++--- justfile | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 778a456..4dd0823 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -16,13 +16,6 @@ ]; nix = { - # garbage collection and cleanup stuff - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; - }; - # optimize the store optimise.automatic = true; @@ -33,6 +26,13 @@ ]; }; + # https://github.com/viperML/nh + programs.nh = { + enable = true; + clean.enable = true; + clean.extraArgs = "--keep-since 4d --keep 3"; + }; + # kernel options boot = { kernelPackages = pkgs.linuxPackages_cachyos-lto; diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 4a27a3a..08f5826 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729468141, - "narHash": "sha256-svEr78EEBcjQJaiZpaPtk+v2g+ok8EjeSYg0AnSyPxk=", + "lastModified": 1729471405, + "narHash": "sha256-QNH6AVw/p0iMMj36RumeXNpqhFFrXyxIzAn5H+dwR+Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13bb3040aebb54bb116f2450eba78afa6ecaaffb", + "rev": "dfd24c1593f41213e73e90effbbd963a45cd9413", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 9432534..0709e7e 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -146,11 +146,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729468141, - "narHash": "sha256-svEr78EEBcjQJaiZpaPtk+v2g+ok8EjeSYg0AnSyPxk=", + "lastModified": 1729471405, + "narHash": "sha256-QNH6AVw/p0iMMj36RumeXNpqhFFrXyxIzAn5H+dwR+Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13bb3040aebb54bb116f2450eba78afa6ecaaffb", + "rev": "dfd24c1593f41213e73e90effbbd963a45cd9413", "type": "github" }, "original": { diff --git a/justfile b/justfile index a175a0e..6f39649 100644 --- a/justfile +++ b/justfile @@ -8,12 +8,12 @@ format_system: system_update: doas nix flake update --flake /etc/nixos - doas nixos-rebuild boot --impure + nh os boot /etc/nixos -- --impure home_update: nix flake update --flake ~/.config/home-manager rm -fr ~/.gtkrc-2.0 - home-manager switch --impure + nh home switch ~/.config/home-manager -- --impure sync_configs: format_home format_system rsync -a --delete /etc/nixos/ ~/projects/configs/dotfiles/etcnixos/