From 56b29d0d7d7765e2302cd68b79519942bbfaea26 Mon Sep 17 00:00:00 2001 From: YouSiki Date: Tue, 19 Nov 2024 18:19:41 +0800 Subject: [PATCH] refactor: reorganize modules structure - Rename 'terminal' to 'graphical' for GUI-related programs - Rename 'desktop' suite to 'graphical' for better clarity - Rename 'common' suite to 'terminal' to better reflect its purpose This change improves the organization of modules by clearly separating GUI and terminal-based programs and suites. --- .../programs/{terminal => graphical}/wezterm/default.nix | 4 ++-- .../programs/{terminal => graphical}/wezterm/wezterm.lua | 0 modules/home/suites/{desktop => graphical}/default.nix | 8 ++++---- modules/home/suites/{common => terminal}/default.nix | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) rename modules/home/programs/{terminal => graphical}/wezterm/default.nix (80%) rename modules/home/programs/{terminal => graphical}/wezterm/wezterm.lua (100%) rename modules/home/suites/{desktop => graphical}/default.nix (62%) rename modules/home/suites/{common => terminal}/default.nix (84%) diff --git a/modules/home/programs/terminal/wezterm/default.nix b/modules/home/programs/graphical/wezterm/default.nix similarity index 80% rename from modules/home/programs/terminal/wezterm/default.nix rename to modules/home/programs/graphical/wezterm/default.nix index 259e4c1..29c2883 100644 --- a/modules/home/programs/terminal/wezterm/default.nix +++ b/modules/home/programs/graphical/wezterm/default.nix @@ -5,9 +5,9 @@ config, ... }: let - cfg = config.${namespace}.programs.terminal.wezterm; + cfg = config.${namespace}.programs.graphical.wezterm; in { - options.${namespace}.programs.terminal.wezterm = { + options.${namespace}.programs.graphical.wezterm = { enable = lib.mkOption { type = lib.types.bool; default = false; diff --git a/modules/home/programs/terminal/wezterm/wezterm.lua b/modules/home/programs/graphical/wezterm/wezterm.lua similarity index 100% rename from modules/home/programs/terminal/wezterm/wezterm.lua rename to modules/home/programs/graphical/wezterm/wezterm.lua diff --git a/modules/home/suites/desktop/default.nix b/modules/home/suites/graphical/default.nix similarity index 62% rename from modules/home/suites/desktop/default.nix rename to modules/home/suites/graphical/default.nix index 7e2f84c..c0718c5 100644 --- a/modules/home/suites/desktop/default.nix +++ b/modules/home/suites/graphical/default.nix @@ -4,20 +4,20 @@ config, ... }: let - cfg = config.${namespace}.suites.desktop; + cfg = config.${namespace}.suites.graphical; in { - options.${namespace}.suites.desktop = { + options.${namespace}.suites.graphical = { enable = lib.mkOption { type = lib.types.bool; default = false; - description = "Whether to enable desktop suite."; + description = "Whether to enable graphical suite."; }; }; config = lib.mkIf cfg.enable { ${namespace} = { programs = { - terminal = { + graphical = { wezterm.enable = true; }; }; diff --git a/modules/home/suites/common/default.nix b/modules/home/suites/terminal/default.nix similarity index 84% rename from modules/home/suites/common/default.nix rename to modules/home/suites/terminal/default.nix index 90ccc95..9d63ea1 100644 --- a/modules/home/suites/common/default.nix +++ b/modules/home/suites/terminal/default.nix @@ -4,13 +4,13 @@ config, ... }: let - cfg = config.${namespace}.suites.common; + cfg = config.${namespace}.suites.terminal; in { - options.${namespace}.suites.common = { + options.${namespace}.suites.terminal = { enable = lib.mkOption { type = lib.types.bool; default = false; - description = "Whether to enable common suite."; + description = "Whether to enable terminal suite."; }; };