From 59a80481e32d127c8d897c5a60c67af475ef903c Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Sat, 19 Jul 2025 23:52:42 +0200 Subject: [PATCH 1/2] nh: switch to unstable Signed-off-by: Bloxx12 Change-Id: I6a6a6964ba5b3182dd0f37ba74d4c3498305d83e --- modules/programs/cli/nh.mod.nix | 7 +++++++ npins/sources.json | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/modules/programs/cli/nh.mod.nix b/modules/programs/cli/nh.mod.nix index 2304b8b..a6fc253 100644 --- a/modules/programs/cli/nh.mod.nix +++ b/modules/programs/cli/nh.mod.nix @@ -1,18 +1,25 @@ { config, lib, + pkgs, + sources, ... }: let cfg = config.modules.programs.nh; inherit (config.modules.other.system) username; inherit (lib.modules) mkIf; inherit (lib.options) mkEnableOption; + nh = (pkgs.callPackage "${sources.nh}/package.nix" {}).overrideAttrs (_: { + doInstallCheck = false; + }); in { options.modules.programs.nh.enable = mkEnableOption "nh"; config = mkIf cfg.enable { programs.nh = { enable = true; + package = nh; + clean.enable = true; clean.extraArgs = "--keep-since 4d --keep 3"; flake = "/home/${username}/repos/projects/nichts/main"; diff --git a/npins/sources.json b/npins/sources.json index ff0c8ef..e581118 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -71,6 +71,19 @@ "url": "https://github.com/nix-community/lanzaboote/archive/5a776450d904b7ccd377c2a759703152b2553e98.tar.gz", "hash": "sha256-9Cc0YqL9ZUpaybJsrRJfXex91QlPmQNqpTLgw/KvJGA=" }, + "nh": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "nix-community", + "repo": "nh" + }, + "branch": "master", + "submodules": false, + "revision": "a90e3124111d9c3eb64e97a5334db09a8e2a4bae", + "url": "https://github.com/nix-community/nh/archive/a90e3124111d9c3eb64e97a5334db09a8e2a4bae.tar.gz", + "hash": "sha256-KKaUEg1/ntHVsG61CkKFr2mfdsoK9Nj5FM/W1PBhe5o=" + }, "nixpkgs": { "type": "Channel", "name": "nixpkgs-unstable", From eb0b42ced463251281246533be0c30c22588e2e6 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Sun, 20 Jul 2025 00:29:38 +0200 Subject: [PATCH 2/2] npins: drop nixpkgs_2 Signed-off-by: Bloxx12 Change-Id: I6a6a69643a1a80a163373dbb2e578f99c821e78d --- npins/sources.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/npins/sources.json b/npins/sources.json index e581118..c8cebe0 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -90,11 +90,6 @@ "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre832020.6b4955211758/nixexprs.tar.xz", "hash": "sha256-X3H1JILbG//yt1OHrx7GHwyIUoqmR9jXARlwbZyPF4k=" }, - "nixpkgs_2": { - "type": "Tarball", - "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz", - "hash": "sha256-6lH+e1WGAX7sA9ey7nEcksrMVv0ZGd5TxapjfrAIbts=" - }, "npins": { "type": "Git", "repository": {