From 22fa05ca0c648c6a2652e653d13a35498e58ac8d Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 8 Dec 2023 11:49:52 +0000 Subject: [PATCH 1/2] home: packages: refactor config format --- modules/home/packages/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/home/packages/default.nix b/modules/home/packages/default.nix index be89503..6e3efcd 100644 --- a/modules/home/packages/default.nix +++ b/modules/home/packages/default.nix @@ -17,9 +17,11 @@ in }; }; - config.home.packages = with pkgs; lib.mkIf cfg.enable ([ - fd - file - ripgrep - ] ++ cfg.additionalPackages); + config = lib.mkIf cfg.enable { + home.packages = with pkgs; ([ + fd + file + ripgrep + ] ++ cfg.additionalPackages); + }; } From 16fade92b4d5ef718e0c84a1b24d5478c4bd4b9e Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 8 Dec 2023 11:50:44 +0000 Subject: [PATCH 2/2] home: packages: add 'allowAliases', 'allowUnfree' With [1], this should now be taken into account properly. [1]: https://github.com/nix-community/home-manager/pull/4304 --- modules/home/packages/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/home/packages/default.nix b/modules/home/packages/default.nix index 6e3efcd..1362a06 100644 --- a/modules/home/packages/default.nix +++ b/modules/home/packages/default.nix @@ -6,6 +6,10 @@ in options.my.home.packages = with lib; { enable = my.mkDisableOption "user packages"; + allowAliases = mkEnableOption "allow package aliases"; + + allowUnfree = my.mkDisableOption "allow unfree packages"; + additionalPackages = mkOption { type = with types; listOf package; default = [ ]; @@ -23,5 +27,9 @@ in file ripgrep ] ++ cfg.additionalPackages); + + nixpkgs.config = { + inherit (cfg) allowAliases allowUnfree; + }; }; }