diff --git a/.config/environment.d/99-firefox.conf b/.config/environment.d/99-firefox.conf
new file mode 100644
index 0000000..65ddc6c
--- /dev/null
+++ b/.config/environment.d/99-firefox.conf
@@ -0,0 +1,2 @@
+MOZ_USE_XINPUT2=1
+MOZ_ENABLE_WAYLAND=1
diff --git a/.config/environment.d/99-firefox_xinput2.conf b/.config/environment.d/99-firefox_xinput2.conf
deleted file mode 100644
index 3deac07..0000000
--- a/.config/environment.d/99-firefox_xinput2.conf
+++ /dev/null
@@ -1 +0,0 @@
-MOZ_USE_XINPUT2=1
diff --git a/.pam_environment b/.pam_environment
deleted file mode 100644
index b55fba7..0000000
--- a/.pam_environment
+++ /dev/null
@@ -1,2 +0,0 @@
-SSH_AGENT_PID	DEFAULT=
-SSH_AUTH_SOCK	DEFAULT="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"