From 80877ab429df0c84231c0df4131045b1f69bfa25 Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@roblox.com>
Date: Thu, 2 May 2024 09:47:53 -0700
Subject: drop zsh

---
 nix/profiles/home-manager/dev.nix      | 4 ----
 nix/profiles/home-manager/personal.nix | 1 -
 nix/profiles/home-manager/shell.nix    | 3 +++
 nix/profiles/home-manager/work.nix     | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'nix/profiles')

diff --git a/nix/profiles/home-manager/dev.nix b/nix/profiles/home-manager/dev.nix
index 49fe83a..740e5c6 100644
--- a/nix/profiles/home-manager/dev.nix
+++ b/nix/profiles/home-manager/dev.nix
@@ -61,10 +61,6 @@ in
     config.home.sessionVariables.GOBIN
   ];
 
-  programs.zsh.shellAliases = {
-    kc = "kubectl";
-  };
-
   home.sessionVariables = with config.xdg; {
     IPYTHONDIR = "${cacheHome}/ipython";
     PIP_LOG = "${cacheHome}/pip/pip.log";
diff --git a/nix/profiles/home-manager/personal.nix b/nix/profiles/home-manager/personal.nix
index 68bcc8f..e535bb4 100644
--- a/nix/profiles/home-manager/personal.nix
+++ b/nix/profiles/home-manager/personal.nix
@@ -9,7 +9,6 @@
     ./git.nix
     ./shell.nix
     ./ssh.nix
-    ./zsh.nix
   ];
 
   programs.git = {
diff --git a/nix/profiles/home-manager/shell.nix b/nix/profiles/home-manager/shell.nix
index dfa7f7a..1166bac 100644
--- a/nix/profiles/home-manager/shell.nix
+++ b/nix/profiles/home-manager/shell.nix
@@ -53,6 +53,8 @@
     LESSCHARSET = "utf-8";
     PAGER = "less";
     ASPELL_CONF = "conf ${config.xdg.configHome}/aspell/config;";
+    # for some reason, if I don't set this, zsh is picked up and mess up stuff.
+    SHELL = "${pkgs.fish}/bin/fish";
   };
 
   programs.alacritty = {
@@ -85,6 +87,7 @@
     baseIndex = 1;
     shortcut = "z";
     clock24 = true;
+    shell = "${pkgs.fish}/bin/fish";
     historyLimit = 50000; # Bigger buffer
     extraConfig = ''
       setw -g mouse on
diff --git a/nix/profiles/home-manager/work.nix b/nix/profiles/home-manager/work.nix
index 56b4bb3..bf32407 100644
--- a/nix/profiles/home-manager/work.nix
+++ b/nix/profiles/home-manager/work.nix
@@ -9,7 +9,6 @@
     ./git.nix
     ./shell.nix
     ./ssh.nix
-    ./zsh.nix
   ];
 
   home.packages = with pkgs; [
-- 
cgit 1.4.1