diff --git a/home/common/files/bash/bash_aliases b/home/common/files/bash/bash_aliases
index 398b7a2..36c5509 100755
--- a/home/common/files/bash/bash_aliases
+++ b/home/common/files/bash/bash_aliases
@@ -8,6 +8,7 @@ alias l="ls -l"
 alias df="df -h -x squashfs"
 alias du="du -h" 
 alias neofetch="fastfetch"
+alias vi="${EDITOR}"
 if [ -x /home/don/.local/bin/dotdrop ]
 then
 	alias dotdrop="/home/don/.local/bin/dotdrop -c ~/.dotfiles/config.yaml"
diff --git a/home/common/files/bash/bashrc b/home/common/files/bash/bashrc
index 9dc210d..a248f53 100755
--- a/home/common/files/bash/bashrc
+++ b/home/common/files/bash/bashrc
@@ -108,7 +108,7 @@ then
   LESS="-Rs"
   EXINIT="set wrapmargin=8 sh=$SHELL sw=4 report=2 tabstop=8"
   export EXINIT EDITOR PAGER LESS
-  EDITOR=vi
+  EDITOR=lvim
   if [ -x /usr/bin/vim ] 
   then
     EDITOR=vim
diff --git a/home/common/git.nix b/home/common/git.nix
index 98c0582..34c7cf2 100644
--- a/home/common/git.nix
+++ b/home/common/git.nix
@@ -22,7 +22,7 @@
       core = {
         user = "Don Harper";
         email = "duck@duckland.org";
-        editor = "${pkgs.neovim}/bin/nvim";
+        editor = "${pkgs.lunarvim}/bin/lvim";
       };
       safe = {
         directory = "*";
diff --git a/home/common/liquidprompt.nix b/home/common/liquidprompt.nix
index fb20234..6c6018a 100644
--- a/home/common/liquidprompt.nix
+++ b/home/common/liquidprompt.nix
@@ -2,8 +2,11 @@
   home.packages = with pkgs; [ liquidprompt ];
   xdg.configFile."liquidpromptrc".text = ''
     source ~/.config/liquidprompt.theme
+    LOCAL_RCFILE=$HOME/.config/liquidpromptrc.local
+    LP_ALWAYS_DISPLAY_VALUES=1
     LP_BATTERY_THRESHOLD=75
     LP_DISABLED_VCS_PATH=""
+    LP_DISPLAY_VALUES_AS_PERCENTS=1
     LP_ENABLE_BATT=1
     LP_ENABLE_BZR=0
     LP_ENABLE_DIRSTACK=0
@@ -33,13 +36,11 @@
     LP_LOAD_THRESHOLD=0.60
     LP_PATH_KEEP=2
     LP_PATH_LENGTH=35
-    LP_PERCENTS_ALWAYS=1
     LP_RUNTIME_THRESHOLD=2
     LP_TEMP_THRESHOLD=60
     LP_TIME_ANALOG=0
     LP_TIME_FORMAT="%_I:%M %p"
     LP_USER_ALWAYS=1
-    LOCAL_RCFILE=$HOME/.config/liquidpromptrc.local
     [ -f "$LOCAL_RCFILE" ] && source "$LOCAL_RCFILE"
   '';
   xdg.configFile."liquidprompt.theme".text = ''
diff --git a/home/common/neovim.nix b/home/common/neovim.nix
index 3c5a7a8..df14147 100644
--- a/home/common/neovim.nix
+++ b/home/common/neovim.nix
@@ -2,7 +2,7 @@
 {
   programs.neovim = {
     enable = true;
-    defaultEditor = true;
+    defaultEditor = false;
     viAlias = true;
     vimAlias = true;
     vimdiffAlias = true;