From 689a0cdfa84bd364aed275fc27491df7e88c886c Mon Sep 17 00:00:00 2001 From: Fishandchips321 Date: Sat, 28 Feb 2026 18:29:15 +0000 Subject: [PATCH] aaaaaaaaaaaaaaaaaaaaa --- modules/graphical.nix | 7 +------ modules/yazi.nix | 25 +++++++++++-------------- systems/vm/configuration.nix | 5 +---- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/modules/graphical.nix b/modules/graphical.nix index e930b25..3a5aa27 100644 --- a/modules/graphical.nix +++ b/modules/graphical.nix @@ -2,17 +2,13 @@ let cfg = config.modules.graphical; - quickshell-packages = lib.mkIf cfg.quickshell (with pkgs; [quickshell]); in { options = { modules.graphical = { enable = lib.mkEnableOption "Enable the GUI"; - waybar = lib.mkEnableOption "Enable waybar"; - - quickshell = lib.mkEnableOption "Enable quickshell"; }; }; @@ -23,9 +19,8 @@ in environment.systemPackages = with pkgs; [ alacritty wl-clipboard - + quickshell ] - ++ quickshell-packages; programs.waybar.enable = lib.mkIf cfg.waybar true; }; diff --git a/modules/yazi.nix b/modules/yazi.nix index 53fc5ca..6a00088 100644 --- a/modules/yazi.nix +++ b/modules/yazi.nix @@ -2,23 +2,10 @@ let cfg = config.modules.yazi; - optional-packages = lib.mkIf cfg.optional-programs (with pkgs; [ - ffmpeg_7 - p7zip - jq - poppler - fd - ripgrep - fzf - zoxide - resvg - imagemagick - ]); in { options.modules.yazi = { enable = lib.mkEnableOption "Enable Yazi file manager"; - optional-programs = lib.mkEnableOption "Enable optional extra packages"; }; config = lib.mkIf cfg.enable { @@ -29,6 +16,16 @@ in environment.systemPackages = with pkgs; [ nerd-fonts.ubuntu nerd-fonts.ubuntu-mono - ] ++ optional-packages; + ffmpeg_7 + p7zip + jq + poppler + fd + ripgrep + fzf + zoxide + resvg + imagemagick + ]; }; } \ No newline at end of file diff --git a/systems/vm/configuration.nix b/systems/vm/configuration.nix index 5377647..aeae578 100644 --- a/systems/vm/configuration.nix +++ b/systems/vm/configuration.nix @@ -18,10 +18,7 @@ waybar = true; }; - modules.yazi = { - enable = true; - optional-programs = true; - }; + modules.yazi.enable = true; system.stateVersion = "25.11"; } \ No newline at end of file