diff --git a/modules/graphical.nix b/modules/graphical.nix
index abed8a8..2bec88e 100644
--- a/modules/graphical.nix
+++ b/modules/graphical.nix
@@ -19,14 +19,14 @@ in
 		programs.niri.enable = true;
 		services.displayManager.ly.enable = true;
 
-    # environment.systemPackages = with pkgs; lib.mkIf cfg.quickshell [quickshell];
+    quickshell-packages = lib.mkIf cfg.quickshell (with pkgs; [quickshell]);
 
     environment.systemPackages = with pkgs; [
       alacritty
       wl-clipboard
       
     ]
-    ++ lib.mkIf cfg.quickshell [quickshell];
+    ++ quickshell-packages;
 
     programs.waybar.enable = lib.mkIf cfg.waybar true;
 	};
diff --git a/modules/yazi.nix b/modules/yazi.nix
index 8c7a21f..5fa2482 100644
--- a/modules/yazi.nix
+++ b/modules/yazi.nix
@@ -14,11 +14,7 @@ in
       yazi.enable = true;
     };
 
-    environment.systemPackages = with pkgs; [
-      nerd-fonts.ubuntu
-      nerd-fonts.ubuntu-mono
-    ]
-    ++ lib.mkIf cfg.optional-programs (with pkgs; [
+    optional-packages = lib.mkIf cfg.optional.programs (with pkgs; [
       ffmpeg_7
       p7zip
       jq
@@ -30,5 +26,10 @@ in
       resvg
       imagemagick
     ]);
+
+    environment.systemPackages = [
+      nerd-fonts.ubuntu
+      nerd-fonts.ubuntu-mono
+    ] ++ optional-packages;
   };
 }
\ No newline at end of file