@@ -18,7 +18,7 @@ [color]
     ui = auto
 [core]
     excludesfile = ~/.config/git/gitignore
-    editor = vim
+    editor = nvim
     pager = less
     quotepath = false
     autocrlf = input

@@ -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

@@ -24,7 +24,7 @@ 
 ### 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:
 #

@@ -20,15 +20,6 @@ ;;
     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 @@ fi
 	. /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'

@@ -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

@@ -1,6 +1,5 @@ 
 #!/bin/sh
 
-bud ~/Pictures/wallpapers
 setxkbmap -layout us -option ctrl:nocaps
 #exec sowm
 #exec spectrwm

@@ -1,3 +1,3 @@ 
 #!/bin/sh
 
-vim "$@"
+nvim "$@"