diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index 994ff17..5f3d87a 100755
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -1,6 +1,26 @@
-{ pkgs, inputs, system, ty-home-manager-options, ... }:
+{ pkgs, inputs, system, lib, ty-home-manager-options, ... }:
 {
     home.packages = (with pkgs; [
+        # :3
+        fastfetch # Modern & faster neofetch alternative
+
+        # CLI Tools
+        ripgrep # Text searching and manipulation
+        jq # JSON filtering
+        eza # Directory lister
+        bat # File reading
+        doggo # DNS Requests
+        nmap # Network scanning
+        glow # Markdown rendering
+        tealdeer # TLDR
+        usbutils # `lsusb`
+        pciutils # `lspci`
+        unzip # Extract zip files
+
+        # Process tools
+        btop # Process monitor
+        nvtopPackages.full # GPU monitor
+    ]) ++ (lib.optionals ty-home-manager-options.plasma.enable (with pkgs; [
         # Documents
         logseq # Outliner
         libreoffice-qt6-fresh # Office-style editing
@@ -29,35 +49,15 @@
         deno # Typescript & Javascript runtime
         gnumake # Makefile support
 
-        # :3
-        fastfetch # Modern & faster neofetch alternative
-
         # UI Tools
         qalculate-qt # Calculator
-
-        # CLI Tools
-        ripgrep # Text searching and manipulation
-        jq # JSON filtering
-        eza # Directory lister
-        bat # File reading
-        doggo # DNS Requests
-        nmap # Network scanning
-        glow # Markdown rendering
-        tealdeer # TLDR
-        usbutils # `lsusb`
-        pciutils # `lspci`
-        unzip # Extract zip files
-
-        # Process tools
-        btop # Process monitor
-        nvtopPackages.full # GPU monitor
-    ]) ++ [
+    ])) ++ (lib.optionals ty-home-manager-options.firefox.enable [
         # Firefox nightly
         inputs.firefox-nightly.packages.${system}.firefox-nightly-bin
-    ] ++ (with pkgs.kdePackages; [
+    ]) ++ (lib.optionals ty-home-manager-options.plasma.enable (with pkgs.kdePackages; [
         kate # IDE
         elisa # Music
         kdeconnect-kde # Phone sync
         polkit-kde-agent-1 # Polkit authentication popup support
-    ]);
+    ]));
 }