fixed config issues

fish/.config/fish/config.fish

@@ -45,3 +45,10 @@ function ds
     command du -sch * | sort -rh
 end
 
+function hv
+    command nmcli --ask connection up "HP VPN"
+end
+
+function hvd
+    command nmcli connection down "HP VPN"
+end

fish/.config/fish/fish_variables

@@ -1,5 +1,7 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
+SETUVAR --export EDITOR:nvim
+SETUVAR --export VISUAL:nvim
 SETUVAR --export TERM:xterm\x2d256color
 SETUVAR --export _JAVA_AWT_WM_NONREPARENTING:1
 SETUVAR __fish_initialized:3400

xresources/.xinitrc

@@ -5,10 +5,6 @@ usermodmap=$HOME/.Xmodmap
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
-if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
-    startx
-fi
-
 # merge in defaults and keymaps
 if [ -f $sysresources ]; then
     xrdb -merge $sysresources
@@ -50,6 +46,7 @@ xrandr --output DP-2 --brightness .9 &
 # start autolocker
 xautolock -time 10 -locker slock &
 xset -dpms &
+xset s off &
 xset r rate 300 50 &
 
 # auto disk mounting