refactor(packages): remove if-else hell

modules/packages.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
-  pkgs-25-11,
+  # pkgs-25-11,
+  lib,
   gamingSystem,
   workSystem,
   currentSystemDe,
@@ -13,9 +14,10 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  environment.systemPackages =
+  environment.systemPackages = with pkgs;
-    with pkgs;
+    let
-    [
+      hostSystem = pkgs.stdenv.hostPlatform.system;
+      basePackages = [
         # CLI utils
         appimage-run
         bat
@@ -60,16 +62,11 @@
 
         vim # The only and one great editor
         inputs.nixvim.packages.${stdenv.hostPlatform.system}.default # The only and one great editor improved even further
-
         inputs.spotiflac-cli.packages.${stdenv.hostPlatform.system}.default
-    ]
+      ];
-    ++ (
-      if currentSystemDe != "none" then
-        [
-          # Video card
-          vulkan-tools
 
-          # GUI applications
+      guiPackages = lib.optionals (currentSystemDe != "none") [
+        vulkan-tools
         baobab
         bazaar
         blackbox-terminal
@@ -86,13 +83,9 @@
         seahorse
         telegram-desktop
         thunderbird
-        ]
+      ];
-      else
+
-        [ ]
+      gamingPackages = lib.optionals gamingSystem [
-    )
-    ++ (
-      if gamingSystem then
-        [
         cura-appimage
         heroic
         mangohud
@@ -100,65 +93,47 @@
         prismlauncher
         protonplus
         satisfactorymodmanager
-
-          # Required for Discord RPC
         arrpc
-        ]
+      ];
-      else
+
-        [ ]
+      workPackages = lib.optionals workSystem [
-    )
-    ++ (
-      if workSystem then
-        [
         android-studio
         ansible
         virt-manager
-        ]
+      ];
-      else
+
-        [ ]
+      plasmaPackages = lib.optionals (currentSystemDe == "plasma") [
-    )
-    ++ (
-      if currentSystemDe == "plasma" then
-        [
         kdePackages.wallpaper-engine-plugin
-        ]
+      ];
-      else
+
-        [ ]
+      hyprlandPackages = lib.optionals (currentSystemDe == "hyprland") [
-    )
-    ++ (
-      if currentSystemDe == "hyprland" then
-        [
-          # Hyprland
         brightnessctl
         hyprpaper
         pamixer
         pavucontrol
         kdePackages.dolphin
-        ]
+      ];
-      else
+
-        [ ]
+      gnomePackages = lib.optionals (currentSystemDe == "gnome") [
-    )
-    ++ (
-      if currentSystemDe == "gnome" then
-        [
         gnome-tweaks
         gnomeExtensions.appindicator
         gnomeExtensions.caffeine
         gnomeExtensions.dash-to-dock
         gnomeExtensions.wallpaper-slideshow
-        ]
+      ];
-      else
-        [ ]
-    )
-    ++ (
-      if currentSystemDe == "niri" then
-        [
-          gnome-keyring
 
-          inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default
+      niriPackages = lib.optionals (currentSystemDe == "niri") [
-        ]
+        gnome-keyring
-      else
+        inputs.noctalia.packages.${hostSystem}.default
-        [ ]
+      ];
-    );
+    in
+    basePackages
+      ++ guiPackages
+      ++ gamingPackages
+      ++ workPackages
+      ++ plasmaPackages
+      ++ hyprlandPackages
+      ++ gnomePackages
+      ++ niriPackages;
 
 }