From 2327596517284f98e8d7931b23a4bea9e9c99562 Mon Sep 17 00:00:00 2001 From: lsoriano-mcm Date: Sat, 9 Aug 2025 12:24:30 -0500 Subject: [PATCH] added more environment etc --- nix/modules/desktop/desktop.nix | 20 +++++++- nix/modules/desktop/pkgs/fuzzel.nix | 0 nix/modules/desktop/pkgs/matugen.nix | 0 nix/modules/terminal/default.nix | 5 -- nix/modules/terminal/pkgs/fish.nix | 0 nix/modules/terminal/pkgs/foot.nix | 0 nix/modules/terminal/pkgs/kitty.nix | 0 nix/modules/terminal/pkgs/starship.nix | 0 nix/modules/terminal/terminal.nix | 68 -------------------------- 9 files changed, 18 insertions(+), 75 deletions(-) delete mode 100644 nix/modules/desktop/pkgs/fuzzel.nix delete mode 100644 nix/modules/desktop/pkgs/matugen.nix delete mode 100644 nix/modules/terminal/default.nix delete mode 100644 nix/modules/terminal/pkgs/fish.nix delete mode 100644 nix/modules/terminal/pkgs/foot.nix delete mode 100644 nix/modules/terminal/pkgs/kitty.nix delete mode 100644 nix/modules/terminal/pkgs/starship.nix delete mode 100644 nix/modules/terminal/terminal.nix diff --git a/nix/modules/desktop/desktop.nix b/nix/modules/desktop/desktop.nix index f0e754c22..637f3d541 100644 --- a/nix/modules/desktop/desktop.nix +++ b/nix/modules/desktop/desktop.nix @@ -44,9 +44,25 @@ in { environment.etc."skel/.config/matugen" = { source = "../../../.config/matugen"; }; - environment.etc."skel/.config/fuzzel" = { - source = "../../../.config/fuzzel"; + environment.etc."skel/.config/foot" = { + source = "../../../.config/foot"; }; + environment.etc."skel/.config/kitty" = { + source = "../../../.config/kitty"; + }; + environment.etc."skel/.config/qt5ct" = { + source = "../../../.config/qt5ct"; + }; + environment.etc."skel/.config/qt6ct" = { + source = "../../../.config/qt6ct"; + }; + environment.etc."skel/.config/wlogout" = { + source = "../../../.config/wlogout"; + }; + environment.etc."skel/.config/Kvantum" = { + source = "../../../.config/Kvantum"; + }; + environment.systemPackages = with pkgs; # --- Illogical Impulse Audio Dependencies --- [ diff --git a/nix/modules/desktop/pkgs/fuzzel.nix b/nix/modules/desktop/pkgs/fuzzel.nix deleted file mode 100644 index e69de29bb..000000000 diff --git a/nix/modules/desktop/pkgs/matugen.nix b/nix/modules/desktop/pkgs/matugen.nix deleted file mode 100644 index e69de29bb..000000000 diff --git a/nix/modules/terminal/default.nix b/nix/modules/terminal/default.nix deleted file mode 100644 index 5de7028f0..000000000 --- a/nix/modules/terminal/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./terminal.nix - ]; -} diff --git a/nix/modules/terminal/pkgs/fish.nix b/nix/modules/terminal/pkgs/fish.nix deleted file mode 100644 index e69de29bb..000000000 diff --git a/nix/modules/terminal/pkgs/foot.nix b/nix/modules/terminal/pkgs/foot.nix deleted file mode 100644 index e69de29bb..000000000 diff --git a/nix/modules/terminal/pkgs/kitty.nix b/nix/modules/terminal/pkgs/kitty.nix deleted file mode 100644 index e69de29bb..000000000 diff --git a/nix/modules/terminal/pkgs/starship.nix b/nix/modules/terminal/pkgs/starship.nix deleted file mode 100644 index e69de29bb..000000000 diff --git a/nix/modules/terminal/terminal.nix b/nix/modules/terminal/terminal.nix deleted file mode 100644 index c154b501e..000000000 --- a/nix/modules/terminal/terminal.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - inherit - (lib) - mkIf - mkMerge - mkDefault - mkOption - types - ; - cfg = config.illogical-impulse.terminal; - - commonTerminalConfig = { - environment.systemPackages = with pkgs; [ - starship - eza - ]; - }; -in { - options = { - illogical-impulse.terminal = { - enable = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable the terminal-related configuration for this user. - ''; - }; - terminalEmulator = mkOption { - type = types.enum ["foot" "kitty"]; - default = "foot"; - description = '' - The default terminal emulator to enable for this user. - ''; - }; - }; - }; - - config = mkIf cfg.enable ( - mkMerge [ - commonTerminalConfig - - (mkIf (cfg.terminalEmulator == "foot") { - programs.foot = { - enable = true; - # Foot-specific configuration - settings = { - main.font = "FiraCode Nerd Font:size=10"; - }; - }; - }) - - (mkIf (cfg.terminalEmulator == "kitty") { - programs.kitty = { - enable = true; - settings = { - font_family = "FiraCode Nerd Font Mono"; - font_size = 10.0; - }; - }; - }) - ] - ); -}