From 8c5c6ee5281e918e8b1dae48c55f7dec538cdb3b Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sun, 1 Sep 2024 08:08:11 +0100 Subject: [PATCH] Move Emacs from default.nix -> desktop.nix Remove Alacritty, use Konsole instead since already configured for Yakuake --- system/home/default.nix | 1 - system/home/desktop.nix | 2 +- system/home/plasma/default.nix | 5 ++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/system/home/default.nix b/system/home/default.nix index 0746d80e..dcd93e7b 100644 --- a/system/home/default.nix +++ b/system/home/default.nix @@ -5,7 +5,6 @@ inputs.nix-index-database.hmModules.nix-index inputs.plasma-manager.homeManagerModules.plasma-manager ./shell/default.nix - ./emacs/default.nix ./services/password-store/default.nix ./scripts/default.nix ]; diff --git a/system/home/desktop.nix b/system/home/desktop.nix index 09750ec6..973407b2 100644 --- a/system/home/desktop.nix +++ b/system/home/desktop.nix @@ -7,7 +7,7 @@ { imports = [ ./plasma/default.nix - ./alacritty/default.nix + ./emacs/default.nix ./browser/default.nix ./services/email/default.nix ]; diff --git a/system/home/plasma/default.nix b/system/home/plasma/default.nix index 09ce4d73..045fd069 100644 --- a/system/home/plasma/default.nix +++ b/system/home/plasma/default.nix @@ -304,9 +304,8 @@ { inherit AccentColor; LastUsedCustomAccentColor = AccentColor; - TerminalApplication = if config.programs.alacritty.enable then "alacritty" else "konsole"; - TerminalService = - if config.programs.alacritty.enable then "Alacritty.desktop" else "org.kde.konsole.desktop"; + TerminalApplication = "konsole"; + TerminalService = "org.kde.konsole.desktop"; }; WM = { # TODO convert to base16 colours at some point