diff --git a/root.bashrc b/root.bashrc
index 414e89a..37d7913 100644
--- a/root.bashrc
+++ b/root.bashrc
@@ -13,12 +13,13 @@ export PATH=~/bin:$PATH
 #
 # Editor setup
 #
+export PATH=/opt/neovim:$PATH
+export EDITOR=nvim
+
 function n () {
     /opt/neovim/nvim $* || nvim $*
 }
 
-export EDITOR=n
-
 #
 # Aliases
 #
diff --git a/user.bash_aliases b/user.bash_aliases
index 327a1e8..f010fea 100644
--- a/user.bash_aliases
+++ b/user.bash_aliases
@@ -19,16 +19,18 @@ PS1='${debian_chroot:+($debian_chroot)}\[\033[01;92m\]$(hostnamectl hostname)\[\
 #
 export PATH=~/bin:~/.local/bin:$PATH
 export IGNOREEOF=50 # Ignore first 50 Ctrl-D on shell
+export GPG_TTY=$(tty)
 
 #
 # Editor setup
 #
+export PATH=/opt/neovim:$PATH
+export EDITOR=nvim
+
 function n () {
     /opt/neovim/nvim $* || nvim $*
 }
 
-export EDITOR=n
-
 #
 # Aliases
 #
@@ -57,3 +59,7 @@ function pgrep () {
 function start_tmux () {
   TERM=screen-256color tmux new -A -s DevEnv
 }
+
+function start_gitui() {
+  GPG_TTY=$(tty) gitui
+}