From 7c4e10f12ce1e58b951e43fa56a0c4cab931d4da Mon Sep 17 00:00:00 2001 From: Krzysztof Saczuk Date: Fri, 3 May 2024 22:16:34 +0200 Subject: [PATCH] refactor(nh): remove overlay --- flake.nix | 7 ------- lib/hosts.nix | 2 +- modules/desktop/apps/nh.nix | 3 ++- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index d69facf..3dc0d90 100644 --- a/flake.nix +++ b/flake.nix @@ -46,13 +46,6 @@ pkgs = import inputs.nixpkgs { inherit system; config.allowUnfree = true; - - # TODO: Replace this dirty trick when nixos 24.05 releases - overlays = [ - (final: prev: { - nh = unstable.nh; - }) - ]; }; unstable = import inputs.nixpkgs-unstable { diff --git a/lib/hosts.nix b/lib/hosts.nix index 6706aba..5b04b23 100644 --- a/lib/hosts.nix +++ b/lib/hosts.nix @@ -24,7 +24,7 @@ with lib.my; { ./../configuration.nix ./../hosts/${name}/configuration.nix - # TODO: Replace this dirty trick when nixos 24.05 releases + # TODO: Remove this when nixos 24.05 releases "${unstable.path}/nixos/modules/programs/nh.nix" inputs.home-manager.nixosModules.home-manager diff --git a/modules/desktop/apps/nh.nix b/modules/desktop/apps/nh.nix index 00de6e1..2d8edff 100644 --- a/modules/desktop/apps/nh.nix +++ b/modules/desktop/apps/nh.nix @@ -1,6 +1,7 @@ -{...}: { +{unstable, ...}: { programs.nh = { enable = true; + package = unstable.nh; clean = { enable = true; dates = "weekly";