diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 302e2b1..224ffaa 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -2,4 +2,9 @@ if status is-interactive
     # Commands to run in interactive sessions can go here
 end
 
+if status is-login && [ $XDG_SESSION_TYPE = wayland ]
+    set -Ux MOZ_ENABLE_WAYLAND 1
+end
+
+set -Ux RANGER_LOAD_DEFAULT_RC FALSE
 set -U fish_greeting
diff --git a/install.sh b/install.sh
index beb4f9b..bb6dd99 100755
--- a/install.sh
+++ b/install.sh
@@ -22,7 +22,6 @@ sudo chsh $USER -s /usr/bin/fish
 
 # File management
 sudo pacman -S --needed --noconfirm atool ffmpegthumbnailer highlight mediainfo python-pillow ranger transmission-cli
-fish -c "set -Ux RANGER_LOAD_DEFAULT_RC FALSE"
 
 # Audio
 sudo pacman -S --needed --noconfirm easyeffects helvum pamixer pipewire pipewire-alsa pipewire-audio pipewire-jack pipewire-pulse playerctl wireplumber
@@ -46,4 +45,3 @@ sudo pacman -S --needed --noconfirm noto-fonts noto-fonts-cjk noto-fonts-emoji n
 
 # GUI Applications
 sudo pacman -S --needed --noconfirm discord firefox kitty
-fish -c "set -Ux MOZ_ENABLE_WAYLAND 1"