diff --git a/home/default.nix b/home/default.nix index 447d77a7..3c807c7e 100644 --- a/home/default.nix +++ b/home/default.nix @@ -3,7 +3,6 @@ # Programs ./desktop/default.nix ./shell/default.nix - ./alacritty/default.nix ./emacs/default.nix ./browser/default.nix # Services diff --git a/home/desktop/plasma/default.nix b/home/desktop/plasma/default.nix index c5034782..0a646f7a 100644 --- a/home/desktop/plasma/default.nix +++ b/home/desktop/plasma/default.nix @@ -62,13 +62,6 @@ }; hotkeys.commands = { - "launch-terminal" = let - command = config.programs.plasma.configFile.kdeglobals.General.TerminalApplication.value; - in { - inherit command; - name = "Launch ${command} emulator"; - key = "Ctrl+Alt+T"; - }; "launch-emacs" = { name = "Launch Emacs Client Window"; key = "Meta+Alt+X"; @@ -103,8 +96,10 @@ maxStripes = "1"; showToolTips = "true"; launchers = [ - "preferred://filemanager" + "applications:org.kde.konsole.desktop" "applications:emacs.desktop" + "preferred://filemanager" + "preferred://browser" ]; }; } @@ -169,7 +164,6 @@ "InvertWindow" = "Meta+Ctrl+U"; "Invert Screen Colors" = []; }; - "services/org.kde.konsole.desktop"."_launch" = []; "services/org.kde.krunner.desktop"."_launch" = ["Meta+Space" "Search" "Alt+F2"]; }; @@ -234,14 +228,8 @@ in { 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 diff --git a/home/desktop/plasma/konsole.nix b/home/desktop/plasma/konsole.nix index 40c50182..6ef94d12 100644 --- a/home/desktop/plasma/konsole.nix +++ b/home/desktop/plasma/konsole.nix @@ -1,8 +1,4 @@ -{ - pkgs, - fonts, - ... -}: { +{fonts, ...}: { programs.konsole = { enable = true; defaultProfile = "One-Light"; @@ -16,16 +12,28 @@ }; extraConfig = { "Interaction Options" = { - "TextEditorCmd" = 6; - "TextEditorCmdCustom" = "emacsclient -c +LINE:COLUMN PATH"; - "UnderlineFilesEnabled" = "true"; - "OpenLinksByDirectClickEnabled" = "true"; + TextEditorCmd = 6; + TextEditorCmdCustom = "emacsclient -c +LINE:COLUMN PATH"; + UnderlineFilesEnabled = true; + OpenLinksByDirectClickEnabled = true; }; "Terminal Features" = { - "BlinkingCursorEnabled" = "true"; - "VerticalLine" = "false"; + BlinkingCursorEnabled = true; + VerticalLine = false; }; }; }; + extraConfig = { + MainWindow = { + MenuBar = "Disabled"; + }; + TabBar = { + ExpandTabWidth = true; + NewTabButton = true; + }; + ThumbnailsSettings = { + ThumbnailAlt = true; + }; + }; }; } diff --git a/home/emacs/default.nix b/home/emacs/default.nix index 69265026..e7ab1b2d 100644 --- a/home/emacs/default.nix +++ b/home/emacs/default.nix @@ -50,29 +50,22 @@ (add-to-list 'custom-safe-themes "${custom-theme-hash}") (load-theme '${custom-theme-name}) ''; - extraPackages = epkgs: - with epkgs; - [ - # Tree-sitter grammars, not a real Emacs package - treesit-grammars.with-all-grammars - # Maildir utils with linked Emacs package - mu4e - ] - ++ (import ./emacs-packages.nix epkgs); + extraPackages = epkgs: with epkgs; [treesit-grammars.with-all-grammars mu4e]; }; home.packages = with pkgs; [ # Emacs requirements imagemagick languagetool wordnet - graphviz # For org-roam graph - mp3info # For EMMS - # Language-specific requirements + # Plugin requirements + gcc sqlite pandoc ghostscript poppler_utils + graphviz + mp3info # Customised LaTeX install (texlive.combine