Switch default terminal emulator back to Konsole

Pin konsole and firefox to task launcher again

Move Emacs package management out of NixOS, handle in Emacs config
instead

home/default.nix

@@ -3,7 +3,6 @@
     # Programs
     ./desktop/default.nix
     ./shell/default.nix
-    ./alacritty/default.nix
     ./emacs/default.nix
     ./browser/default.nix
     # Services

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 =
+          TerminalApplication = "konsole";
-            if config.programs.alacritty.enable
+          TerminalService = "org.kde.konsole.desktop";
-            then "alacritty"
-            else "konsole";
-          TerminalService =
-            if config.programs.alacritty.enable
-            then "Alacritty.desktop"
-            else "org.kde.konsole.desktop";
         };
         WM = {
           # TODO convert to base16 colours at some point

home/desktop/plasma/konsole.nix

@@ -1,8 +1,4 @@
-{
+{fonts, ...}: {
-  pkgs,
-  fonts,
-  ...
-}: {
   programs.konsole = {
     enable = true;
     defaultProfile = "One-Light";
@@ -16,16 +12,28 @@
       };
       extraConfig = {
         "Interaction Options" = {
-          "TextEditorCmd" = 6;
+          TextEditorCmd = 6;
-          "TextEditorCmdCustom" = "emacsclient -c +LINE:COLUMN PATH";
+          TextEditorCmdCustom = "emacsclient -c +LINE:COLUMN PATH";
-          "UnderlineFilesEnabled" = "true";
+          UnderlineFilesEnabled = true;
-          "OpenLinksByDirectClickEnabled" = "true";
+          OpenLinksByDirectClickEnabled = true;
         };
         "Terminal Features" = {
-          "BlinkingCursorEnabled" = "true";
+          BlinkingCursorEnabled = true;
-          "VerticalLine" = "false";
+          VerticalLine = false;
         };
       };
     };
+    extraConfig = {
+      MainWindow = {
+        MenuBar = "Disabled";
+      };
+      TabBar = {
+        ExpandTabWidth = true;
+        NewTabButton = true;
+      };
+      ThumbnailsSettings = {
+        ThumbnailAlt = true;
+      };
+    };
   };
 }

home/emacs/default.nix

@@ -50,29 +50,22 @@
       (add-to-list 'custom-safe-themes "${custom-theme-hash}")
       (load-theme '${custom-theme-name})
     '';
-    extraPackages = epkgs:
+    extraPackages = epkgs: with epkgs; [treesit-grammars.with-all-grammars mu4e];
-      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);
   };
   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