From 67409c9cbfaded3d25e2e0696690874aa3b831cf Mon Sep 17 00:00:00 2001
From: Danilo Reyes <CaptainJawZ@protonmail.com>
Date: Sat, 7 Dec 2024 23:03:24 -0600
Subject: [PATCH] more packages concatenation

---
 modules/apps/gaming.nix       | 57 +++++++++++++++++------------------
 modules/apps/internet.nix     | 43 ++++++++++++--------------
 modules/dev/emacs.nix         | 57 ++++++++++++++++-------------------
 modules/servers/nextcloud.nix | 22 ++++++--------
 4 files changed, 82 insertions(+), 97 deletions(-)

diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix
index 9038364..23a3728 100644
--- a/modules/apps/gaming.nix
+++ b/modules/apps/gaming.nix
@@ -20,36 +20,33 @@
       };
     };
     users.users.jawz.packages =
-      let
-        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
+      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
-            ;
-        };
-        customPackages = [
-          # minecraft launcher
-          (pkgs.callPackage ../../pkgs/polymc/default.nix { })
-          # Super Mario 127
-          (pkgs.callPackage ../../pkgs/super-mario-127/default.nix { })
-          # 3Ds emulator
-          (pkgs.callPackage ../../pkgs/citra/default.nix { branch = "nightly"; })
-        ];
-      in
-      packages ++ customPackages;
+          # emulators
+          rpcs3 # ps3
+          pcsx2 # ps2
+          cemu # wii u
+          dolphin-emu # wii
+          snes9x-gtk # snes
+          ryujinx # switch
+          ;
+      }
+      ++ [
+        # minecraft launcher
+        (pkgs.callPackage ../../pkgs/polymc/default.nix { })
+        # Super Mario 127
+        (pkgs.callPackage ../../pkgs/super-mario-127/default.nix { })
+        # 3Ds emulator
+        (pkgs.callPackage ../../pkgs/citra/default.nix { branch = "nightly"; })
+      ];
   };
 }
diff --git a/modules/apps/internet.nix b/modules/apps/internet.nix
index 6eff87a..5c4780c 100644
--- a/modules/apps/internet.nix
+++ b/modules/apps/internet.nix
@@ -20,28 +20,25 @@
       };
     };
     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 {
-          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...?
-            ;
-        };
-      in
-      packages ++ otherPackages;
+      [
+        # video download helper assistant
+        (pkgs.callPackage ../../pkgs/vdhcoapp/default.nix { })
+        (pkgs.callPackage ../../pkgs/talk/default.nix { })
+      ]
+      ++ 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...?
+          ;
+      };
   };
 }
diff --git a/modules/dev/emacs.nix b/modules/dev/emacs.nix
index f2d9f30..3af6e05 100644
--- a/modules/dev/emacs.nix
+++ b/modules/dev/emacs.nix
@@ -25,38 +25,33 @@
       };
     };
     users.users.jawz.packages =
-      let
-        packagesDoomEverywhere = builtins.attrValues {
-          inherit (pkgs.xorg) xwininfo;
-          inherit (pkgs)
-            xdotool
-            xclip
-            wl-clipboard-rs
-            ;
-        };
-        packages = builtins.attrValues {
-          inherit (pkgs)
-            fd # modern find, faster searches
-            fzf # fuzzy finder! super cool and useful
-            ripgrep # modern grep
-            tree-sitter # code parsing based on symbols and shit, I do not get it
-            graphviz # graphs
-            tetex # export pdf
-            languagetool # proofreader for English
+      builtins.attrValues {
+        inherit (pkgs.xorg) xwininfo;
+        inherit (pkgs)
+          xdotool
+          xclip
+          wl-clipboard-rs
+          ;
+      }
+      ++ builtins.attrValues {
+        inherit (pkgs)
+          fd # modern find, faster searches
+          fzf # fuzzy finder! super cool and useful
+          ripgrep # modern grep
+          tree-sitter # code parsing based on symbols and shit, I do not get it
+          graphviz # graphs
+          tetex # export pdf
+          languagetool # proofreader for English
 
-            # lsps
-            yaml-language-server
-            markdownlint-cli
-            ;
-        };
-        packagesNode = builtins.attrValues {
-          inherit (pkgs.nodePackages)
-            vscode-json-languageserver
-            prettier # multi-language linter
-            ;
-        };
-      in
-      packages ++ packagesDoomEverywhere ++ packagesNode;
+          # lsps
+          yaml-language-server
+          markdownlint-cli
+          ;
+        inherit (pkgs.nodePackages)
+          vscode-json-languageserver
+          prettier # multi-language linter
+          ;
+      };
     services.emacs = {
       enable = true;
       package =
diff --git a/modules/servers/nextcloud.nix b/modules/servers/nextcloud.nix
index c09cc4c..8516b94 100644
--- a/modules/servers/nextcloud.nix
+++ b/modules/servers/nextcloud.nix
@@ -40,16 +40,11 @@ in
       isSystemUser = true;
       extraGroups = [ "render" ];
       packages =
-        let
-          packages = builtins.attrValues {
-            inherit (pkgs) mediainfo nodejs perl;
-          };
-
-          pythonPackages = [
-            (pkgs.python311.withPackages (ps: [ ps.tensorflow ]))
-          ];
-
-          perlPackages = pkgs.perlPackages.buildPerlPackage (
+        builtins.attrValues {
+          inherit (pkgs) mediainfo nodejs perl;
+        }
+        ++ [
+          (pkgs.perlPackages.buildPerlPackage (
             let
               version = "12.70";
             in
@@ -61,9 +56,10 @@ in
                 hash = "sha256-TLJSJEXMPj870TkExq6uraX8Wl4kmNerrSlX3LQsr/4=";
               };
             }
-          );
-        in
-        packages ++ pythonPackages ++ [ perlPackages ];
+          ))
+          (pkgs.python311.withPackages (ps: [ ps.tensorflow ]))
+        ];
+
     };
     programs.msmtp = {
       enable = true;