list concatenation

gnome.nix

@@ -36,16 +36,11 @@
     enable = true;
     style = "adwaita";
   };
-  users.users.jawz.packages =
-    builtins.attrValues {
+  users.users.jawz.packages = builtins.attrValues {
     inherit (pkgs)
-        adw-gtk3 # theme legacy applications
-        gnome-tweaks # tweaks for the gnome desktop environment
-        papirus-icon-theme # icon theme
+      # adw-gtk3 # theme legacy applications
       libgda # for pano shell extension
       ;
-    }
-    ++ builtins.attrValues {
     inherit (pkgs.gnomeExtensions)
       appindicator # applets for open applications
       tactile # window manager
@@ -53,8 +48,8 @@
       gamemode-shell-extension # I guess I'm a gamer now?
       burn-my-windows # special effects for when closing windows
       ;
-    }
-    ++ [
-      inputs.jawz-scripts.packages.x86_64-linux.pano
-    ];
+    inherit (inputs.jawz-scripts.packages.x86_64-linux)
+      pano
+      ;
+  };
 }

modules/apps/gaming.nix

@@ -19,8 +19,7 @@
         platformOptimizations.enable = true;
       };
     };
-    users.users.jawz.packages =
-      builtins.attrValues {
+    users.users.jawz.packages = builtins.attrValues {
       inherit (pkgs)
         shipwright # zelda OoT port
         mangohud # fps & stats overlay
@@ -39,8 +38,6 @@
         snes9x-gtk # snes
         ryujinx # switch
         ;
-      }
-      ++ builtins.attrValues {
       inherit (inputs.jawz-scripts.packages.x86_64-linux)
         polymc # minecraft launcher
         citra # 3Ds emulator

modules/apps/internet.nix

@@ -20,14 +20,11 @@
         ];
       };
     };
-    users.users.jawz.packages =
-      builtins.attrValues {
+    users.users.jawz.packages = builtins.attrValues {
       inherit (inputs.jawz-scripts.packages.x86_64-linux)
         vdhcoapp # video download helper assistant
         talk # nextcloud talk client
         ;
-      }
-      ++ builtins.attrValues {
       inherit (pkgs)
         thunderbird # email client
         warp # transfer files with based ppl
@@ -39,7 +36,6 @@
         nicotine-plus # remember Ares?
         vesktop # screen share with audio discord
         discord-ptb # :3
-          teamspeak5_client # ppl say they will use this...?
         ;
     };
   };

modules/dev/python.nix

@@ -10,14 +10,16 @@
     home-manager.users.jawz.xdg.configFile."python/pythonrc".source = ../../dotfiles/pythonrc;
     environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";
     users.users.jawz.packages =
-      let
-        packages = builtins.attrValues {
+      builtins.attrValues {
         inherit (pkgs)
           pipenv # python development workflow for humans
           pyright # LSP
           ;
-        };
-        pythonPackages = builtins.attrValues {
+      }
+      ++ [
+        (pkgs.python3.withPackages (
+          _ps:
+          builtins.attrValues {
             inherit (pkgs.python3Packages)
               black # Python code formatter
               editorconfig # follow rules of contributin
@@ -27,11 +29,8 @@
               pylint # bug and style checker for python
               speedtest-cli # check internet speed from the comand line
               ;
-        };
-      in
-      packages
-      ++ [
-        (pkgs.python3.withPackages (_ps: pythonPackages))
+          }
+        ))
       ];
   };
 }