diff --git a/.config/environment.d/10-locale.conf b/.config/environment.d/10-locale.conf
new file mode 100644
index 0000000..d45921e
--- /dev/null
+++ b/.config/environment.d/10-locale.conf
@@ -0,0 +1,4 @@
+LANG=en_US.UTF-8
+LANGUAGE=en_US
+LC_MONETARY=de_DE.UTF-8
+LC_TIME=de_DE.UTF-8
diff --git a/.config/environment.d/50-wayland.conf b/.config/environment.d/50-wayland.conf
new file mode 100644
index 0000000..f2c4af7
--- /dev/null
+++ b/.config/environment.d/50-wayland.conf
@@ -0,0 +1,3 @@
+MOZ_ENABLE_WAYLAND=1
+QT_QPA_PLATFORM=wayland-egl
+WLR_DRM_NO_MODIFIERS=1
diff --git a/.config/environment.d/90-pass.conf b/.config/environment.d/90-pass.conf
new file mode 100644
index 0000000..a3dc278
--- /dev/null
+++ b/.config/environment.d/90-pass.conf
@@ -0,0 +1,2 @@
+PASSWORD_STORE_CHARACTER_SET=a-zA-Z0-9~!@#$%*()-_=+[]{};:,.<>?
+PASSWORD_STORE_GENERATED_LENGTH=42
diff --git a/.zshrc b/.zshrc
index 738776c..5bd4bec 100644
--- a/.zshrc
+++ b/.zshrc
@@ -49,19 +49,6 @@ if [ -d "$HOME/.local/bin/scripts" ] ;
   then PATH="$HOME/.local/bin/scripts:$PATH"
 fi
 
-# You may need to manually set your language environment
-# export LANG=en_US.UTF-8
-export EDITOR=/usr/bin/nvim
-export VISUAL=/usr/bin/nvim
-export HISTORY_IGNORE="(ls|cd|pwd|exit|history|cd -|cd ..)"
-export MANPAGER="sh -c 'col -bx | bat -l man -p'"
-### Start Wayland specific stuff
-export MOZ_ENABLE_WAYLAND=1
-##! Use the following launch options for Steam Games which crash with this.
-##> 'SDL_VIDEODRIVER=x11 %command%'
-export SDL_VIDEODRIVER='wayland'
-### End Wayland specific stuff
-
 setopt completealiases
 
 prompt_context(){}