more packages concatenation

modules/apps/gaming.nix

@@ -20,8 +20,7 @@
       };
     };
     users.users.jawz.packages =
-      let
+      builtins.attrValues {
-        packages = builtins.attrValues {
         inherit (pkgs)
           shipwright # zelda OoT port
           mangohud # fps & stats overlay
@@ -40,8 +39,8 @@
           snes9x-gtk # snes
           ryujinx # switch
           ;
-        };
+      }
-        customPackages = [
+      ++ [
         # minecraft launcher
         (pkgs.callPackage ../../pkgs/polymc/default.nix { })
         # Super Mario 127
@@ -49,7 +48,5 @@
         # 3Ds emulator
         (pkgs.callPackage ../../pkgs/citra/default.nix { branch = "nightly"; })
       ];
-      in
-      packages ++ customPackages;
   };
 }

modules/apps/internet.nix

@@ -20,13 +20,12 @@
       };
     };
     users.users.jawz.packages =
-      let
+      [
-        otherPackages = [
         # video download helper assistant
         (pkgs.callPackage ../../pkgs/vdhcoapp/default.nix { })
         (pkgs.callPackage ../../pkgs/talk/default.nix { })
-        ];
+      ]
-        packages = builtins.attrValues {
+      ++ builtins.attrValues {
         inherit (pkgs)
           thunderbird # email client
           warp # transfer files with based ppl
@@ -41,7 +40,5 @@
           teamspeak5_client # ppl say they will use this...?
           ;
       };
-      in
-      packages ++ otherPackages;
   };
 }

modules/dev/emacs.nix

@@ -25,16 +25,15 @@
       };
     };
     users.users.jawz.packages =
-      let
+      builtins.attrValues {
-        packagesDoomEverywhere = builtins.attrValues {
         inherit (pkgs.xorg) xwininfo;
         inherit (pkgs)
           xdotool
           xclip
           wl-clipboard-rs
           ;
-        };
+      }
-        packages = builtins.attrValues {
+      ++ builtins.attrValues {
         inherit (pkgs)
           fd # modern find, faster searches
           fzf # fuzzy finder! super cool and useful
@@ -48,15 +47,11 @@
           yaml-language-server
           markdownlint-cli
           ;
-        };
-        packagesNode = builtins.attrValues {
         inherit (pkgs.nodePackages)
           vscode-json-languageserver
           prettier # multi-language linter
           ;
       };
-      in
-      packages ++ packagesDoomEverywhere ++ packagesNode;
     services.emacs = {
       enable = true;
       package =

modules/servers/nextcloud.nix

@@ -40,16 +40,11 @@ in
       isSystemUser = true;
       extraGroups = [ "render" ];
       packages =
-        let
+        builtins.attrValues {
-          packages = builtins.attrValues {
           inherit (pkgs) mediainfo nodejs perl;
-          };
+        }
-
+        ++ [
-          pythonPackages = [
+          (pkgs.perlPackages.buildPerlPackage (
-            (pkgs.python311.withPackages (ps: [ ps.tensorflow ]))
-          ];
-
-          perlPackages = pkgs.perlPackages.buildPerlPackage (
             let
               version = "12.70";
             in
@@ -61,9 +56,10 @@ in
                 hash = "sha256-TLJSJEXMPj870TkExq6uraX8Wl4kmNerrSlX3LQsr/4=";
               };
             }
-          );
+          ))
-        in
+          (pkgs.python311.withPackages (ps: [ ps.tensorflow ]))
-        packages ++ pythonPackages ++ [ perlPackages ];
+        ];
+
     };
     programs.msmtp = {
       enable = true;