diff --git a/hive/framework/default.nix b/hive/framework/default.nix index f68f1d9..e1872f7 100644 --- a/hive/framework/default.nix +++ b/hive/framework/default.nix @@ -9,7 +9,24 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - users.jrpotter = import ../../users/jrpotter; + users.jrpotter = args@{ pkgs, lib, ... }: + let + base = import ../../users/jrpotter args; + in + lib.attrsets.updateManyAttrsByPath [ + { + path = [ "home" "packages" ]; + update = old: old ++ (with pkgs; [ + anki-bin + bitwarden + firefox + gimp + wezterm + zotero + ]); + } + ] base; + # Used to pass non-default parameters to submodules. extraSpecialArgs = { inherit system stateVersion; }; }; diff --git a/users/jrpotter/default.nix b/users/jrpotter/default.nix index 5cdfaa3..c90c49b 100644 --- a/users/jrpotter/default.nix +++ b/users/jrpotter/default.nix @@ -24,19 +24,13 @@ in username = "jrpotter"; homeDirectory = "/home/jrpotter"; packages = with pkgs; [ - anki-bin - bitwarden bootstrap.packages.${system}.default colmena dig file - firefox - gimp mosh mullvad-vpn unzip - wezterm - zotero ]; };