switch back to zsh + fix some issues

i miss fish but it's being weird :/

5 files changed, 23 insertions, 26 deletions

diff --git a/users/seth/default.nix b/users/seth/default.nix
index 6e3e8d9..909fb84 100644
--- a/users/seth/default.nix
+++ b/users/seth/default.nix
@@ -8,7 +8,7 @@
     extraGroups = [ "wheel" ];
     isNormalUser = true;
     hashedPassword = "***REMOVED***";
-    shell = pkgs.bash;
+    shell = pkgs.zsh;
   };
 
   home-manager = {
diff --git a/users/seth/shell/bash.nix b/users/seth/shell/bash.nix
index 031542b..a80f409 100644
--- a/users/seth/shell/bash.nix
+++ b/users/seth/shell/bash.nix
@@ -1,12 +1,6 @@
 { config, ... }: {
   programs.bash = {
     enable = true;
-    bashrcExtra = ''
-      if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z "$BASH_EXECUTION_STRING" ]]
-      then
-      	exec fish
-      fi
-    '';
     historyFile = "${config.xdg.stateHome}/bash/history";
     historyFileSize = 1000;
     historySize = 100;
diff --git a/users/seth/shell/default.nix b/users/seth/shell/default.nix
index 2529a48..a60470a 100644
--- a/users/seth/shell/default.nix
+++ b/users/seth/shell/default.nix
@@ -5,22 +5,25 @@
     ./zsh
   ];
 
-  home.sessionVariables = {
-    EDITOR = "nvim";
-    VISUAL = "nvim";
-    CARGO_HOME = "${config.xdg.dataHome}/cargo";
-    RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
-    LESSHISTFILE = "${config.xdg.stateHome}/less/history";
-    NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc";
-  };
+  home = {
+    sessionVariables = {
+      EDITOR = "nvim";
+      VISUAL = "nvim";
+      GPG_TTY = "$(tty)";
+      CARGO_HOME = "${config.xdg.dataHome}/cargo";
+      RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
+      LESSHISTFILE = "${config.xdg.stateHome}/less/history";
+      NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc";
+    };
 
-  home.shellAliases = {
-    ls = "exa --icons";
-    la = "ls -a";
-    diff = "diff --color=auto";
-    g = "git";
-    gs = "g status";
-    nixsw = "sudo nixos-rebuild switch";
-    nixup = "nixsw --upgrade";
+    shellAliases = {
+      ls = "exa --icons";
+      la = "ls -a";
+      diff = "diff --color=auto";
+      g = "git";
+      gs = "g status";
+      nixsw = "sudo nixos-rebuild switch";
+      nixup = "nixsw --upgrade";
+    };
   };
 }
diff --git a/users/seth/shell/fish.nix b/users/seth/shell/fish.nix
index f00174f..1cfcac1 100644
--- a/users/seth/shell/fish.nix
+++ b/users/seth/shell/fish.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }: {
   programs.fish = {
-    enable = true;
+    enable = false;
     plugins = [
       {
         name = "autopair-fish";
diff --git a/users/seth/shell/zsh/default.nix b/users/seth/shell/zsh/default.nix
index eb9145a..0b5a5dd 100644
--- a/users/seth/shell/zsh/default.nix
+++ b/users/seth/shell/zsh/default.nix
@@ -3,9 +3,8 @@
 , ...
 }: {
   programs.zsh = {
-    enable = false;
+    enable = true;
     enableAutosuggestions = true;
-    enableSyntaxHighlighting = true;
     enableVteIntegration = true;
     completionInit = ''
       autoload -Uz bashcompinit compinit
@@ -90,5 +89,6 @@
       # 	file = ".p10k.zsh";
       # }
     ];
+    enableSyntaxHighlighting = true;
   };
 }