From feff604e8fa291d0ecec9d207a31ec3c63797140 Mon Sep 17 00:00:00 2001 From: Mohammad Rafiq Date: Tue, 20 May 2025 12:18:06 +0800 Subject: [PATCH] refactor(homeModules/desktop): move terminal config to module --- homes/x86_64-linux/rafiq/default.nix | 4 +--- modules/home/desktop/default.nix | 1 + modules/home/desktop/terminal/default.nix | 9 +++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 modules/home/desktop/terminal/default.nix diff --git a/homes/x86_64-linux/rafiq/default.nix b/homes/x86_64-linux/rafiq/default.nix index abaccdf..b1f0617 100644 --- a/homes/x86_64-linux/rafiq/default.nix +++ b/homes/x86_64-linux/rafiq/default.nix @@ -9,6 +9,7 @@ cli.git.defaultBranch = "prime"; desktop.windowManager = "hyprland"; desktop.browser = "firefox"; + desktop.terminal = "kitty"; home.shellAliases.v = "nvim"; home.shellAliases = { @@ -24,11 +25,8 @@ fzf devenv pantheon.rebuild - kitty ]; - home.sessionVariables = { TERMINAL = "kitty"; }; - programs.direnv = { enable = true; nix-direnv.enable = true; diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix index e350b31..5d080f3 100644 --- a/modules/home/desktop/default.nix +++ b/modules/home/desktop/default.nix @@ -3,6 +3,7 @@ options.desktop = { windowManager = lib.pantheon.mkStrOption; browser = lib.pantheon.mkStrOption; + terminal = lib.pantheon.mkStrOption; }; diff --git a/modules/home/desktop/terminal/default.nix b/modules/home/desktop/terminal/default.nix new file mode 100644 index 0000000..6c5b63c --- /dev/null +++ b/modules/home/desktop/terminal/default.nix @@ -0,0 +1,9 @@ +{ config, lib, pkgs, ... }: +{ + config = lib.mkMerge [ + (lib.mkIf (config.desktop.terminal == "kitty") { + home.packages = with pkgs; [ kitty ]; + home.sessionVariables.TERMINAL = "kitty"; + }) + ]; +}