better concatenation of var packages

This commit is contained in:
Danilo Reyes 2025-05-28 09:06:19 -06:00
parent a9edd30f02
commit 8497c3fa69
3 changed files with 34 additions and 40 deletions

View File

@ -112,23 +112,22 @@ in
}; };
}; };
programs.geary.enable = true; programs.geary.enable = true;
users.users.jawz.packages = users.users.jawz.packages = builtins.attrValues {
[ krisp-patcher ] inherit krisp-patcher;
++ builtins.attrValues { inherit (pkgs)
inherit (pkgs) thunderbird # email client
thunderbird # email client warp # transfer files with based ppl
warp # transfer files with based ppl brave # crypto-browser that at least somewhat integrates with gtk
brave # crypto-browser that at least somewhat integrates with gtk # nextcloud-client # self-hosted google-drive alternative
# nextcloud-client # self-hosted google-drive alternative fragments # beautiful torrent client
fragments # beautiful torrent client tor-browser-bundle-bin # dark web, so dark!
tor-browser-bundle-bin # dark web, so dark! telegram-desktop # furry chat
telegram-desktop # furry chat nicotine-plus # remember Ares?
nicotine-plus # remember Ares? discord # :3
discord # :3 vdhcoapp # video download helper assistant
vdhcoapp # video download helper assistant nextcloud-talk-desktop # nextcloud talk client
nextcloud-talk-desktop # nextcloud talk client fractal # matrix client
fractal # matrix client ;
; };
};
}; };
} }

View File

@ -20,14 +20,13 @@ let
; ;
} }
); );
packages = packages = builtins.attrValues {
[ python ] inherit python;
++ builtins.attrValues { inherit (pkgs)
inherit (pkgs) pipenv # python development workflow for humans
pipenv # python development workflow for humans pyright # LSP
pyright # LSP ;
; };
};
in in
{ {
options = { options = {

View File

@ -28,6 +28,7 @@ let
}; };
} }
); );
pytensorflow = pkgs.python311.withPackages (ps: [ ps.tensorflow ]);
cfg = config.my.servers.nextcloud; cfg = config.my.servers.nextcloud;
cfgC = config.my.servers.collabora; cfgC = config.my.servers.collabora;
setup = import ./setup.nix { inherit lib config; }; setup = import ./setup.nix { inherit lib config; };
@ -53,20 +54,15 @@ in
users.users.nextcloud = { users.users.nextcloud = {
isSystemUser = true; isSystemUser = true;
extraGroups = [ "render" ]; extraGroups = [ "render" ];
packages = packages = builtins.attrValues {
builtins.attrValues { inherit exiftool pytensorflow;
inherit (pkgs) inherit (pkgs)
ffmpeg ffmpeg
mediainfo mediainfo
nodejs nodejs
perl perl
; ;
} };
++ [
exiftool
(pkgs.python311.withPackages (ps: [ ps.tensorflow ]))
];
}; };
programs.msmtp = { programs.msmtp = {
enable = true; enable = true;