diff --git a/.local/dotfiles/environment/core.zsh b/.local/dotfiles/environment/core.zsh
index bfe7879..0a90f66 100644
--- a/.local/dotfiles/environment/core.zsh
+++ b/.local/dotfiles/environment/core.zsh
@@ -1,10 +1,12 @@
 case `uname` in
   Linux)
-    EDITOR=vim
-    VISUAL=vim
+    EDITOR=nvim
+    SUDO_EDITOR=nvim
+    VISUAL=nvim
     ;;
   Darwin)
     EDITOR=nvim
+    SUDO_EDITOR=nvim
     VISUAL=nvim
     ;;
 esac
@@ -13,6 +15,6 @@ esac
 export EDITOR
 export VISUAL
 export PAGER=less
-export VIMINIT=":set runtimepath^=$HOME/.SpaceVim|:source $HOME/.SpaceVim/vimrc"
-export SPACEVIMDIR="$HOME/.SpaceVim.d/"
+#export VIMINIT=":set runtimepath^=$HOME/.SpaceVim|:source $HOME/.SpaceVim/vimrc"
+#export SPACEVIMDIR="$HOME/.SpaceVim.d/"
 
diff --git a/.pam_environment b/.pam_environment
index 371eb1c..ddbd20f 100644
--- a/.pam_environment
+++ b/.pam_environment
@@ -1,11 +1,11 @@
-EDITOR=vim
-VISUAL=vim
+#EDITOR=nvim
+#VISUAL=nvim
 #PATH DEFAULT=${PATH}:/home/@{PAM_USER}/bin
 #PATH DEFAULT=${PATH}:@{HOME}/bin
 #SSH_ASKPASS=/usr/lib/ssh/x11-ssh-askpass
 #QT_QPA_PLATFORMTHEME=qgnomeplatform
-MOZ_X11_EGL=1
-MOZ_ENABLE_WAYLAND=1
+#MOZ_X11_EGL=1
+#MOZ_ENABLE_WAYLAND=1
 #SSH_ASKPASS=/usr/libexec/ssh/ksshaskpass
-SSH_ASKPASS=/usr/lib/ssh/gnome-ssh-askpass3
+#SSH_ASKPASS=/usr/lib/ssh/gnome-ssh-askpass3
 
diff --git a/.profile b/.profile
index 72c35c3..03c9079 100644
--- a/.profile
+++ b/.profile
@@ -2,8 +2,27 @@
 #    source /usr/share/defaults/etc/profile
 #fi
 
-export EDITOR=vim
-export PATH=$PATH:$HOME/bin:$HOME/go/bin
+case `uname` in
+  Linux)
+    EDITOR=nvim
+    SUDO_EDITOR=nvim
+    VISUAL=nvim
+    export SSH_ASKPASS=/usr/lib/ssh/gnome-ssh-askpass3
+    ;;
+  Darwin)
+    EDITOR=nvim
+    SUDO_EDITOR=nvim
+    VISUAL=nvim
+    ;;
+esac
+
+# Default Environment
+export EDITOR
+export VISUAL
+export PAGER=less
+#export VIMINIT=":set runtimepath^=$HOME/.SpaceVim|:source $HOME/.SpaceVim/vimrc"
+#export SPACEVIMDIR="$HOME/.SpaceVim.d/"
+#export PATH=$PATH:$HOME/bin:$HOME/go/bin
 #export QT_QPA_PLATFORMTHEME=qgnomeplatform
 
 #. "$HOME/.cargo/env"