diff --git a/modules/apps/internet.nix b/modules/apps/internet.nix index e31a161..f182404 100644 --- a/modules/apps/internet.nix +++ b/modules/apps/internet.nix @@ -112,23 +112,22 @@ in }; }; programs.geary.enable = true; - users.users.jawz.packages = - [ krisp-patcher ] - ++ builtins.attrValues { - inherit (pkgs) - thunderbird # email client - warp # transfer files with based ppl - brave # crypto-browser that at least somewhat integrates with gtk - # nextcloud-client # self-hosted google-drive alternative - fragments # beautiful torrent client - tor-browser-bundle-bin # dark web, so dark! - telegram-desktop # furry chat - nicotine-plus # remember Ares? - discord # :3 - vdhcoapp # video download helper assistant - nextcloud-talk-desktop # nextcloud talk client - fractal # matrix client - ; - }; + users.users.jawz.packages = builtins.attrValues { + inherit krisp-patcher; + inherit (pkgs) + thunderbird # email client + warp # transfer files with based ppl + brave # crypto-browser that at least somewhat integrates with gtk + # nextcloud-client # self-hosted google-drive alternative + fragments # beautiful torrent client + tor-browser-bundle-bin # dark web, so dark! + telegram-desktop # furry chat + nicotine-plus # remember Ares? + discord # :3 + vdhcoapp # video download helper assistant + nextcloud-talk-desktop # nextcloud talk client + fractal # matrix client + ; + }; }; } diff --git a/modules/dev/python.nix b/modules/dev/python.nix index 8d0a81c..237900d 100644 --- a/modules/dev/python.nix +++ b/modules/dev/python.nix @@ -20,14 +20,13 @@ let ; } ); - packages = - [ python ] - ++ builtins.attrValues { - inherit (pkgs) - pipenv # python development workflow for humans - pyright # LSP - ; - }; + packages = builtins.attrValues { + inherit python; + inherit (pkgs) + pipenv # python development workflow for humans + pyright # LSP + ; + }; in { options = { diff --git a/modules/servers/nextcloud.nix b/modules/servers/nextcloud.nix index 1b62a55..68a5228 100644 --- a/modules/servers/nextcloud.nix +++ b/modules/servers/nextcloud.nix @@ -28,6 +28,7 @@ let }; } ); + pytensorflow = pkgs.python311.withPackages (ps: [ ps.tensorflow ]); cfg = config.my.servers.nextcloud; cfgC = config.my.servers.collabora; setup = import ./setup.nix { inherit lib config; }; @@ -53,20 +54,15 @@ in users.users.nextcloud = { isSystemUser = true; extraGroups = [ "render" ]; - packages = - builtins.attrValues { - inherit (pkgs) - ffmpeg - mediainfo - nodejs - perl - ; - } - ++ [ - exiftool - (pkgs.python311.withPackages (ps: [ ps.tensorflow ])) - ]; - + packages = builtins.attrValues { + inherit exiftool pytensorflow; + inherit (pkgs) + ffmpeg + mediainfo + nodejs + perl + ; + }; }; programs.msmtp = { enable = true;