diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 9b33673..0335aaf 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -102,6 +102,7 @@ Plug 'juvenn/mustache.vim'
 Plug 'github/copilot.vim'
 Plug 'hunner/vim-beancount'
 Plug 'prisma/vim-prisma'
+Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
 call plug#end()
 
 " Because.
diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
index 0ea09f1..0c72a0b 100644
--- a/.gnupg/gpg-agent.conf
+++ b/.gnupg/gpg-agent.conf
@@ -2,9 +2,9 @@ default-cache-ttl 3600
 max-cache-ttl 3600
 enable-ssh-support
 #disable-scdaemon
-pinentry-program /usr/local/bin/pinentry-mac
+#pinentry-program /usr/local/bin/pinentry-mac
 #pinentry-program /usr/sbin/pinentry-curses
 #pinentry-program /opt/homebrew/bin/pinentry-mac
 #pinentry-program /usr/bin/pinentry-curses
-pinentry-program /Users/haugenh1/.gnupg/pinentry-ide.sh
-#extra-socket /Users/hunner/.gnupg/S.gpg-agent.extra
\ No newline at end of file
+#pinentry-program /Users/haugenh1/.gnupg/pinentry-ide.sh
+#extra-socket /Users/hunner/.gnupg/S.gpg-agent.extra
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 12d7b83..f5be909 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -7,7 +7,6 @@
 
 import XMonad hiding (Tall)
 import System.Exit
-import XMonad.Layout.Circle
 import XMonad.Layout.HintedTile
 import XMonad.Layout.MagicFocus
 import XMonad.Layout.Magnifier
@@ -114,9 +113,9 @@ mKeys = [ ("M-S-n"   , sendMessage MirrorShrink  ) -- Expand current window
         -- ++ -- mod-[1..9] %! Move window to Nth workspace that exists in alphabetical order
         -- zip (map (("M-S-" ++) . show) [0..9]) (map (withNthWorkspace W.shift) [0..])
         ++ -- mod-{o,e,u} %! Switch to physical/Xinerama screens 0, 1, or 2
-        zip (map ("M-" ++)   ["o","e","u"]) (map (\x -> screenWorkspace x >>= flip whenJust (windows . W.view))  [0..])
+        zip (map ("M-" ++)   ["o","u","e"]) (map (\x -> screenWorkspace x >>= flip whenJust (windows . W.view))  [0..])
         ++ -- mod-shift-{o,e,u} %! Move client to screen 0, 1, or 2
-        zip (map ("M-S-" ++) ["o","e","u"]) (map (\x -> screenWorkspace x >>= flip whenJust (windows . W.shift)) [0..])
+        zip (map ("M-S-" ++) ["o","u","e"]) (map (\x -> screenWorkspace x >>= flip whenJust (windows . W.shift)) [0..])
   where -- Make the mouse jump to the middle of the screen for gridselect
         warpToCentre = gets (W.screen . W.current . windowset) >>= \x -> warpToScreen x  0.5 0.5
         warpToCorner = gets (W.screen . W.current . windowset) >>= \x -> warpToScreen x  1.0 1.0
@@ -165,7 +164,7 @@ gsConfig = def
 -- Layouts:
 
 --mLayout = smartBorders Full ||| tiled ||| hintedTile Wide ||| simplestFloat ||| Circle ||| magnifier Circle
-mLayout = Mirror tiled ||| tiled ||| smartBorders Full ||| Circle ||| simplestFloat
+mLayout = Mirror tiled ||| tiled ||| smartBorders Full ||| simplestFloat
   where
      -- default tiling algorithm partitions the screen into two panes
      --tiled   = Tall nmaster delta ratio
diff --git a/.zshrc b/.zshrc
index 0f810ed..6608181 100644
--- a/.zshrc
+++ b/.zshrc
@@ -56,7 +56,7 @@ esac
 export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 export MANPATH=~/local/share/man:/usr/man:/usr/share/man:/usr/local/share/man
 #paths=(/cat/bin)
-prepaths=(/opt/puppetlabs/pdk/bin ~/.emacs.d/bin /opt/homebrew/bin /usr/local/bin /usr/local/sbin /usr/local/opt/node@8/bin ~/.local/bin ~/.rbenv/bin ~/local/talon ~/local/bin ~/local/sbin)
+prepaths=(/opt/puppetlabs/pdk/bin ~/.config/emacs/bin /opt/homebrew/bin /usr/local/bin /usr/local/sbin /usr/local/opt/node@8/bin ~/.local/bin ~/.rbenv/bin ~/local/talon ~/local/bin ~/local/sbin)
 #for dir in $paths ; do
 #    if [ -d $dir ] ; then
 #        export PATH=$PATH:$dir
@@ -86,7 +86,7 @@ if [ -d /usr/local/opt/bison/bin ] ; then
     export LDFLAGS="-L/usr/local/opt/bison/lib"
 fi
 # for latex
-eval "$(/usr/libexec/path_helper)"
+#eval "$(/usr/libexec/path_helper)"
 
 #gem's path
 if [ -d ~/.gems/bin ] ; then
diff --git a/local/bin/twomon.sh b/local/bin/twomon.sh
index b9acff2..2ac733e 100755
--- a/local/bin/twomon.sh
+++ b/local/bin/twomon.sh
@@ -5,4 +5,4 @@ xrandr --output DP-1-2 --auto
 xrandr --output HDMI-1-1 --auto
 xrandr --output DP-1-2 --left-of eDP-1-1
 xrandr --output HDMI-1-1 --left-of DP-1-2
-xrandr --output DP-1-2 --primary
+xrandr --output HDMI-1-1 --primary