diff --git a/.config/git/config b/.config/git/config
index 4fc0ba5..dac4cd1 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -18,7 +18,7 @@
     ui = auto
 [core]
     excludesfile = ~/.config/git/gitignore
-    editor = vim
+    editor = nvim
     pager = less
     quotepath = false
     autocrlf = input
diff --git a/.config/git/config-work b/.config/git/config-work
index 9563182..91afb8d 100644
--- a/.config/git/config-work
+++ b/.config/git/config-work
@@ -1,7 +1,5 @@
 [user]
-	name = Jesse Olson
-	email = jesse.olson@bestbuy.com
+	name = Jes Olson
+	email = jolson@digitalocean.com
 [changelog]
 	format = * %s [%an]
-[sendemail]
-	smtpserver = /usr/local/bin/msmtp
diff --git a/.config/sway/config b/.config/sway/config
index 8430b84..a4526b3 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -24,7 +24,7 @@ set $launcher dmenu_path | fzf | xargs swaymsg exec --
 ### Output configuration
 #
 # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-output * bg /home/j3s/Pictures/wallpapers/widelain.jpg fill
+# output * bg /home/j3s/Pictures/wallpapers/widelain.jpg fill
 #
 # Example configuration:
 #
diff --git a/.env b/.env
index 0f22d0f..81f5682 100644
--- a/.env
+++ b/.env
@@ -20,15 +20,6 @@ pa() {
     esac
 }
 
-# needed for sway
-if test -z "${XDG_RUNTIME_DIR}"; then
-    export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir
-    if ! test -d "${XDG_RUNTIME_DIR}"; then
-        mkdir "${XDG_RUNTIME_DIR}"
-        chmod 0700 "${XDG_RUNTIME_DIR}"
-    fi
-fi
-
 if [ -z "${SSH_AGENT_PID}" ]
 then
 	if ! [ -e /tmp/ssh-agent-$USER ]
@@ -38,45 +29,16 @@ then
 	. /tmp/ssh-agent-$USER >/dev/null
 fi
 
-# Make ^+L work on mksh
-if echo "$SHELL" | grep -q "mksh"; then
-  bind '^L=clear-screen'
-  export HISTFILE="$HOME/.mksh-history"
-fi
-
-# colorize ls
-if ls --version 2>&1 | grep -i gnu >/dev/null
-then
-        alias ls='ls --color=auto '
-    elif ls --version 2>&1 | grep -i busybox >/dev/null
-    then
-            alias ls='ls --color=auto '
-fi
-
 # launch alacritty with no GPU support if on old thinkpad
 if [ "$(hostname)" == 'nyx' ]; then
   export LIBGL_ALWAYS_SOFTWARE=1
 fi
 
 if [ "$(hostname)" == 'nostromo' ]; then
-  if ! pgrep syncthing > /dev/null; then
+  if ! pgrep syncthing &> /dev/null; then
     syncthing --no-browser > /dev/null &
   fi
 fi
 
-# bby
-if [ "$(uname -s)" == "Darwin" ]; then
-  alias ls=gls
-  alias df=gdf
-  alias cdr='cd $(find ~/git/chef/cloud-roles ~/git/chef/site-cookbooks ~/git/chef/app-cookbooks ~/git/chef/dc-roles -type d -maxdepth 1 | selecta)'
-  alias be='bundle exec'
-  alias terraform='AWS_PROFILE=cgraph_prod /usr/local/bin/terraform $@'
-  export CHEFUSER="jolson"
-  export CHEF_ENV="browse_test" # just for .chef/config.rb
-  export AWS_ENV="browse_test"  # just for aws cli
-  export SSHUSER="jolson"
-  export SSHKEY="~/.ssh/id_rsa"
-  export PASH_CLIP="pbcopy"
-  source /usr/local/share/chruby/chruby.sh
-  chruby ruby-2.6.6
-fi
+# chef stuff
+alias be='bundle exec'
diff --git a/.password-store/b/appleid.com.gpg b/.password-store/b/appleid.com.gpg
deleted file mode 100644
index 21a44686daa3475ca4dd0a0fa64c8725a664f6e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 359
zcmZo=<YCt8;@TATF|v)3gJIMEWxSTxF2A!dYdRk!+Qsg1{2<r#onrH)4pq$Y*%*=d
zE%Nx(m%kN$Xg>>{onF)^vunDSYC}>!>%&`aGWs*iC;q*3D^=);ng8R^M_SL~nIF}B
zR6pABd&1XnpNR#gM<$m(pMLwOc#&bSjQx_oH`BH9s!r%MvF^z<R{OVlvD}3}4Ht4_
z*9ExCIta2)YBhR3k1MY2k?N|34X)Yujju7fx$D)|#B63ORn}5xJEJ7Sd2MA^`LvE#
zcQ-VCp8ap%^aEF_DmR7g(T!(ybzakF|MRz9pb_IAtH~=|3QI1|DeX*&^jcXWcV<=m
zvPMaTC8bh)++5GJegA5{RC}F&ta8G%pJw%!!Wh}+#9o*9^>>c=(Y)%<AC~jwOg$)Y
z|HuEkDa*fq-Y0v{->&V~lCZCjH!HIEf15JxX*7T9tY7o*O`9+wQJJ?pa?>hh?>{^L
VWa?~A@|fSmGts<XaMx{KBLFxvuw(!L

diff --git a/.password-store/b/stratus-jobs-token.gpg b/.password-store/b/stratus-jobs-token.gpg
deleted file mode 100644
index d10c18039fd33c3ce561b72fefa49d3a9fd4afb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 463
zcmZo=<YCt8;@TATF|v)3{hu9Y&1Vzcm#R&(va8q_Z+&j~aMbb&ca8b4qQ&u!JO`)z
z4xZ{2kYlZ_8@rRk>FKMIZ@Wc|y>fC?S(RfR^z52)N_6GZH}B<MDL2nx)cf+QT`$T0
zFXQ_z`SW~MY4Pv$wuYVZS1NN~$Y*x+)5g+sb3bjBoFHQv6S!;RoGlYfADv(A>Al$R
z(4&n{miIe4>zs}HFfV!ERnByYq@xF~PZQcPIXYDM(2`19!<hlyjO)a92+vq6x8wYy
zPr4ILq?b!9zW2b;AYzW@_3Z{nzvni$J&xPsR((Dy@a&KEyIw4idiyD1orqcL{!OpN
zL>K<IInq&ht7N@fFGt+VNq=tK5J|ioDO0i7;L<+E6{{v_3C`O;!C0$O(K3?rLb^?J
z>EubfDm3+fa?L63e%|n@^Ph)d_u+tlYqH-btvGVmY2(S>*qKwig!9-I)P0!EeJAb9
z&hBzvp@fwi@^-UUuf94@rgsN71M`vapq7&4gUgJKf9cHfvs?PBr1y74#{K<9s)urJ
zxp%I774=u(SpL<fj`*k&$Im<W&XU_%H|@igV{dZznwA|7k(+kQ!ANbJt7gWuy)WiU
cM_%6Xmi1@L>Q!I$CzL-ERcUGVkoc7e00a%_KmY&$

diff --git a/.password-store/b/tuple.gpg b/.password-store/b/tuple.gpg
deleted file mode 100644
index c7c69c8672d65143db53750eb4ccdd198f014cc3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 375
zcmZo=<YCt8;@TATF|v)3gJIdUd9B~3+_QL;wB~lif&B{^1RT~fZ)AM=m5Hs3(IqIx
ze6fI|+V!n!w&yHZoX$ioGrYKQcF?+vcEh>WK4)|UU%i_;<>SFWdNZExn&)|tsa56^
z<M;L@OS}T==DvTkD*WTIIOEvVm;1ygdG|HU<x5U~t$f*UbNb^Ci{`Us{}MOR%}`qy
z@F4P$<QLx87mXFT;u^2doOeduV#S46|IEg-sf7Y}FZ@{da*dhO*YJ!J@tpQ|Tna_w
z3*)qECgmJfwpg4upZAeaN@djK(|c|R8YZZhaOQ@be<7z>tTC(OadyAoRzcyA-9fvK
zn$(#d{c7!@YEhJse5UMc<%M%XpW0rX+HvsBr8LIkw3`(i>7{B%1LJ4s?x}jZXI_&X
z>(7w8suOBOGLwHFxnjTFX`#4j0ypo`o@D6@=^b1OkDkjMlH2vFh{?W-VW|YCfz_UU
l%qzTiNUz$YyGYGObH{<ET~fx;&eNvaI50m7-F|X!7635Tu&@9C

diff --git a/.profile b/.profile
index d4da443..6d36622 100644
--- a/.profile
+++ b/.profile
@@ -1,4 +1,5 @@
 export PATH=~/bin/$(hostname):~/bin/$(uname -m):~/bin:~/go/bin:$PATH
 export ENV=~/.env
-export EDITOR=vim
+export EDITOR=nvim
 export LANG=en_US.UTF-8
+export GDK_BACKEND=wayland
diff --git a/.xinitrc b/.xinitrc
index c1ed89a..e211b05 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-bud ~/Pictures/wallpapers
 setxkbmap -layout us -option ctrl:nocaps
 #exec sowm
 #exec spectrwm
diff --git a/bin/vi b/bin/vi
index 02fd7ae..afa5502 100755
--- a/bin/vi
+++ b/bin/vi
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-vim "$@"
+nvim "$@"