list concatenation

2024-12-18 13:30:55 -06:00
parent e05e6fcb45
commit 181babfa2a
4 changed files with 77 additions and 90 deletions
--- a/modules/apps/gaming.nix
+++ b/modules/apps/gaming.nix
@@ -19,32 +19,29 @@
        platformOptimizations.enable = true;
      };
    };
-    users.users.jawz.packages =
-      builtins.attrValues {
-        inherit (pkgs)
-          shipwright # zelda OoT port
-          mangohud # fps & stats overlay
-          lutris # games launcher & emulator hub
-          cartridges # games launcher
-          gamemode # optimizes linux to have better gaming performance
-          heroic # install epic games
-          protonup-qt # update proton-ge
-          ns-usbloader # load games into my switch
+    users.users.jawz.packages = builtins.attrValues {
+      inherit (pkgs)
+        shipwright # zelda OoT port
+        mangohud # fps & stats overlay
+        lutris # games launcher & emulator hub
+        cartridges # games launcher
+        gamemode # optimizes linux to have better gaming performance
+        heroic # install epic games
+        protonup-qt # update proton-ge
+        ns-usbloader # load games into my switch

-          # emulators
-          rpcs3 # ps3
-          pcsx2 # ps2
-          cemu # wii u
-          dolphin-emu # wii
-          snes9x-gtk # snes
-          ryujinx # switch
-          ;
-      }
-      ++ builtins.attrValues {
-        inherit (inputs.jawz-scripts.packages.x86_64-linux)
-          polymc # minecraft launcher
-          citra # 3Ds emulator
-          ;
-      };
+        # emulators
+        rpcs3 # ps3
+        pcsx2 # ps2
+        cemu # wii u
+        dolphin-emu # wii
+        snes9x-gtk # snes
+        ryujinx # switch
+        ;
+      inherit (inputs.jawz-scripts.packages.x86_64-linux)
+        polymc # minecraft launcher
+        citra # 3Ds emulator
+        ;
+    };
  };
 }
--- a/modules/apps/internet.nix
+++ b/modules/apps/internet.nix
@@ -20,27 +20,23 @@
        ];
      };
    };
-    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
-          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?
-          vesktop # screen share with audio discord
-          discord-ptb # :3
-          teamspeak5_client # ppl say they will use this...?
-          ;
-      };
+    users.users.jawz.packages = builtins.attrValues {
+      inherit (inputs.jawz-scripts.packages.x86_64-linux)
+        vdhcoapp # video download helper assistant
+        talk # nextcloud talk client
+        ;
+      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?
+        vesktop # screen share with audio discord
+        discord-ptb # :3
+        ;
+    };
  };
 }