From 63cc162824ff11eb6c0e51b0a4869dfa964a1280 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 16 Jul 2024 09:42:54 +0100
Subject: [PATCH] Switch to using Alacritty as default terminal emulator

Move up one level for consistency

Add some custom shell indicators for starship
---
 home/Legion.nix                          |  2 +-
 home/{desktop => }/alacritty/default.nix |  0
 home/default.nix                         |  1 +
 home/desktop/plasma/default.nix          | 10 ++++++++--
 home/desktop/plasma/konsole.nix          |  5 -----
 home/desktop/sway/default.nix            |  1 -
 home/shell/starship.nix                  |  9 ++++++++-
 7 files changed, 18 insertions(+), 10 deletions(-)
 rename home/{desktop => }/alacritty/default.nix (100%)

diff --git a/home/Legion.nix b/home/Legion.nix
index 64ba4835..56cc3661 100644
--- a/home/Legion.nix
+++ b/home/Legion.nix
@@ -1 +1 @@
-{...}: {imports = [./shell/default.nix ./emacs/default.nix];}
+{...}: {imports = [./shell/default.nix];}
diff --git a/home/desktop/alacritty/default.nix b/home/alacritty/default.nix
similarity index 100%
rename from home/desktop/alacritty/default.nix
rename to home/alacritty/default.nix
diff --git a/home/default.nix b/home/default.nix
index 3c807c7e..447d77a7 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,6 +3,7 @@
     # 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 b33e2464..8e5848cf 100644
--- a/home/desktop/plasma/default.nix
+++ b/home/desktop/plasma/default.nix
@@ -202,8 +202,14 @@
         in {
           inherit AccentColor;
           LastUsedCustomAccentColor = AccentColor;
-          TerminalApplication = "konsole";
-          TerminalService = "org.kde.konsole.desktop";
+          TerminalApplication =
+            if config.programs.alacritty.enable
+            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
diff --git a/home/desktop/plasma/konsole.nix b/home/desktop/plasma/konsole.nix
index eea5b2ac..40c50182 100644
--- a/home/desktop/plasma/konsole.nix
+++ b/home/desktop/plasma/konsole.nix
@@ -27,10 +27,5 @@
         };
       };
     };
-    extraConfig = {
-      "MainWindow" = {
-        "ToolBarsMovable" = "Disabled";
-      };
-    };
   };
 }
diff --git a/home/desktop/sway/default.nix b/home/desktop/sway/default.nix
index 5d2e6d78..21e0ee9c 100644
--- a/home/desktop/sway/default.nix
+++ b/home/desktop/sway/default.nix
@@ -12,7 +12,6 @@
 in {
   imports = [
     ../default.nix
-    ./alacritty/default.nix
     ./avizo/default.nix
     ./fuzzel/default.nix
     ./swaylock/default.nix
diff --git a/home/shell/starship.nix b/home/shell/starship.nix
index 102a3915..f5175a48 100644
--- a/home/shell/starship.nix
+++ b/home/shell/starship.nix
@@ -55,7 +55,14 @@
       python.python_binary = "python3";
       shell = {
         disabled = false;
-        format = "using [$indicator ]($style)";
+        format = "using [$indicator]($style)";
+        bash_indicator = "  ";
+        zsh_indicator = " 󱐋 ";
+        fish_indicator = "󰈺  ";
+        powershell_indicator = "  ";
+        cmd_indicator = "  ";
+        nu_indicator = " ν ";
+        unknown_indicator = "  ";
       };
       status = {
         disabled = false;