From 9aa7f252abbd224fd1db8d1249ee172275985a48 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sat, 3 Feb 2024 07:56:59 +0000
Subject: [PATCH] Switch to nushell as default shell

Add carapace for cross-shell completion
---
 flake.nix        |  5 +++--
 home/default.nix | 21 ++++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/flake.nix b/flake.nix
index e3246399..76d04194 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,7 @@
       user = "xenia";
       system = "x86_64-linux";
       group = "users";
-      shell = "fish";
+      shell = "nushell";
       systemModules = [./system/hyprland.nix];
       serviceModules = [];
       homeModules = [./home/hyprland/default.nix];
@@ -62,7 +62,6 @@
                 efi.canTouchEfiVariables = true;
               };
               programs = {
-                ${shell}.enable = true;
                 command-not-found.enable = false;
                 nano = {
                   enable = true;
@@ -194,6 +193,7 @@
                 ];
                 fontconfig.enable = true;
               };
+              users.defaultUserShell = pkgs.bash;
               users.users = let
                 authorizedKeys.keys = [
                   "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINI1dWlS16Keil0MGPWmMsBzx8F9ylfz+fRwxUr8/tZ/ ion"
@@ -208,6 +208,7 @@
                   isNormalUser = true;
                   description = "Evie Litherland-Smith";
                   extraGroups = ["networkmanager" "wheel" "video" "input" "uinput"];
+                  useDefaultShell = false;
                   shell = pkgs.${shell};
                   initialHashedPassword = "$y$j9T$tHIPQt09Kf3KH2eIRze3g/$2mwSlcq27DTGvHNPJ5EP9/1CfL3bXP0F6oS/Vuffmn3";
                   openssh = {inherit authorizedKeys;};
diff --git a/home/default.nix b/home/default.nix
index c0588c4a..39af4ead 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -8,7 +8,7 @@
   stylix.targets.fzf.enable = true;
   programs = rec {
     bash.enable = true;
-    fish.enable = true;
+    nushell.enable = true;
     bat = {
       enable = true;
       config.theme = "Catppuccin-mocha";
@@ -39,6 +39,11 @@
         arc_color = "#89dceb";
       };
     };
+    carapace = {
+      enable = true;
+      enableBashIntegration = true;
+      enableNushellIntegration = true;
+    };
     eza = {
       enable = true;
       git = true;
@@ -56,10 +61,12 @@
     direnv = {
       enable = true;
       nix-direnv.enable = true;
+      enableBashIntegration = true;
+      enableNushellIntegration = true;
     };
     fzf = {
       enable = true;
-      enableFishIntegration = true;
+      enableBashIntegration = true;
       defaultCommand = "${pkgs.fd}/bin/fd --type f";
       changeDirWidgetCommand = "${pkgs.fd}/bin/fd --type d";
       fileWidgetCommand = "${pkgs.fd}/bin/fd --type f";
@@ -121,7 +128,8 @@
     };
     starship = {
       enable = true;
-      enableFishIntegration = true;
+      enableBashIntegration = true;
+      enableNushellIntegration = true;
       enableTransience = true;
       settings = {
         c = {symbol = " ";};
@@ -221,10 +229,9 @@
         shell = {
           disabled = false;
           format = "using [$indicator ]($style)";
-          bash_indicator = "󱆃 ";
-          fish_indicator = "󰈺 ";
-          powershell_indicator = "󰨊 ";
-          unknown_indicator = "󱔢 ";
+          bash_indicator = "#";
+          nu_indicator = "ν";
+          unknown_indicator = "?";
         };
         status = {};
         sudo = {