Moved to vim-plug + gruvbox

3 years ago · 1fc07ab70b
parent 0da3f31afc
commit 1fc07ab70b
19 changed files with 3200 additions and 438 deletions
--- a/install/cli-tools.sh
+++ b/install/cli-tools.sh
@ -2,9 +2,10 @@
 brew tap homebrew-ffmpeg/ffmpeg

 # install additional brew packages -- see _install.sh too
+brew install clipper
 brew install curl
 brew install dnsmasq
-brew install git-flow
+brew install fzf
 brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-fdk-aac
 brew install htop
 brew install httpd
@ -12,15 +13,35 @@ brew install imagemagick
 brew install jump
 brew install mariadb
 brew install mkcert
+brew install neovim
 brew install nnn
 brew install nss
 brew install openssl
 brew install php@7.4
 brew install ripgrep
 brew install switchaudio-osx
+brew install tmux
 brew install trash-cli
 brew install tree

+# install fzf
+/usr/local/opt/fzf/install
+
+# clipper
+mkdir -p ~/Library/LaunchAgents
+brew services start clipper
+
+# vim stuff
+gem install neovim
+easy_install --user pip
+python -m pip install --user neovim
+pip3 install neovim
+
+curl -Ls https://raw.githubusercontent.com/jarun/nnn/master/plugins/getplugs | sh
+git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+sh -c 'curl -fLo "~/.config/nvim/autoload/plug.vim --create-dirs \
+       https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+
 # dnsmasq
 echo 'address=/.localhost/127.0.0.1' > /usr/local/etc/dnsmasq.conf
 sudo brew services start dnsmasq
--- a/install/install.sh
+++ b/install/install.sh
@ -11,13 +11,12 @@ brew tap homebrew/services
 # brew paths
 export PATH=/usr/local/bin:/usr/local/sbin:$PATH

-# install some neccessary brew packages
-brew install clipper
-brew install fzf
 brew install git
-brew install neovim
-brew install tmux
+brew install git-flow
+brew install python@3
+brew install ruby
 brew install zsh
+brew link python@3

 # install all submodules
 git submodule init
@ -35,28 +34,6 @@ ln -s ~/dotfiles/tmux.conf ~/.tmux.conf
 ln -s ~/dotfiles/zsh ~/.zsh
 ln -s ~/dotfiles/zsh/zshrc ~/.zshrc

-# install fzf
-/usr/local/opt/fzf/install
-
-# clipper
-mkdir -p ~/Library/LaunchAgents
-brew services start clipper
-
-# install deps + plugins for neovim and tmux
-brew install ruby
-brew install python@3
-brew link python@3
-gem install neovim
-easy_install --user pip
-python -m pip install --user neovim
-pip3 install neovim
-
-curl -Ls https://raw.githubusercontent.com/jarun/nnn/master/plugins/getplugs | sh
-git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
-curl https://raw.githubusercontent.com/Shougo/dein.vim/master/bin/installer.sh > installer.sh
-sh ./installer.sh ~/.cache/dein
-rm installer.sh
-
 # set xterm/screen terminals to enable italic fonts in terminal
 # set terminal to xterm-256color!
 # now restart your terminal and hope for the best
--- a/install/software.sh
+++ b/install/software.sh
@ -13,6 +13,7 @@ brew install --cask google-chrome
 brew install --cask hammerspoon
 brew install --cask imagealpha
 brew install --cask imageoptim
+brew install --cask iterm2
 brew install --cask karabiner-elements
 brew install --cask microsoft-teams
 brew install --cask numi
--- a/nvim/autocommands.vim
+++ b/nvim/autocommands.vim
@ -1,4 +1,3 @@
-" define a group `init` and initialize.
 augroup init
  autocmd!

@ -23,3 +22,6 @@ augroup init
  autocmd BufNewFile,BufRead *.{json5,css,scss} set iskeyword+=-
 augroup END

+if &diff
+  syntax off
+endif
--- a/nvim/autoload/plug.vim
+++ b/nvim/autoload/plug.vim
--- a/nvim/config.vim
+++ b/nvim/config.vim
@ -46,18 +46,9 @@ set visualbell
 set wildmode=list:longest,list:full
 set wrapscan

-" default language utf-8
-language en_US.UTF-8
-
-" deactivate syntax highlighting when diffing
-filetype plugin indent on
-syntax on
-if &diff
-  syntax off
-endif
-
-" hybrid color scheme
-let g:hybrid_reduced_contrast=0
-let g:hybrid_custom_term_colors=1
+" language and colorscheme
 set background=dark
-colorscheme hybrid
+set termguicolors
+let g:gruvbox_italic=1
+autocmd vimenter * ++nested colorscheme gruvbox
+language en_US.UTF-8
--- a/nvim/init.vim
+++ b/nvim/init.vim
@ -1,34 +1,29 @@
-set runtimepath+=~/.cache/dein/repos/github.com/Shougo/dein.vim
-if dein#load_state('~/.cache/dein')
-  call dein#begin('~/.cache/dein')
-  call dein#add('~/.cache/dein/repos/github.com/Shougo/dein.vim')
+call plug#begin('~/.config/nvim/plugged')

-  call dein#add('christoomey/vim-tmux-navigator')
-  call dein#add('easymotion/vim-easymotion')
-  call dein#add('editorconfig/editorconfig-vim')
-  call dein#add('junegunn/fzf', { 'merged': 0 })
-  call dein#add('junegunn/fzf.vim', { 'depends': 'fzf' })
-  call dein#add('junegunn/gv.vim')
-  call dein#add('mcchrish/nnn.vim')
-  call dein#add('neoclide/coc.nvim', { 'merged': 0, 'rev': 'release' })
-  call dein#add('sheerun/vim-polyglot')
-  call dein#add('tpope/vim-apathy')
-  call dein#add('tpope/vim-commentary')
-  call dein#add('tpope/vim-eunuch')
-  call dein#add('tpope/vim-fugitive')
-  call dein#add('tpope/vim-obsession')
-  call dein#add('tpope/vim-ragtag')
-  call dein#add('tpope/vim-repeat')
-  call dein#add('tpope/vim-surround')
-  call dein#add('tpope/vim-unimpaired')
-  call dein#add('w0ng/vim-hybrid')
-  call dein#add('wellle/targets.vim')
-  call dein#add('wellle/tmux-complete.vim')
-  call dein#add('wincent/terminus')
+Plug 'christoomey/vim-tmux-navigator'
+Plug 'easymotion/vim-easymotion'
+Plug 'editorconfig/editorconfig-vim'
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+Plug 'junegunn/fzf.vim'
+Plug 'junegunn/gv.vim'
+Plug 'mcchrish/nnn.vim'
+Plug 'morhetz/gruvbox'
+Plug 'neoclide/coc.nvim', { 'branch': 'release' }
+Plug 'sheerun/vim-polyglot'
+Plug 'tpope/vim-apathy'
+Plug 'tpope/vim-commentary'
+Plug 'tpope/vim-eunuch'
+Plug 'tpope/vim-fugitive'
+Plug 'tpope/vim-obsession'
+Plug 'tpope/vim-ragtag'
+Plug 'tpope/vim-repeat'
+Plug 'tpope/vim-surround'
+Plug 'tpope/vim-unimpaired'
+Plug 'wellle/targets.vim'
+Plug 'wellle/tmux-complete.vim'
+Plug 'wincent/terminus'

-  call dein#end()
-  call dein#save_state()
-endif
+call plug#end()

 " load the default config and mappings
 source ~/.config/nvim/config.vim
--- a/nvim/plugged/.gitignore
+++ b/nvim/plugged/.gitignore
@ -0,0 +1 @@
+**/*
--- a/nvim/plugins/.gitignore
+++ b/nvim/plugins/.gitignore
--- a/nvim/statusline.vim
+++ b/nvim/statusline.vim
@ -1,7 +1,7 @@
 function! StatuslineGitInfo()
  let git = fugitive#head()
  if git != ''
-    return " ".fugitive#head()
+    return git
  else
    return ""
 endfunction
@ -33,9 +33,6 @@ function! MyStatusLine(mode)
  return statusline
 endfunction

-hi StatusLineColor ctermbg=White guibg=White ctermfg=Black guifg=Black
-hi NoStatusLineColor ctermbg=NONE guibg=NONE ctermfg=LightGrey guifg=LightGrey
 au WinEnter * setlocal statusline=%!MyStatusLine('Enter')
 au WinLeave * setlocal statusline=%!MyStatusLine('Leave')
-
 set statusline=%!MyStatusLine('Enter')
--- a/office/mutt/accounts/mailbox
+++ b/office/mutt/accounts/mailbox
@ -14,7 +14,7 @@ alternates ^kontakt@webgefrickel.de$ ^s.rademacker@mailbox.org$
 # custom signaure
 set signature = ~/.mutt/signatures/work

-color status cyan default
+color status green default

 macro index o "<shell-escape>mbsync mailbox<enter>" "run mbsync to sync mail for this account"

--- a/office/mutt/accounts/viu
+++ b/office/mutt/accounts/viu
@ -14,7 +14,7 @@ alternates ^steffen.rademacker@viu.ch$
 # custom signaure
 set signature = ~/.mutt/signatures/default

-color status red default
+color status color208 color235 

 macro index o "<shell-escape>mbsync viu<enter>" "run mbsync to sync mail for this account"

--- a/office/mutt/colors
+++ b/office/mutt/colors
@ -1,46 +1,43 @@
-# basic colors ---------------------------------------------------------
-color normal        white           default
-color error         red             default
-color tilde         black           default
-color message       cyan            default
-color markers       red             white
-color attachment    white           default
-color search        brightmagenta   default
-color indicator     brightblack     yellow
-color tree          green          default
-
-# sidebarh
-color sidebar_new   default blue
-
-# index ----------------------------------------------------------------
-
-color index         red             default         "~A"    # all messages
-color index         brightred       default         "~E"    # expired messages
-color index         blue            default         "~N"    # new messages
-color index         blue            default         "~O"    # old messages
-color index         brightmagenta   default         "~Q"    # messages that have been replied to
-color index         brightwhite           default         "~R"    # read messages
-color index         blue            default         "~U"    # unread messages
-color index         brightyellow    default         "~v"    # messages part of a collapsed thread
-color index         brightyellow    default         "~P"    # messages from me
-color index         red             default         "~F"    # flagged messages
-color index         black           red             "~D"    # deleted messages
-
-# message headers ------------------------------------------------------
-
-color hdrdefault    brightgreen     default
-color header        brightyellow    default         "^(From)"
-color header        blue            default         "^(Subject)"
-
-# body -----------------------------------------------------------------
-
-color quoted        blue            default
-color quoted1       cyan            default
-color quoted2       yellow          default
-color quoted3       red             default
-color quoted4       brightred       default
-
-color signature     brightblack     default
-color bold          black           default
-color underline     black           default
-color normal        default         default
+color attachment  color109 color235
+color bold        color229 color235
+color error       color167 color235
+color hdrdefault  color246 color235
+color indicator   color223 color237
+color markers     color243 color235
+color normal      color223 color235
+color quoted      color250 color235
+color quoted1     color108 color235
+color quoted2     color250 color235
+color quoted3     color108 color235
+color quoted4     color250 color235
+color quoted5     color108 color235
+color search      color235 color208
+color signature   color108 color235
+color tilde       color243 color235
+color tree        color142 color235
+color underline   color223 color239
+
+color sidebar_divider    color250 color235
+color sidebar_new        color142 color235
+
+color index color142 color235 ~N
+color index color108 color235 ~O
+color index color109 color235 ~P
+color index color214 color235 ~F
+color index color175 color235 ~Q
+color index color167 color235 ~=
+color index color235 color223 ~T
+color index color235 color167 ~D
+
+color header color214 color235 "^From:"
+color header color109 color235 "^To:"
+color header color142 color235 "^Subject:"
+color header color108 color235 "^X-Spam-Status:"
+color header color108 color235 "^Received:"
+
+color body color208 color235 "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+"
+color body color208 color235 "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+"
+color body color235 color214 "[;:]-*[)>(<lt;|]"
+color body color229 color235 "\\*[- A-Za-z]+\\*"
+
+color compose header            color223 color235
--- a/other/Gruvbox.terminal
+++ b/other/Gruvbox.terminal
@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>ANSIBlackColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAnMC4xMTc2NDcwNTg4IDAuMTE3NjQ3MDU4
+	OCAwLjExNzY0NzA1ODgAEAGAAtIUFRYXWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xv
+	cqIWGFhOU09iamVjdAgRGiQpMjdJTFFTV11kand+qKqssbzFzdAAAAAAAAABAQAAAAAA
+	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
+	</data>
+	<key>ANSIBlueColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAmMC4yMTk2MDc4NDMxIDAuNDUwOTgwMzky
+	MiAwLjQ2Mjc0NTA5OAAQAYAC0hQVFhdaJGNsYXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9y
+	ohYYWE5TT2JqZWN0CBEaJCkyN0lMUVNXXWRqd36nqauwu8TMzwAAAAAAAAEBAAAAAAAA
+	ABkAAAAAAAAAAAAAAAAAAADY
+	</data>
+	<key>ANSIBrightBlackColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAnMC41MDE5NjA3ODQzIDAuNDM5MjE1Njg2
+	MyAwLjM4MDM5MjE1NjkAEAGAAtIUFRYXWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xv
+	cqIWGFhOU09iamVjdAgRGiQpMjdJTFFTV11kand+qKqssbzFzdAAAAAAAAABAQAAAAAA
+	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
+	</data>
+	<key>ANSIBrightBlueColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAnMC40NDMxMzcyNTQ5IDAuNTg0MzEzNzI1
+	NSAwLjUyNTQ5MDE5NjEAEAGAAtIUFRYXWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xv
+	cqIWGFhOU09iamVjdAgRGiQpMjdJTFFTV11kand+qKqssbzFzdAAAAAAAAABAQAAAAAA
+	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
+	</data>
+	<key>ANSIBrightCyanColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAnMC40OTAxOTYwNzg0IDAuNzEzNzI1NDkw
+	MiAwLjQxMTc2NDcwNTkAEAGAAtIUFRYXWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xv
+	cqIWGFhOU09iamVjdAgRGiQpMjdJTFFTV11kand+qKqssbzFzdAAAAAAAAABAQAAAAAA
+	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
+	</data>
+	<key>ANSIBrightGreenColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAnMC42NjY2NjY2NjY3IDAuNjkwMTk2MDc4
+	NCAwLjExNzY0NzA1ODgAEAGAAtIUFRYXWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xv
+	cqIWGFhOU09iamVjdAgRGiQpMjdJTFFTV11kand+qKqssbzFzdAAAAAAAAABAQAAAAAA
+	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
+	</data>
+	<key>ANSIBrightMagentaColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAmMC43ODAzOTIxNTY5IDAuNDM5MjE1Njg2
+	MyAwLjUzNzI1NDkwMgAQAYAC0hQVFhdaJGNsYXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9y
+	ohYYWE5TT2JqZWN0CBEaJCkyN0lMUVNXXWRqd36nqauwu8TMzwAAAAAAAAEBAAAAAAAA
+	ABkAAAAAAAAAAAAAAAAAAADY
+	</data>
+	<key>ANSIBrightRedColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAmMC45Njg2Mjc0NTEgMC4xODgyMzUyOTQx
+	IDAuMTU2ODYyNzQ1MQAQAYAC0hQVFhdaJGNsYXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9y
+	ohYYWE5TT2JqZWN0CBEaJCkyN0lMUVNXXWRqd36nqauwu8TMzwAAAAAAAAEBAAAAAAAA
+	ABkAAAAAAAAAAAAAAAAAAADY
+	</data>
+	<key>ANSIBrightWhiteColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAmMC45MDE5NjA3ODQzIDAuODMxMzcyNTQ5
+	IDAuNjM5MjE1Njg2MwAQAYAC0hQVFhdaJGNsYXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9y
+	ohYYWE5TT2JqZWN0CBEaJCkyN0lMUVNXXWRqd36nqauwu8TMzwAAAAAAAAEBAAAAAAAA
+	ABkAAAAAAAAAAAAAAAAAAADY
+	</data>
+	<key>ANSIBrightYellowColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAmMC45Njg2Mjc0NTEgMC42OTQxMTc2NDcx
+	IDAuMTQ1MDk4MDM5MgAQAYAC0hQVFhdaJGNsYXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9y
+	ohYYWE5TT2JqZWN0CBEaJCkyN0lMUVNXXWRqd36nqauwu8TMzwAAAAAAAAEBAAAAAAAA
+	ABkAAAAAAAAAAAAAAAAAAADY
+	</data>
+	<key>ANSICyanColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAnMC4zNDExNzY0NzA2IDAuNTYwNzg0MzEz
+	NyAwLjM0MTE3NjQ3MDYAEAGAAtIUFRYXWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xv
+	cqIWGFhOU09iamVjdAgRGiQpMjdJTFFTV11kand+qKqssbzFzdAAAAAAAAABAQAAAAAA
+	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
+	</data>
+	<key>ANSIGreenColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAoMC41MDk4MDM5MjE2IDAuNTE3NjQ3MDU4
+	OCAwLjA4MjM1Mjk0MTE4ABABgALSFBUWF1okY2xhc3NuYW1lWCRjbGFzc2VzV05TQ29s
+	b3KiFhhYTlNPYmplY3QIERokKTI3SUxRU1ddZGp3fqmrrbK9xs7RAAAAAAAAAQEAAAAA
+	AAAAGQAAAAAAAAAAAAAAAAAAANo=
+	</data>
+	<key>ANSIMagentaColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAnMC42Mjc0NTA5ODA0IDAuMjk0MTE3NjQ3
+	MSAwLjQ1MDk4MDM5MjIAEAGAAtIUFRYXWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xv
+	cqIWGFhOU09iamVjdAgRGiQpMjdJTFFTV11kand+qKqssbzFzdAAAAAAAAABAQAAAAAA
+	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
+	</data>
+	<key>ANSIRedColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxApMC43NDUwOTgwMzkyIDAuMDU4ODIzNTI5
+	NDEgMC4wOTAxOTYwNzg0MwAQAYAC0hQVFhdaJGNsYXNzbmFtZVgkY2xhc3Nlc1dOU0Nv
+	bG9yohYYWE5TT2JqZWN0CBEaJCkyN0lMUVNXXWRqd36qrK6zvsfP0gAAAAAAAAEBAAAA
+	AAAAABkAAAAAAAAAAAAAAAAAAADb
+	</data>
+	<key>ANSIWhiteColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAnMC41OTYwNzg0MzE0IDAuNTMzMzMzMzMz
+	MyAwLjQ0MzEzNzI1NDkAEAGAAtIUFRYXWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xv
+	cqIWGFhOU09iamVjdAgRGiQpMjdJTFFTV11kand+qKqssbzFzdAAAAAAAAABAQAAAAAA
+	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
+	</data>
+	<key>ANSIYellowColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAeMC44IDAuNTMzMzMzMzMzMyAwLjEwMTk2
+	MDc4NDMAEAGAAtIUFRYXWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqIWGFhOU09i
+	amVjdAgRGiQpMjdJTFFTV11kand+n6GjqLO8xMcAAAAAAAABAQAAAAAAAAAZAAAAAAAA
+	AAAAAAAAAAAA0A==
+	</data>
+	<key>BackgroundBlur</key>
+	<real>0.0</real>
+	<key>BackgroundColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAnMC4xMTc2NDcwNTg4IDAuMTE3NjQ3MDU4
+	OCAwLjExNzY0NzA1ODgAEAGAAtIUFRYXWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xv
+	cqIWGFhOU09iamVjdAgRGiQpMjdJTFFTV11kand+qKqssbzFzdAAAAAAAAABAQAAAAAA
+	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
+	</data>
+	<key>Bell</key>
+	<false/>
+	<key>BellBadge</key>
+	<false/>
+	<key>BellBounce</key>
+	<false/>
+	<key>BellBounceCritical</key>
+	<false/>
+	<key>BlinkText</key>
+	<true/>
+	<key>CursorBlink</key>
+	<false/>
+	<key>CursorColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAmMC45MDE5NjA3ODQzIDAuODMxMzcyNTQ5
+	IDAuNjM5MjE1Njg2MwAQAYAC0hQVFhdaJGNsYXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9y
+	ohYYWE5TT2JqZWN0CBEaJCkyN0lMUVNXXWRqd36nqauwu8TMzwAAAAAAAAEBAAAAAAAA
+	ABkAAAAAAAAAAAAAAAAAAADY
+	</data>
+	<key>DisableANSIColor</key>
+	<false/>
+	<key>Font</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGkCwwVFlUkbnVsbNQNDg8QERIT
+	FFZOU1NpemVYTlNmRmxhZ3NWTlNOYW1lViRjbGFzcyNAKgAAAAAAABAQgAKAA18QEEZp
+	cmFDb2RlLVJlZ3VsYXLSFxgZGlokY2xhc3NuYW1lWCRjbGFzc2VzVk5TRm9udKIZG1hO
+	U09iamVjdAgRGiQpMjdJTFFTWF5nbnd+hY6QkpSnrLfAx8oAAAAAAAABAQAAAAAAAAAc
+	AAAAAAAAAAAAAAAAAAAA0w==
+	</data>
+	<key>FontAntialias</key>
+	<true/>
+	<key>FontHeightSpacing</key>
+	<real>0.84999999999999998</real>
+	<key>FontWidthSpacing</key>
+	<integer>1</integer>
+	<key>ProfileCurrentVersion</key>
+	<real>2.0699999999999998</real>
+	<key>SelectionColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAnMC4zMjU0OTAxOTYxIDAuMjkwMTk2MDc4
+	NCAwLjI1ODgyMzUyOTQAEAGAAtIUFRYXWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xv
+	cqIWGFhOU09iamVjdAgRGiQpMjdJTFFTV11kand+qKqssbzFzdAAAAAAAAABAQAAAAAA
+	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
+	</data>
+	<key>ShouldRestoreContent</key>
+	<false/>
+	<key>ShowActiveProcessArgumentsInTitle</key>
+	<true/>
+	<key>ShowActiveProcessInTitle</key>
+	<true/>
+	<key>ShowActivityIndicatorInTab</key>
+	<false/>
+	<key>ShowCommandKeyInTitle</key>
+	<false/>
+	<key>ShowComponentsWhenTabHasCustomTitle</key>
+	<false/>
+	<key>ShowDimensionsInTitle</key>
+	<false/>
+	<key>ShowRepresentedURLInTitle</key>
+	<true/>
+	<key>ShowRepresentedURLPathInTitle</key>
+	<true/>
+	<key>ShowShellCommandInTitle</key>
+	<true/>
+	<key>ShowTTYNameInTitle</key>
+	<false/>
+	<key>ShowTerminalInDockIcon</key>
+	<false/>
+	<key>ShowWindowSettingsNameInTitle</key>
+	<false/>
+	<key>TextBoldColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAmMC45MDE5NjA3ODQzIDAuODMxMzcyNTQ5
+	IDAuNjM5MjE1Njg2MwAQAYAC0hQVFhdaJGNsYXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9y
+	ohYYWE5TT2JqZWN0CBEaJCkyN0lMUVNXXWRqd36nqauwu8TMzwAAAAAAAAEBAAAAAAAA
+	ABkAAAAAAAAAAAAAAAAAAADY
+	</data>
+	<key>TextColor</key>
+	<data>
+	YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+	AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGjCwwTVSRudWxs0w0ODxARElVO
+	U1JHQlxOU0NvbG9yU3BhY2VWJGNsYXNzTxAmMC45MDE5NjA3ODQzIDAuODMxMzcyNTQ5
+	IDAuNjM5MjE1Njg2MwAQAYAC0hQVFhdaJGNsYXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9y
+	ohYYWE5TT2JqZWN0CBEaJCkyN0lMUVNXXWRqd36nqauwu8TMzwAAAAAAAAEBAAAAAAAA
+	ABkAAAAAAAAAAAAAAAAAAADY
+	</data>
+	<key>UseBoldFonts</key>
+	<true/>
+	<key>UseBrightBold</key>
+	<true/>
+	<key>VisualBell</key>
+	<false/>
+	<key>VisualBellOnlyWhenMuted</key>
+	<false/>
+	<key>columnCount</key>
+	<integer>160</integer>
+	<key>name</key>
+	<string>Gruvbox</string>
+	<key>rowCount</key>
+	<integer>48</integer>
+	<key>shellExitAction</key>
+	<integer>1</integer>
+	<key>type</key>
+	<string>Window Settings</string>
+	<key>warnOnShellCloseAction</key>
+	<integer>0</integer>
+</dict>
+</plist>
--- a/other/Hybrid.terminal
+++ b/other/Hybrid.terminal
@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>ANSIBlackColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjE1Njg2Mjc0NTEgMC4xNjQ3MDU4ODI0IDAuMTgwMzkyMTU2OQAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-	</data>
-	<key>ANSIBlueColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjM3MjU0OTAxOTYgMC41MDU4ODIzNTI5IDAuNjE1Njg2Mjc0NQAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-	</data>
-	<key>ANSIBrightBlackColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECYw
-	LjIxNTY4NjI3NDUgMC4yMzEzNzI1NDkgMC4yNTQ5MDE5NjA4ABABgALSEBESE1okY2xh
-	c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2
-	ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYouNj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA
-	ABkAAAAAAAAAAAAAAAAAAADY
-	</data>
-	<key>ANSIBrightBlueColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjUwNTg4MjM1MjkgMC42MzUyOTQxMTc2IDAuNzQ1MDk4MDM5MgAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-	</data>
-	<key>ANSIBrightCyanColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjU0MTE3NjQ3MDYgMC43NDUwOTgwMzkyIDAuNzE3NjQ3MDU4OAAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-	</data>
-	<key>ANSIBrightGreenColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjcwOTgwMzkyMTYgMC43NDExNzY0NzA2IDAuNDA3ODQzMTM3MwAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-	</data>
-	<key>ANSIBrightMagentaColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjY5ODAzOTIxNTcgMC41ODAzOTIxNTY5IDAuNzMzMzMzMzMzMwAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-	</data>
-	<key>ANSIBrightRedColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NMMC44
-	IDAuNCAwLjQAEAGAAtIQERITWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhO
-	U09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290gAEIERojLTI3O0FITltib3Fz
-	eIOMlJegsrW6AAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAAAAAAAAAAALw=
-	</data>
-	<key>ANSIBrightWhiteColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	Ljc3MjU0OTAxOTYgMC43ODQzMTM3MjU1IDAuNzc2NDcwNTg4MgAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-	</data>
-	<key>ANSIBrightYellowColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	Ljk0MTE3NjQ3MDYgMC43NzY0NzA1ODgyIDAuNDU0OTAxOTYwOAAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-	</data>
-	<key>ANSICyanColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECYw
-	LjM2ODYyNzQ1MSAwLjU1Mjk0MTE3NjUgMC41Mjk0MTE3NjQ3ABABgALSEBESE1okY2xh
-	c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2
-	ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYouNj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA
-	ABkAAAAAAAAAAAAAAAAAAADY
-	</data>
-	<key>ANSIGreenColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjU0OTAxOTYwNzggMC41ODAzOTIxNTY5IDAuMjUwOTgwMzkyMgAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-	</data>
-	<key>ANSIMagentaColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjUyMTU2ODYyNzUgMC40MDM5MjE1Njg2IDAuNTYwNzg0MzEzNwAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-	</data>
-	<key>ANSIRedColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjY0NzA1ODgyMzUgMC4yNTg4MjM1Mjk0IDAuMjU4ODIzNTI5NAAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-	</data>
-	<key>ANSIWhiteColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjQzOTIxNTY4NjMgMC40NzA1ODgyMzUzIDAuNTAxOTYwNzg0MwAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-	</data>
-	<key>ANSIYellowColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	Ljg3MDU4ODIzNTMgMC41NzY0NzA1ODgyIDAuMzcyNTQ5MDE5NgAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-	</data>
-	<key>BackgroundColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjExMzcyNTQ5MDIgMC4xMjE1Njg2Mjc1IDAuMTI5NDExNzY0NwAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-	</data>
-	<key>Bell</key>
-	<false/>
-	<key>BellBadge</key>
-	<false/>
-	<key>BellBounce</key>
-	<false/>
-	<key>BlinkText</key>
-	<false/>
-	<key>CursorColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECYw
-	LjE2ODYyNzQ1MSAwLjkyMTU2ODYyNzUgMC45MjE1Njg2Mjc1ABABgALSEBESE1okY2xh
-	c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2
-	ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYouNj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA
-	ABkAAAAAAAAAAAAAAAAAAADY
-	</data>
-	<key>Font</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGGBlYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKQHCBESVSRudWxs1AkKCwwNDg8QVk5TU2l6ZVhOU2ZGbGFnc1ZOU05hbWVWJGNs
-	YXNzI0AoAAAAAAAAEBCAAoADXxAQRmlyYUNvZGUtUmVndWxhctITFBUWWiRjbGFzc25h
-	bWVYJGNsYXNzZXNWTlNGb250ohUXWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hpdmVy0Rob
-	VHJvb3SAAQgRGiMtMjc8QktSW2JpcnR2eIuQm6SrrrfJzNEAAAAAAAABAQAAAAAAAAAc
-	AAAAAAAAAAAAAAAAAAAA0w==
-	</data>
-	<key>FontAntialias</key>
-	<true/>
-	<key>ProfileCurrentVersion</key>
-	<real>2.0499999999999998</real>
-	<key>SelectionColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECYw
-	LjM2ODYyNzQ1MSAwLjU1Mjk0MTE3NjUgMC41Mjk0MTE3NjQ3ABABgALSEBESE1okY2xh
-	c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2
-	ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYouNj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA
-	ABkAAAAAAAAAAAAAAAAAAADY
-	</data>
-	<key>ShouldRestoreContent</key>
-	<false/>
-	<key>ShowActiveProcessArgumentsInTitle</key>
-	<true/>
-	<key>ShowActiveProcessInTitle</key>
-	<true/>
-	<key>ShowActivityIndicatorInTab</key>
-	<false/>
-	<key>ShowCommandKeyInTitle</key>
-	<false/>
-	<key>ShowDimensionsInTitle</key>
-	<false/>
-	<key>ShowRepresentedURLInTitle</key>
-	<true/>
-	<key>ShowRepresentedURLPathInTitle</key>
-	<true/>
-	<key>ShowShellCommandInTitle</key>
-	<false/>
-	<key>ShowTerminalInDockIcon</key>
-	<false/>
-	<key>TextBoldColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	Ljc3MjU0OTAxOTYgMC43ODQzMTM3MjU1IDAuNzc2NDcwNTg4MgAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-	</data>
-	<key>TextColor</key>
-	<data>
-	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NGMSAx
-	IDEAEAGAAtIQERITWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVj
-	dF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290gAEIERojLTI3O0FITltiaWttcn2GjpGa
-	rK+0AAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAAAAAAAAAAALY=
-	</data>
-	<key>UseBoldFonts</key>
-	<true/>
-	<key>UseBrightBold</key>
-	<true/>
-	<key>VisualBell</key>
-	<false/>
-	<key>columnCount</key>
-	<integer>160</integer>
-	<key>name</key>
-	<string>Hybrid</string>
-	<key>rowCount</key>
-	<integer>48</integer>
-	<key>shellExitAction</key>
-	<integer>1</integer>
-	<key>type</key>
-	<string>Window Settings</string>
-	<key>warnOnShellCloseAction</key>
-	<integer>0</integer>
-</dict>
-</plist>
--- a/tmux.conf
+++ b/tmux.conf
@ -1,9 +1,10 @@
 # Defaults, rest will be set with tmux-sensible
+set -g default-terminal "tmux"
 set -g default-shell $SHELL
 set -g prefix C-a
 set -g base-index 1
 setw -g pane-base-index 1
-set-option -sa terminal-overrides ',screen-256color:RGB'
+set-option -as terminal-overrides ",xterm*:RGB"

 # Copy & Paste with clipper -- see https://github.com/wincent/clipper
 # starting copy & paste with Ctrl+a [
@ -32,24 +33,6 @@ bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"
 bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R"
 bind -n 'C-\' if-shell "$is_vim" "send-keys C-\\" "select-pane -l"

-# Custom statusbar
-set -g status-style bg=black,fg=yellow,default
-set -g pane-border-style fg=black
-set -g pane-active-border-style fg=brightgreen
-set -g message-style bg=black,fg=brightred
-set -g display-panes-active-colour blue
-set -g display-panes-colour brightred
-set -g status-left-length 32
-set -g status-right-length 150
-set -g status-left-length 60
-set -g status-left '#[fg=brightblack,bg=brightwhite,bold] ❐ #S #[fg=white,bg=default,nobold] ⣿ #P '
-set -g status-right '#[fg=white,bg=default,nobold] #(whoami)@#h# #[fg=black,bg=white,nobold] #(date +"%H:%M") '
-set -g window-status-format '#[fg=white,bg=default] #I #W'
-set -g window-status-current-format '#[fg=black,bg=brightgreen]#[fg=black,bg=brightgreen,noreverse,bold] #I #W #[fg=brightgreen,bg=black,nobold]'
-setw -g window-status-style fg=white,bg=default
-setw -g window-status-current-style fg=brightred,bg=default
-setw -g clock-mode-colour green
-
 # Plugin configuration
 set -g @resurrect-processes 'O l nnn v m nvim g neomutt'
 set -g @resurrect-strategy-vim 'session'
@ -63,4 +46,5 @@ set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'tmux-plugins/tmux-resurrect'
 set -g @plugin 'tmux-plugins/tmux-continuum'
 set -g @plugin 'schasse/tmux-jump'
+set -g @plugin 'lawabidingcactus/tmux-gruvbox-truecolor'
 run '~/.tmux/plugins/tpm/tpm'
--- a/zsh/aliases
+++ b/zsh/aliases
@ -10,17 +10,6 @@ alias ..='cd ..'
 alias ...='cd ../..'
 alias q='exit'

-# suffix-aliases for file-types (zsh only)
-alias -s css=$EDITOR
-alias -s html=$EDITOR
-alias -s js=$EDITOR
-alias -s json=$EDITOR
-alias -s jsx=$EDITOR
-alias -s md=$EDITOR
-alias -s scss=$EDITOR
-alias -s txt=$EDITOR
-alias -s yaml=$EDITOR
-
 # mutt
 alias mutt='neomutt'
 alias m='neomutt'
--- a/zsh/exports
+++ b/zsh/exports
@ -49,11 +49,13 @@ export LESS="-R"
 export LC_CTYPE=$LANG

 # nnn
+export NNN_OPTS='deHR'
 export NNN_BMS='d:~/Dotfiles;s:~/Sites;l:~/Downloads;h:~/'
+export NNN_FCOLORS='c1e26c2e006033f5c6d6abc4'
 export NNN_FIFO='/tmp/nnn.fifo'
 export NNN_TRASH=1
 export NNN_PLUG='o:fzcd;j:autojump;p:preview-tui'
-export NNN_ARCHIVE="\\.(7z|a|ace|alz|arc|arj|bz|bz2|cab|cpio|deb|gz|jar|lha|lz|lzh|lzma|lzo|rar|rpm|rz|t7z|tar|tbz|tbz2|tgz|tlz|txz|tZ|tzo|war|xpi|xz|Z|zip)$"
+export NNN_ARCHIVE="\\.(7z|bz|bz2|gz|rar|rpm|tar|tgz|zip)$"

 # n node version management
 export N_PREFIX="$HOME/n"; [[ :$PATH: == *":$N_PREFIX/bin:"* ]] || PATH+=":$N_PREFIX/bin"  # Added by n-install (see http://git.io/n-install-repo).
--- a/zsh/functions
+++ b/zsh/functions
@ -1,30 +1,5 @@
-webvideo () {
-  ffmpeg -i $1 -map_metadata -1 -c:a libopus -c:v libaom-av1 -crf 34 -b:v 0 -pix_fmt yuv420p -movflags +faststart -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" -strict experimental $1.av1.mp4
-  ffmpeg -i $1 -map_metadata -1 -c:a libfdk_aac -c:v libx265 -crf 24 -preset veryslow -pix_fmt yuv420p -movflags +faststart -tag:v hvc1 -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" $1.hevc.mp4
-  ffmpeg -i $1 -map_metadata -1 -c:a libfdk_aac -c:v libx264 -crf 24 -preset veryslow -profile:v main -pix_fmt yuv420p -movflags +faststart -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" $1.h264.mp4
-}
-
-webvideonoaudio () {
-  ffmpeg -i $1 -map_metadata -1 -an -c:v libaom-av1 -crf 34 -b:v 0 -pix_fmt yuv420p -movflags +faststart -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" -strict experimental $1.av1.mp4
-  ffmpeg -i $1 -map_metadata -1 -an -c:v libx265 -crf 24 -preset veryslow -pix_fmt yuv420p -movflags +faststart -tag:v hvc1 -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" $1.hevc.mp4
-  ffmpeg -i $1 -map_metadata -1 -an -c:v libx264 -crf 24 -preset veryslow -profile:v main -pix_fmt yuv420p -movflags +faststart -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" $1.h264.mp4
-}
-
-webvideooptimized () {
-  ffmpeg -i $1 -map_metadata -1 -c:a libfdk_aac -c:v libx264 -crf 24 -preset veryfast -profile:v main -pix_fmt yuv420p -movflags +faststart -vf "scale=900:trunc(ow/a/2)*2" $1.h264.mp4
-}
-
-webvideooptimizednoaudio () {
-  ffmpeg -i $1 -map_metadata -1 -an -c:v libx264 -crf 24 -preset veryslow -profile:v main -pix_fmt yuv420p -movflags +faststart -vf "scale=1920:trunc(ow/a/2)*2" $1.h264.mp4
-}
-
-webvideooptimizednoaudiomobile () {
-  ffmpeg -i $1 -map_metadata -1 -an -c:v libx264 -crf 24 -preset veryslow -profile:v main -pix_fmt yuv420p -movflags +faststart -vf "scale=720:trunc(ow/a/2)*2" $1.h264.mp4
-}
-
-webvideoposter () {
-  ffmpeg -ss 00:00:02 -i $1 -frames:v 1 $1.jpg
-}
+# TERMINAL INTEGRATIONS #
+#########################

 l () {
  if [ -n $NNNLVL ] && [ "${NNNLVL:-0}" -ge 1 ]; then
@ -34,7 +9,7 @@ l () {

  export NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"

-  nnn -deH "$@"
+  nnn "$@"

  if [ -f "$NNN_TMPFILE" ]; then
    . "$NNN_TMPFILE"
@ -42,20 +17,17 @@ l () {
  fi
 }

-# create and change to directory/folder
 take () {
  mkdir -p $1
  cd $1
 }

-# a function to get the current branch for git shortcuts etc
 current_branch () {
  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
  echo ${ref#refs/heads/}
 }

-# easy vim/terminal switch
 fancy-ctrl-z () {
  if [[ $#BUFFER -eq 0 ]]; then
    BUFFER="fg"
@ -66,6 +38,9 @@ fancy-ctrl-z () {
  fi
 }

+# CUSTOM FUNCTIONS #
+####################
+
 wttr () {
  if [[ -n "$1" ]]
    then 
@ -74,3 +49,23 @@ wttr () {
      curl "wttr.in/Leipzig?format=v2"
  fi
 }
+
+webvideo () {
+  ffmpeg -i $1 -map_metadata -1 -c:a libfdk_aac -c:v libx264 -crf 24 -preset veryslow -profile:v main -pix_fmt yuv420p -movflags +faststart -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" $1.h264.mp4
+}
+
+webvideonoaudio () {
+  ffmpeg -i $1 -map_metadata -1 -an -c:v libx264 -crf 24 -preset veryslow -profile:v main -pix_fmt yuv420p -movflags +faststart -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" $1.h264.mp4
+}
+
+webvideo1080p () {
+  ffmpeg -i $1 -map_metadata -1 -c:a libfdk_aac -c:v libx264 -crf 24 -preset veryslow -profile:v main -pix_fmt yuv420p -movflags +faststart -vf "scale=1920:trunc(ow/a/2)*2" $1.h264.mp4
+}
+
+webvideo720p () {
+  ffmpeg -i $1 -map_metadata -1 -c:a libfdk_aac -c:v libx264 -crf 24 -preset veryslow -profile:v main -pix_fmt yuv420p -movflags +faststart -vf "scale=1280:trunc(ow/a/2)*2" $1.h264.mp4
+}
+
+webvideoposter () {
+  ffmpeg -ss 00:00:02 -i $1 -frames:v 1 $1.jpg
+}