Updated Desktop dotfiles

desktop/fish/config.fish

@@ -1,10 +1,7 @@
 if status is-interactive
+    fish_add_path "/home/eesim/.cargo/bin/"
     ### Local environment variables
-    export DENO_INSTALL="/home/eesim/.deno"
-end
-
-if test (tty) = "/dev/tty1"
-    sway
+    set -x DENO_INSTALL "/home/eesim/.deno"
 end
 
 if status is-login
@@ -14,36 +11,39 @@ if status is-login
     ssh-add /home/eesim/.ssh/id_ed25519
 
     # Set environment variables in /etc/profile.d/
-    exec bash -c "test -e /etc/profile && source /etc/profile"
+    # exec bash -c "test -e /etc/profile && source /etc/profile"
 
 
 
     ### Environment Variables
 
     # Set nvim to default editor
-    set -x EDITOR = "/usr/bin/nvim"
-    set -x SUDO_EDITOR = "/usr/bin/nvim"
+    set -x EDITOR "/usr/bin/nvim"
+    set -x SUDO_EDITOR "/usr/bin/nvim"
 
     # Set R library location
-    set -x R_LIBS_USER = "/home/eesim/.local/lib/R"
+    set -x R_LIBS_USER "/home/eesim/.local/lib/R"
 
     # Disable GTK portal
-    set -x GTK_USE_PORTAL=0
+    set -x GTK_USE_PORTAL "0"
 
     # Wayland environment variables
-    set -x XDG_CURRENT_DESKTOP = "sway"
-    set -x XDG_CURRENT_SESSION = "sway"
-    set -x XDG_SESSION_TYPE = "wayland"
-    set -x ELECTRON_OZONE_PLATFORM_HINT = "auto"
-    set -x QT_QPA_PLATFORM = "wayland;xcb"
-    set -x SDL_VIDEODRIVER = "wayland,x11"
+    set -x XDG_CURRENT_DESKTOP "sway"
+    set -x XDG_CURRENT_SESSION "sway"
+    set -x XDG_SESSION_TYPE "wayland"
+    set -x ELECTRON_OZONE_PLATFORM_HINT "auto"
+    set -x QT_QPA_PLATFORM "wayland;xcb"
+    set -x SDL_VIDEODRIVER "wayland,x11"
 
     # Java fix
-    set -x _JAVA_AWT_WM_NONREPARENTING = "1"
+    set -x _JAVA_AWT_WM_NONREPARENTING "1"
 
     ### Themes
-    set -x QT_QPA_PLATFORMTHEME = "qt5ct"
+    set -x QT_QPA_PLATFORMTHEME "qt5ct"
 
-    ### Start fish
-    exec fish
 end
+
+if test (tty) = "/dev/tty1"
+    sway
+end
+