diff --git a/modules/programs/cli/nh.mod.nix b/modules/programs/cli/nh.mod.nix index a6fc253..2304b8b 100644 --- a/modules/programs/cli/nh.mod.nix +++ b/modules/programs/cli/nh.mod.nix @@ -1,25 +1,18 @@ { 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 c8cebe0..ff0c8ef 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -71,25 +71,17 @@ "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", "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": {