3 files changed, 13 insertions, 25 deletions
diff --git a/users/seth/shell/bash.nix b/users/seth/shell/bash.nix
index b3a1257..f9a1afa 100644
--- a/users/seth/shell/bash.nix
+++ b/users/seth/shell/bash.nix
@@ -1,16 +1,10 @@
-{
-  config,
-  standalone,
-  ...
-}: {
+{config, ...}: {
   programs.bash = {
     enable = true;
-    bashrcExtra =
-      if standalone
-      then ''
-        . ${config.home.homeDirectory}/.nix-profile/etc/profile.d/nix.sh
-      ''
-      else '''';
+    bashrcExtra = ''
+      nixfile=${config.home.homeDirectory}/.nix-profile/etc/profile.d/nix.sh
+      [ -e "$nixfile" ] && source "$nixfile"
+    '';
     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 e0e753b..a717e59 100644
--- a/users/seth/shell/default.nix
+++ b/users/seth/shell/default.nix
@@ -2,7 +2,6 @@
   imports = [
     ./bash.nix
     ./fish.nix
-    ./zsh.nix
   ];
 
   home = {
diff --git a/users/seth/shell/fish.nix b/users/seth/shell/fish.nix
index c138db5..455a052 100644
--- a/users/seth/shell/fish.nix
+++ b/users/seth/shell/fish.nix
@@ -1,7 +1,6 @@
 {
   config,
   pkgs,
-  standalone,
   ...
 }: {
   xdg.configFile."fish/themes" = {
@@ -19,18 +18,14 @@
 
   programs.fish = {
     enable = true;
-    interactiveShellInit =
-      ''
-        fish_config theme choose "Catppuccin Mocha"
-        direnv hook fish | source
-      ''
-      + (
-        if standalone
-        then ''
-          . ${config.home.homeDirectory}/.nix-profile/etc/profile.d/nix.fish
-        ''
-        else ''''
-      );
+    interactiveShellInit = ''
+      set -l nixfile ${config.home.homeDirectory}/.nix-profile/etc/profile.d/nix.fish
+      if test -e $nixfile
+      	source $nixfile
+      end
+      fish_config theme choose "Catppuccin Mocha"
+      direnv hook fish | source
+    '';
     plugins = [
       {
         name = "autopair-fish";