merge(main): update changes

22 files changed, 772 insertions, 407 deletions

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index e92ca09..0341dc1 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -11,10 +11,12 @@ set -g -x PATH  $PATH "$HOME/code/bio/pangraph/bin"
 set -g -x MAILCAPS /home/nolln/.config/mutt/mailcap
 set -g -x TEXINPUTS .:/home/nolln/docs//:/usr/share/texmf-dist/tex//
 set -g -x QT_QPA_PLATFORM xcb
-set -g -x LS_COLORS 'ow=36:di=34:fi=0:ex=32:ln=35:'
+set -g -x LS_COLORS 'di=34:ln=35:so=32:pi=33:ex=32:bd=34;46:cd=34:su=0:sg=0:tw=0:ow=0:*.gz=01;31:*.tgz=01;31:*.zip=01;31:*.xz=01;31'
 
 set -g -x JULIA_NUM_THREADS 4
 
+set -g -x GTK_THEME Gruvbox-Material-Dark
+
 # Set system apps
 set EDITOR nvim
 set BROWSER qutebrowser
@@ -23,11 +25,7 @@ set PAGER less -r
 # Set to Vim modal editing
 fish_vi_key_bindings
 
-# Remove greeting
-set -U fish_greeting
-
 # Useful aliases
-# set -xU LS_COLORS "di=34:ln=35:so=32:pi=33:ex=32:bd=34;46:cd=34:su=0:sg=0:tw=0:ow=0:*.gz=01;31:*.tgz=01;31:*.zip=01;31"
 alias ls='ls -hlS --color=auto'
 alias ll='ls -alF'
 alias la='ls -A'
@@ -63,10 +61,11 @@ alias umnt-cluster='umount $HOME/mnt/cluster'
 # Prompt configuration.
 set PURE_REVERSE_PROMPT_SYMBOL_IN_VIMODE false
 
-# Colored man pages
-set -xU LESS_TERMCAP_md (printf "\e[01;31m")
+#Colored man pages
+set -xU LESS_TERMCAP_mb (printf "\e[01;34m")
+set -xU LESS_TERMCAP_md (printf "\e[01;34m")
 set -xU LESS_TERMCAP_me (printf "\e[0m")
 set -xU LESS_TERMCAP_se (printf "\e[0m")
 set -xU LESS_TERMCAP_so (printf "\e[01;44;33m")
 set -xU LESS_TERMCAP_ue (printf "\e[0m")
-set -xU LESS_TERMCAP_us (printf "\e[01;32m")
+set -xU LESS_TERMCAP_us (printf "\e[01;4;32m")
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index 33bb6b2..95aa534 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -5,34 +5,35 @@ SETUVAR FZF_LEGACY_KEYBINDINGS:0
 SETUVAR FZF_PREVIEW_DIR_CMD:ls
 SETUVAR FZF_PREVIEW_FILE_CMD:head\x20\x2dn\x2010
 SETUVAR FZF_TMUX_HEIGHT:40\x25
-SETUVAR --export LESS_TERMCAP_md:\x1b\x5b01\x3b31m
+SETUVAR --export LESS_TERMCAP_mb:\x1b\x5b01\x3b34m
+SETUVAR --export LESS_TERMCAP_md:\x1b\x5b01\x3b34m
 SETUVAR --export LESS_TERMCAP_me:\x1b\x5b0m
 SETUVAR --export LESS_TERMCAP_se:\x1b\x5b0m
 SETUVAR --export LESS_TERMCAP_so:\x1b\x5b01\x3b44\x3b33m
 SETUVAR --export LESS_TERMCAP_ue:\x1b\x5b0m
-SETUVAR --export LESS_TERMCAP_us:\x1b\x5b01\x3b32m
+SETUVAR --export LESS_TERMCAP_us:\x1b\x5b01\x3b4\x3b32m
 SETUVAR __fish_init_2_39_8:\x1d
 SETUVAR __fish_init_2_3_0:\x1d
 SETUVAR __fish_init_3_x:\x1d
 SETUVAR __fish_initialized:3100
-SETUVAR fish_color_autosuggestion:brblack
+SETUVAR fish_color_autosuggestion:585858
 SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:brgreen
-SETUVAR fish_color_comment:brmagenta
+SETUVAR fish_color_command:a1b56c
+SETUVAR fish_color_comment:f7ca88
 SETUVAR fish_color_cwd:green
 SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:brmagenta
-SETUVAR fish_color_error:brred
-SETUVAR fish_color_escape:brcyan
+SETUVAR fish_color_end:ba8baf
+SETUVAR fish_color_error:ab4642
+SETUVAR fish_color_escape:86c1b9
 SETUVAR fish_color_history_current:\x2d\x2dbold
 SETUVAR fish_color_host:normal
 SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
+SETUVAR fish_color_match:7cafc2
 SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:cyan
-SETUVAR fish_color_param:brblue
-SETUVAR fish_color_quote:yellow
-SETUVAR fish_color_redirection:bryellow
+SETUVAR fish_color_operator:7cafc2
+SETUVAR fish_color_param:d8d8d8
+SETUVAR fish_color_quote:f7ca88
+SETUVAR fish_color_redirection:d8d8d8
 SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
 SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
 SETUVAR fish_color_status:red
@@ -41,8 +42,8 @@ SETUVAR fish_color_valid_path:\x2d\x2dunderline
 SETUVAR fish_greeting:\x1d
 SETUVAR fish_key_bindings:fish_vi_key_bindings
 SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:yellow
-SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_description:B3A06D\x1eyellow
+SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
 SETUVAR fish_user_paths:/home/nolln/\x2epoetry/bin\x1e/home/nolln/root/bin\x1e/home/nolln/\x2eyarn/bin\x1e/home/nolln/code/bin\x1e/home/nolln/go/bin\x1e/home/nolln/\x2elocal/bin\x1e/home/nolln/code/muon/bin\x1e/home/nolln/\x2efzf/bin\x1e/home/nolln/opt/Vivado/2019\x2e2/bin
 SETUVAR pure_begin_prompt_with_current_directory:true
diff --git a/.config/mutt/colors b/.config/mutt/colors
index c34b1e9..d904ec1 100644
--- a/.config/mutt/colors
+++ b/.config/mutt/colors
@@ -1,51 +1,52 @@
 # Theme for Mutt
 
 # general ------------ foreground ---- background -----------------------------
-color error		        color196        default
-color indicator		    color215        default
+color error		        red             default
+color indicator		    brightblue      default
 color markers		    default         default
-color message		    color228        default
+color message		    white           default
 color normal		    default		    default
-color prompt		    color153        default
-color search		    color28         default
-color status 		    color153        default 
+color prompt		    brightwhite     default
+color search		    lightgreen      default
+color status 		    color243        default
 color tilde		        color159        default
-color tree		        color95         default
+color tree		        brightmagenta   default
 
 # message index ------ foreground ---- background -----------------------------
 color index_author     default     default     ".*"
-color index_author     default     default     ~F
+color index_author     blue        default     ~F
 color index_author     color243    default     ~Q
-color index_author     color36     default     ~N
-color index_author     color124    default     ~D
+color index_author     brightgreen default     ~N
+color index_author     brightred   default     ~D
 
 color index_subject    default     default     ".*"
-color index_subject    default     default     ~F
+color index_subject    blue        default     ~F
 color index_subject    color243    default     ~Q
-color index_subject    color36     default     ~N
-color index_subject    color161    default     ~D
+color index_subject    brightgreen default     ~N
+color index_subject    brightred   default     ~D
+color index_subject    white       default	   ~v
 
-color index		       default     default     ~F # flagged messages
-color index		       color36     default 	   ~N # new messages
+color index		       blue        default     ~F # flagged messages
+color index		       brightgreen default 	   ~N # new messages
 color index		       color243    default 	   ~Q # messages which have been replied to
-color index		       color161    default 	   ~D # deleted messages
+color index		       brightred   default 	   ~D # deleted messages
 color index		       default     default 	   ~T # tagged messages
-color index		       color95     default	   ~v # messages part of a collapsed thread
+color index            white       default	   ~v # messages part of a collapsed thread
 
 # message headers ---- foreground ---- background -----------------------------
-color hdrdefault	    color152    default
-color header		    color215    default		^Subject:.*
+color hdrdefault	    white             default
+color header		    brightblue        default		^Subject:.*
 
 # message body ------- foreground ---- background -----------------------------
-color attachment	    color216    default
-color body		        default     default		[\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+               # email addresses
-color body		        color159    default		(https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+        # URLs
-color body		        color170    default		(^|[[:space:]])\\*[^[:space:]]+\\*([[:space:]]|$) # *bold* text
-color body		        color183    default		(^|[[:space:]])_[^[:space:]]+_([[:space:]]|$)     # _underlined_ text
-color body		        default     default		(^|[[:space:]])/[^[:space:]]+/([[:space:]]|$)     # /italic/ text
-color quoted		    color138    default
-color quoted1		    color243    default
-color quoted2		    color242    default
-color quoted3		    color241    default
-color quoted4		    color240    default
-color signature		    default     default
+color attachment	    brightwhite  default
+color body		        white        default		[\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+               # email addresses
+color body		        brightcyan   default		(https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+        # URLs
+color body		        brightwhite  default		(^|[[:space:]])\\*[^[:space:]]+\\*([[:space:]]|$) # *bold* text
+color body		        white        default		(^|[[:space:]])_[^[:space:]]+_([[:space:]]|$)     # _underlined_ text
+color body		        default      default		(^|[[:space:]])/[^[:space:]]+/([[:space:]]|$)     # /italic/ text
+color quoted		    color244     default
+color quoted1		    color242     default
+color quoted2		    color240     default
+color quoted3		    color238     default
+color quoted4		    color236     default
+color signature		    white        default
diff --git a/.config/mutt/mail b/.config/mutt/mail
index bc98f1f..4b845d3 100644
--- a/.config/mutt/mail
+++ b/.config/mutt/mail
@@ -7,6 +7,8 @@ set realname     = "Nicholas B. Noll"
 set editor       = "nvim +':set textwidth=0' +':set wrapmargin=0' +':set wrap'"
 set send_charset = "utf-8"
 
+alternative_order text/plain text/enriched text/html
+
 set delete
 unset confirmappend
 set quit
@@ -17,7 +19,7 @@ set message_cachedir = "~/.cache/mutt/body"
 
 # encrypt
 set pgp_sign_as=0x866A118A49FDD67D1DEF1537D857DC73F04B8EC3
-set crypt_autosign
+# set crypt_autosign
 set crypt_replyencrypt
 set crypt_replysign
 set crypt_replysignencrypted
diff --git a/.config/mutt/mailcap b/.config/mutt/mailcap
index 95c723f..01dbaa1 100644
--- a/.config/mutt/mailcap
+++ b/.config/mutt/mailcap
@@ -11,7 +11,8 @@ image/gif; ~/.config/mutt/view_attachment.sh %s gif
 application/pdf; ~/.config/mutt/view_attachment.sh %s pdf
 
 # Explicitly render in browser with "v" (view attachment):
-text/html; CHARSET=%{charset} ~/.config/mutt/view_attachment.sh %s html
+# text/html; CHARSET=%{charset} ~/.config/mutt/view_attachment.sh %s html
+text/html; w3m -I %{charset} -T text/html; copiousoutput;
 text/plain; ~/.config/mutt/view_mail.sh %s %{charset}; needsterminal
 
 # Unidentified files
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index c214105..587c545 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -9,6 +9,8 @@ source $HOME/.config/mutt/colors
 auto_view text/plain text/html
 set sleep_time = 0
 
+set signature = $HOME/.config/mutt/signature
+
 # sidebar
 set sidebar_visible
 set sidebar_format = "%B%?F? [%F]?%* %?N?%N/?%S"
diff --git a/.config/mutt/usr/gmail b/.config/mutt/usr/gmail
index 15bc439..e2a3f0d 100644
--- a/.config/mutt/usr/gmail
+++ b/.config/mutt/usr/gmail
@@ -6,7 +6,8 @@ set spoolfile  = "+gmail/INBOX"
 set postponed  = "+gmail/[Gmail].Drafts"
 set trash      = "+gmail/[Gmail].Trash"
 set record     = "+gmail/[Gmail].Sent Mail"
-set sendmail   = "/usr/bin/msmtp -a gmail"
+set sendmail   = "email gmail"
+set copy       = no
 
 # account specific macros
 macro index,pager a "<save-message>+gmail/[Gmail].Store<enter>" "Archive Message"
diff --git a/.config/mutt/usr/main b/.config/mutt/usr/main
index fe4cf57..4f470f2 100644
--- a/.config/mutt/usr/main
+++ b/.config/mutt/usr/main
@@ -7,7 +7,8 @@ set record     = "+main/Sent"
 set postponed  = "+main/Drafts"
 set trash      = "+main/Trash"
 set mbox       = "+main/Archive"
-set sendmail   = "/usr/bin/msmtp -a main"
+set sendmail   = "email main"
+set copy       = yes
 
 # account specific macros
 macro index,pager a "<save-message>+main/Archive<enter>" "Archive Message"
diff --git a/.config/nvim/after/syntax/c.vim b/.config/nvim/after/syntax/c.vim
index 04896e7..f09d085 100644
--- a/.config/nvim/after/syntax/c.vim
+++ b/.config/nvim/after/syntax/c.vim
@@ -1,4 +1,4 @@
-syn keyword cgoInt          uint8 uint16 uint32 uint64 int8 int16 int32 int64 uint uintptr intptr byte ubyte sbyte ulong vlong uvlong rune
+syn keyword cgoInt          uint8 uint16 uint32 uint64 int8 int16 int32 int64 uint uintptr intptr byte ubyte sbyte ushort vshort ulong vlong uvlong rune
 syn keyword cgoFloat        float32 float64
 syn keyword cgoType         string
 syn keyword cgoConstant     nil 
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 4ab2713..21eac01 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -8,21 +8,23 @@ local vi     = vim.v.progname == 'vi'
 
 local packages = string.gmatch(vim.fn.glob(config .. "/pack/vendor/opt/*"), "[^\n]+")
 
+local packadd    = function(name) vim.cmd("packadd "  .. name) end
+local packtouch  = function(name) vim.cmd("packadd! " .. name) end
+
 for package in packages do
     local basename, _ = package:gsub("(.*/)(.*)", "%2")
     if vim.v.vim_did_enter == 1 then
-        vim.cmd("packadd "  .. basename)
+        packadd(basename)
     else
-        vim.cmd("packadd! " .. basename)
+        packtouch(basename)
     end
 end
-vim.cmd("packadd termdebug")
+packadd("termdebug")
 
 --------------------------------------------------------------------------
 -- commands
 
 vim.cmd('filetype indent plugin on')
-vim.cmd('syntax enable')
 
 --------------------------------------------------------------------------
 -- includes
diff --git a/.config/nvim/lua/keybind.lua b/.config/nvim/lua/keybind.lua
index d97074d..28b8171 100644
--- a/.config/nvim/lua/keybind.lua
+++ b/.config/nvim/lua/keybind.lua
@@ -23,15 +23,18 @@ vim.api.nvim_set_keymap("n", "<Leader>f", ":Files<CR>",   { noremap = true, sile
 vim.api.nvim_set_keymap("n", "<Leader>b", ":Buffers<CR>", { noremap = true, silent = true })
 vim.api.nvim_set_keymap("n", "<Leader>l", ":Lines<CR>",   { noremap = true, silent = true })
 vim.api.nvim_set_keymap("n", "<Leader>w", ":BLines<CR>",  { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "<Leader>m", ":Marks<CR>",   { noremap = true, silent = true })
 
 vim.api.nvim_set_keymap("n", "<Leader>|", ":wincmd |<CR>", { noremap = true, silent = true })
-vim.api.nvim_set_keymap("n", "<Leader>=", ":wincmd =<CR>",   { noremap = true, silent = true })
-vim.api.nvim_set_keymap("n", "<Leader>r", ":wincmd R<CR>",   { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "<Leader>=", ":wincmd =<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "<Leader>r", ":wincmd R<CR>", { noremap = true, silent = true })
 
 vim.api.nvim_set_keymap("n", "<Leader><Leader>d",     ":Termdebug<CR>", { noremap = true, silent = true })
 vim.api.nvim_set_keymap("n", "<Leader><Leader>b",     ":Break<CR>",     { noremap = true, silent = true })
 vim.api.nvim_set_keymap("n", "<Leader><Leader><S-b>", ":Clear<CR>",     { noremap = true, silent = true })
 
+vim.api.nvim_set_keymap("n", "ga", ":EasyAlign<CR>", { noremap = true })
+
 --------------------------------------------------------------------------
 -- insert
 
@@ -45,8 +48,15 @@ vim.api.nvim_set_keymap("x", "<C-j>", "<C-w>j", { noremap = true })
 vim.api.nvim_set_keymap("x", "<C-k>", "<C-w>k", { noremap = true })
 vim.api.nvim_set_keymap("x", "<C-l>", "<C-w>l", { noremap = true })
 
+vim.api.nvim_set_keymap("x", "ga", ":EasyAlign<CR>", { noremap = true })
+
 --------------------------------------------------------------------------
 -- keybind
 
 vim.api.nvim_set_keymap("c", "<C-a>", "<Home>", { noremap = true })
 vim.api.nvim_set_keymap("c", "<C-e>", "<End>",  { noremap = true })
+
+--------------------------------------------------------------------------
+-- netrw
+
+vim.cmd("nmap <unique> <C-;> <Plug>NetrwRefresh")
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index 98caa7f..90dfce9 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -1,5 +1,9 @@
-local lsp = require('lspconfig')
-local git = require('neogit')
+local lsp      = require('lspconfig')
+local git      = require('neogit')
+local gitsigns = require('gitsigns')
+
+--------------------------------------------------------------------------
+-- lsp
 
 local setup = function(client, buffer)
     local function set_keymap(...) vim.api.nvim_buf_set_keymap(buffer, ...) end
@@ -13,7 +17,6 @@ local setup = function(client, buffer)
     set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
     set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
     set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
-    set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
     set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
     set_keymap('n', '[c', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
     set_keymap('n', ']c', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
@@ -36,4 +39,18 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
     }
 )
 
+--------------------------------------------------------------------------
+-- neogit
+
 git.setup({})
+
+--------------------------------------------------------------------------
+-- gitsigns
+
+gitsigns.setup({
+    keymaps = {
+        noremap = true,
+        ['n ]d'] = { expr = true, "&diff ? ']c' : '<cmd>lua require\"gitsigns.actions\".next_hunk()<CR>'"},
+        ['n [d'] = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns.actions\".prev_hunk()<CR>'"},
+    }
+})
diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua
index 83d6e10..38bf17b 100644
--- a/.config/nvim/lua/settings.lua
+++ b/.config/nvim/lua/settings.lua
@@ -51,6 +51,7 @@ if vi then
 end
 
 opt.modelines      = 5    -- scan this many lines looking for modeline
+opt.mouse          = 'a'  -- all modes allow mouse
 opt.number         = true -- show line numbers in gutter
 opt.pumblend       = 10   -- pseudo-transparency for popup-menu
 opt.relativenumber = true -- show relative numbers in gutter
@@ -145,6 +146,5 @@ vim.g.termdebug_wide = 1
 -- latex
 vim.g.tex_flavor     = "latex"
 
--- git gutter
-vim.g.gitgutter_grep                 = ""
-vim.g.gitgutter_set_sign_backgrounds = 1
+-- headers are c
+vim.g.c_syntax_for_h = 1
diff --git a/.config/nvim/lua/theme.lua b/.config/nvim/lua/theme.lua
index 83e9c0a..6e297ca 100644
--- a/.config/nvim/lua/theme.lua
+++ b/.config/nvim/lua/theme.lua
@@ -1,170 +1,186 @@
 vim.cmd("hi clear")
 
-local theme = {
-    [22]  = '#006F00', [23]  = '#007173', [24]  = '#007299', [25]  = '#0074BE',
-    [30]  = '#009799', [31]  = '#0099BD', [38]  = '#00BDDF', [52]  = '#730B00',
-    [58]  = '#727100', [59]  = '#727272', [65]  = '#719872', [66]  = '#719899',
-    [67]  = '#7299BC', [68]  = '#719CDF', [73]  = '#6FBCBD', [74]  = '#70BDDF',
-    [88]  = '#9B1300', [89]  = '#9B1D72', [94]  = '#9A7200', [95]  = '#9A7372',
-    [96]  = '#9A7599', [101] = '#999872', [103] = '#999ABD', [108] = '#98BC99',
-    [109] = '#98BCBD', [110] = '#98BEDE', [116] = '#97DDDF', [125] = '#BF2172',
-    [131] = '#BE7572', [137] = '#BE9873', [143] = '#BDBB72', [144] = '#BDBC98',
-    [145] = '#BDBDBD', [151] = '#BCDDBD', [152] = '#BCDEDE', [153] = '#BCE0FF',
-    [161] = '#E12672', [168] = '#E17899', [173] = '#E19972', [174] = '#E09B99',
-    [179] = '#DFBC72', [181] = '#E0BEBC', [184] = '#DEDC00', [186] = '#DEDD99',
-    [187] = '#DFDEBD', [189] = '#DFDFFF', [216] = '#FFBD98', [217] = '#FFBFBD',
-    [218] = '#FFC0DE', [220] = '#FFDD00', [222] = '#FFDE99', [224] = '#FFDFDF',
-    [230] = '#FFFFDF', [231] = '#FFFFFF', [232] = '#060606', [233] = '#171717',
-    [234] = '#252525', [235] = '#333233', [236] = '#3F3F3F', [237] = '#4B4B4B',
-    [238] = '#565656', [239] = '#616161', [240] = '#6B6B6B', [241] = '#757575',
-    [249] = '#BFBFBF', [250] = '#C8C8C8', [251] = '#D1D0D1', [252] = '#D9D9D9',
-    [253] = '#E1E1E1', [254] = '#E9E9E9', [255] = '#F1F1F1',
-
-    ['nil']  = "",
-    ['none'] = 'NONE',
-}
-
 function highlight(group, color)
-    local style = color.style and "gui="   .. color.style or "gui=NONE"
-    local fg    = color.fg    and "guifg=" .. color.fg    or "guifg=NONE"
-    local bg    = color.bg    and "guibg=" .. color.bg    or "guibg=NONE"
-    local sp    = color.sp    and "guisp=" .. color.sp    or ""
-
-    local hl = "highlight " .. group .. " " .. style .. " " .. fg .. " " .. bg .. " " .. sp
-
-    vim.cmd(hl)
-
-    if color.link then vim.cmd("highlight! link " .. group .. " " .. color.link) end
+    local gui = {
+        style = color.gui      and  "gui="   .. color.gui      or "gui=NONE",
+        fg    = color.guifg    and  "guifg=" .. color.guifg    or "guifg=NONE",
+        bg    = color.guibg    and  "guibg=" .. color.guibg    or "guibg=NONE",
+        sp    = color.guisp    and  "guisp=" .. color.guisp    or "guisp=NONE",
+    }
+
+    local term = {
+        style = color.cterm      and  "cterm="   .. color.cterm      or "cterm=NONE",
+        fg    = color.ctermfg    and  "ctermfg=" .. color.ctermfg    or "ctermfg=NONE",
+        bg    = color.ctermbg    and  "ctermbg=" .. color.ctermbg    or "ctermbg=NONE",
+        sp    = ""
+    }
+
+    function serialize(options)
+        return " " .. options.style .. " " .. options.fg .. " " .. options.bg .. " " .. options.sp
+    end
+
+    local hi = "highlight " .. group .. serialize(term) .. serialize(gui)
+
+    vim.cmd(hi)
 end
 
-local editor = {
-    Normal           = {},
-    EndOfBuffer      = {},
-    SignColumn       = {},
-    NormalFloat      = { fg = theme[252], bg = theme[237] },
-
-    Special          = { fg = theme[216] },
-    SpecialKey       = { fg = theme[59]  },
-    NonText          = { fg = theme[239] },
-    VertSplit        = { fg = theme[239] },
-
-    LineNr           = { fg = theme[101] },
-    CursorLineNr     = { fg = theme[131] },
-    CursorLine       = { bg = theme[236] },
-
-    Search           = { fg = theme[252], bg = theme[24]  },
-    IncSearch        = { fg = theme[220], bg = theme[238] },
-
-    StatusLine       = { fg = theme[95],  bg = theme[187], style='reverse,bold' },
-    StatusLineNC     = { fg = theme[239], bg = theme[187], style='reverse,bold' },
-    StatusLineTerm   = { fg = theme[95],  bg = theme[187], style='reverse,bold' },
-    StatusLineTermNC = { fg = theme[239], bg = theme[187], style='reverse,bold' },
-
-    TabLineFill      = { fg = theme[239] },
-    TabLineSel       = { fg = theme[187], bg = theme[23] },
-    TabLine          = { fg = theme[249], bg = theme[241] },
-    WildMenu         = { fg = theme[95],  bg = theme[185] },
-
-    Title            = { fg = theme[181] },
-    Question         = { fg = theme[179] },
-    Conceal          = { fg = theme[254], bg = theme[236] },
-    Ignore           = { fg = theme[240], bg = theme[237] },
-
-    Visual           = { bg = theme[23] },
-    VisualNOS        = { bg = theme[23] },
-
-    Folded           = { fg = theme[101], bg = theme[238] },
-    FoldColumn       = { fg = theme[144], bg = theme[94]  },
-
-    Pmenu            = { fg = theme[238], bg = theme[224] },
-    PmenuSel         = { fg = theme[252], bg = theme[89] },
-    PmenuSbar        = { bg = theme[65] },
-    PmenuThumb       = { bg = theme[23] },
-
-    SpellBad         = { fg = theme[168], style = 'italic,undercurl' },
-    SpellCap         = { fg = theme[110], style = 'italic,undercurl' },
-    SpellLocal       = { fg = theme[153], style = 'italic,undercurl' },
-    SpellRare        = { fg = theme[218], style = 'italic,undercurl' },
+function link(from, to)
+    for i in ipairs(from)
+    do
+        local hi = "hi! link " .. from[i] .. " " .. to
+        vim.cmd(hi)
+    end
+end
 
-    DiffAdd          = { bg = theme[22]  },
-    DiffDelete       = { bg = theme[95]  },
-    DiffChange       = { bg = theme[235] },
-    DiffText         = { bg = theme[52]  },
+local color = {
+    none = "NONE",
+    blue = {
+        [1] = "#83a598",
+        [2] = "#458588",
+    },
+    yellow = {
+        [1] = "#fabd2f",
+        [2] = "#eecf9",
+    },
+    red = {
+        [1] = "#d75f5f",
+        [2] = "#e96862",
+    },
+    orange = {
+        [1] = "#d65d0e",
+        [2] = "#feb67b",
+    },
+    aqua = {
+        [1] = "#8ec07c",
+        [2] = "#8cb48d",
+    },
+    purple = {
+        [0] = "#a68390",
+        [1] = "#d3869b",
+        [2] = "#b16286",
+    },
+    white = {
+        [1] = "#fbf1c7",
+        [2] = "#ebdbb2",
+        [3] = "#d5c4a1",
+        [4] = "#bdae93",
+        [5] = "#a89984",
+    },
+    gray = {
+        [1] = "#928374",
+        [2] = "#7c6f64",
+        [3] = "#665c54",
+        [4] = "#504945",
+        [5] = "#3c3836",
+    },
+    black = {
+        [0] = "#32302f",
+        [1] = "#282828",
+        [2] = "#1d2021",
+    },
 }
 
-for group, colors in pairs(editor) do highlight(group, colors) end
-
-local syntax = {
-    Number          = { fg = theme[222] },
-    Float           = { fg = theme[222] },
-    Boolean         = { fg = theme[103] },
-    Constant        = { fg = theme[73]  },
-    Character       = { fg = theme[174] },
-    String          = { fg = theme[109] },
-    Identifier      = { fg = theme[217] },
-    Delimiter       = { fg = theme[137] },
-    StringDelimiter = { fg = theme[137] },
-
-    Type            = { fg = theme[179], style='bold' },
-    Keyword         = { fg = theme[168] },
-    Operator        = { fg = theme[186] },
-    Structure       = { fg = theme[116] },
-
-    Statement       = { fg = theme[108] },
-    Conditional     = { fg = theme[110] },
-    Repeat          = { fg = theme[68], },
-    Function        = { fg = theme[187] },
-
-    PreProc         = { fg = theme[143] },
-    Comment         = { fg = theme[65],  style='italic' },
-    Todo            = { fg = theme[161], bg = theme[235], style='bold' },
-
-    Define          = { fg = theme[173] },
-    Macro           = { fg = theme[173] },
-    Include         = { fg = theme[173] },
-    PreCondit       = { fg = theme[173] },
-
-    Exception       = { fg = theme[161] },
-    Underlined      = { fg = theme[181] },
-    Error           = { fg = theme[252], bg = theme[52] },
-    ErrorMsg        = { fg = theme[252], bg = theme[52] },
+-- TODO: cterm options have not been checked
+local theme = {
+    Normal            = { },
+    EndOfBuffer       = { },
+    NonText           = { ctermfg="238", guifg=color.gray[4] },
+    Comment           = { ctermfg="241", guifg=color.gray[3], gui="italic" },
+    Conceal           = { ctermfg="241", guifg=color.gray[2] },
+    Constant          = { ctermfg="140", guifg=color.orange[2] },
+    String            = { ctermfg="140", guifg=color.blue[1] },
+    Identifier        = { ctermfg="251", guifg=color.white[2], gui="bold" },
+    Statement         = { ctermfg="243", guifg=color.aqua[2] },
+    Operator          = { ctermfg="251", guifg=color.white[3] },
+    PreProc           = { ctermfg="243", guifg=color.red[2] },
+    Type              = { ctermfg="251", guifg=color.yellow[2], gui="bold" },
+    Special           = { ctermfg="243", guifg=color.gray[1] },
+    Error             = { ctermfg="132", guifg=color.orange[1] },
+    Warning           = { ctermfg="179", guifg=color.yellow[1] },
+    ModeMsg           = { ctermfg="243", guifg=color.gray[2] },
+    Todo              = { ctermfg="167", cterm="bold", guifg=color.red[1], guibg=color.black[1], gui="bold" },
+    Underlined        = { ctermfg="251", cterm="underline", guifg=color.white[3], gui="underline" },
+    StatusLine        = { ctermbg="237", ctermfg="140", guibg=color.white[5], guifg=color.gray[5], gui="bold" },
+    StatusLineNC      = { ctermbg="236", ctermfg="243", guibg=color.gray[4], guifg=color.white[3] },
+    WildMenu          = { ctermbg="236", ctermfg="167", guibg=color.gray[5], guifg=color.red[1] },
+    VertSplit         = { ctermbg="236", ctermfg="236", guibg=color.black[0], guifg=color.gray[2] },
+    Title             = { ctermfg="251", cterm="bold", guifg=color.white[3], gui="bold" },
+    LineNr            = { ctermfg="241", guifg=color.gray[2] },
+    CursorLineNr      = { ctermbg="236", ctermfg="140", guifg=color.blue[1] },
+    Cursor            = { ctermbg="140", ctermfg="251", guibg=color.blue[1], guifg=color.white[3] },
+    CursorLine        = { ctermbg="236", guibg=color.black[0] },
+    ColorColumn       = { ctermbg="234", guibg=color.black[1] },
+    SignColumn        = { ctermfg="243", guifg=color.gray[2] },
+    Visual            = { ctermbg="237", guibg=color.gray[3] },
+    VisualNOS         = { ctermbg="238", guibg=color.gray[1] },
+    Pmenu             = { ctermbg="237", guibg=color.gray[3], guifg=color.white[2] },
+    PmenuSbar         = { ctermbg="236", guibg=color.black[0] },
+    PmenuSel          = { ctermbg="236", ctermfg="140", guibg=color.gray[5], guifg=color.blue[1] },
+    PmenuThumb        = { ctermbg="167", guibg=color.red[1] },
+    FoldColumn        = { ctermfg="241", guifg=color.gray[2] },
+    Folded            = { ctermbg="234", ctermfg="243", guibg=color.black[0], guifg=color.white[5] },
+    SpecialKey        = { ctermfg="243", guifg=color.gray[4] },
+    IncSearch         = { ctermbg="167", ctermfg="235", guibg=color.aqua[1], guifg=color.black[1] },
+    Search            = { ctermbg="140", ctermfg="235", guibg=color.blue[1], guifg=color.black[1] },
+    Directory         = { ctermfg="140", guifg=color.blue[1] },
+    MatchParen        = { ctermfg="167", cterm="bold", guifg=color.aqua[1], gui="bold" },
+    SpellBad          = { ctermfg="132", cterm="underline", guifg=color.purple[1], gui="underline" },
+    SpellCap          = { ctermfg="108", cterm="underline", guifg=color.aqua[1], gui="underline" },
+    SpellLocal        = { ctermfg="179", cterm="underline", guifg=color.yellow[1], gui="underline" },
+    QuickFixLine      = { ctermbg="234", guibg=color.black[1] },
+    DiffAdd           = { ctermbg="236", ctermfg="108", guibg=color.gray[5], guifg=color.aqua[1] },
+    DiffChange        = { ctermbg="236", guifg=color.yellow[1] },
+    DiffDelete        = { ctermbg="236", ctermfg="132", guibg=color.gray[5], guifg=color.purple[1] },
+    DiffText          = { ctermbg="236", ctermfg="179", guibg=color.gray[5], guifg=color.yellow[1] },
+    helpHyperTextJump = { ctermfg="140",  guifg=color.blue[1] },
 }
 
-for group, colors in pairs(syntax) do highlight(group, colors) end
+local links = {
+    Constant     = { "Boolean", "Character", "Number" },
+    CursorLine   = { "CursorColumn" },
+    DiffAdd      = { "diffAdded", "GitSignsAdd" },
+    DiffChange   = { "GitSignsChange" },
+    DiffDelete   = { "diffRemoved", "GitSignsDelete" },
+    Error        = { "ErrorMsg" },
+    htmlTag      = { "htmlEndTag" },
+    htmlTagName  = { "htmlTag" },
+    Identifier   = { "Function" },
+    ModeMsg      = { "MoreMsg", "Question" },
+    NonText      = { "Ignore" },
+    Number       = { "Float" },
+    PreProc      = { "Define", "Include", "Macro", "PreCondit" },
+    Special      = { "Debug", "Delimiter", "SpecialChar", "SpecialComment", "Tag" },
+    SpellLocal   = { "SpellRare" },
+    Statement    = { "Conditonal", "Exception", "Keyword", "Label", "Repeat" },
+    StatusLineNC = { "StatusLineTermNC", "TabLine", "TabLineFill" },
+    StatusLine   = { "StatusLineTerm", "TabLineSel" },
+    Title        = { "gitcommitSummary" },
+    Type         = { "StorageClass", "Structure", "Typedef" },
+    Warning      = { "WarningMsg" },
+}
 
--- TODO: don't hardcode these
-vim.g.terminal_color_0  = "#4E4E4D"
-vim.g.terminal_color_1  = "#D68787"
-vim.g.terminal_color_2  = "#5F865F"
-vim.g.terminal_color_3  = "#D8AF5F"
-vim.g.terminal_color_4  = "#85ADD4"
-vim.g.terminal_color_5  = "#D7AFAF"
-vim.g.terminal_color_6  = "#87AFAF"
-vim.g.terminal_color_7  = "#D0D0D0"
-vim.g.terminal_color_8  = "#626262"
-vim.g.terminal_color_9  = "#D75F87"
-vim.g.terminal_color_10 = "#87AF87"
-vim.g.terminal_color_11 = "#FFD787"
-vim.g.terminal_color_12 = "#ADD4FB"
-vim.g.terminal_color_13 = "#FFAFAF"
-vim.g.terminal_color_14 = "#87D7D7"
-vim.g.terminal_color_15 = "#E4E4E4"
+for group,  colors in pairs(theme) do highlight(group, colors) end
+for parent, groups in pairs(links) do link(groups, parent)     end
+
+vim.g.terminal_color_0  = "#282828"
+vim.g.terminal_color_1  = "#ea6962"
+vim.g.terminal_color_2  = "#a9b665"
+vim.g.terminal_color_3  = "#d8a657"
+vim.g.terminal_color_4  = "#7daea3"
+vim.g.terminal_color_5  = "#d3869b"
+vim.g.terminal_color_6  = "#89b482"
+vim.g.terminal_color_7  = "#d4be98"
+vim.g.terminal_color_8  = "#928374"
+vim.g.terminal_color_9  = "#ef938e"
+vim.g.terminal_color_10 = "#bbc585"
+vim.g.terminal_color_11 = "#e1bb7e"
+vim.g.terminal_color_12 = "#9dc2ba"
+vim.g.terminal_color_13 = "#e1acbb"
+vim.g.terminal_color_14 = "#a7c7a2"
+vim.g.terminal_color_15 = "#e2d3ba"
 
 vim.g.fzf_colors = {
     ["fg"]      = {'fg', 'NormalFloat'},
     ["bg"]      = {'bg', 'NormalFloat'},
     ["fg+"]     = {'bg', 'StatusLine'},
 }
-
-vim.o.pumblend = 20
-
--- dark-fg = 252, dark-bg = 237
-local plugins = {
-    -- vim-gitgutter
-    GitGutterAdd          = { fg = theme[108], bg = theme[238] },
-    GitGutterChange       = { fg = theme[68],  bg = theme[238] },
-    GitGutterDelete       = { fg = theme[161], bg = theme[238] },
-    GitGutterChangeDelete = { fg = theme[168], bg = theme[238] },
-}
-
-for group, colors in pairs(plugins) do highlight(group, colors) end
diff --git a/.config/nvim/pack/vendor/packages b/.config/nvim/pack/vendor/packages
index 72e8ddd..5b668a4 100644
--- a/.config/nvim/pack/vendor/packages
+++ b/.config/nvim/pack/vendor/packages
@@ -5,10 +5,11 @@ neovim/nvim-lspconfig
 nvim-neorg/neorg
 nvim-lua/plenary.nvim
 nvim-treesitter/nvim-treesitter
-
 TimUntersberger/neogit
+lewis6991/gitsigns.nvim
 
 junegunn/fzf.vim
+junegunn/vim-easy-align
 
 tpope/vim-surround
 tpope/vim-repeat
@@ -17,7 +18,6 @@ tpope/vim-commentary
 
 simeji/winresizer
 adelarsq/vim-matchit
-airblade/vim-gitgutter
 
 lervag/vimtex
 plasticboy/vim-markdown
diff --git a/.config/nvim/pack/vendor/update b/.config/nvim/pack/vendor/update
index 5dabe5c..7b55810 100755
--- a/.config/nvim/pack/vendor/update
+++ b/.config/nvim/pack/vendor/update
@@ -1,13 +1,32 @@
 #!/usr/bin/python
 
 import os
+import shutil
 import subprocess
 
 from glob import glob
 
 if __name__ == "__main__":
+    # ensure our packages are up-to-date with list
+    names = set()
+    with open("packages") as pkgs:
+        for pkg in pkgs:
+            if pkg == "\n" or pkg.startswith("["):
+                continue
+            name = pkg.split("/")[-1]
+            names.add(name[0:-1])
+
+    for repo in glob("opt/*/"):
+        base = repo.split("/")[-2]
+        if not base in names:
+            print(f"> removing {base}")
+            shutil.rmtree(repo)
+
+
     cwd   = os.getcwd()
     procs = []
+
+    # pull in changes
     for repo in glob("opt/*/"):
         os.chdir(repo)
         procs.append(subprocess.Popen(["git", "pull"]))
diff --git a/.config/picom/config b/.config/picom/config
index 2deffb5..ef27cce 100644
--- a/.config/picom/config
+++ b/.config/picom/config
@@ -6,12 +6,13 @@ backend = "glx";
 refresh-rate          = 0;
 vsync                 = false;
 xrender-sync-fence    = true;
+mark-ovredir-focused  = false;
 
 # ------------------------------------------------------------------------
 # fading
 
 fading        = true;
-fade-delta    = 2;
+fade-delta    = 5;
 fade-in-step  = 0.05;
 fade-out-step = 0.05;
 
@@ -23,37 +24,50 @@ shadow-radius   = 5;
 shadow-offset-x = -5;
 shadow-offset-y = -5;
 shadow-opacity  = 0.5;
+shadow-exclude  = [
+    "class_g = 'dwm'",
+]
 
 # ------------------------------------------------------------------------
 # special classes
 
 round-borders = 1;
-corner-radius = 4;
+round-borders-exclude = [
+    "class_i = 'dwm'",
+];
+corner-radius = 6;
+rounded-corners-exclude = [
+    "class_i = 'dwm'",
+]
 
-menu          = { shadow = false; opacity = 1.0 };
-dropdown_menu = { shadow = false; opacity = 1.0 };
-popup_menu    = { shadow = false; opacity = 1.0 };
-utility       = { shadow = false; opacity = 1.0 };
+wintypes:
+{
+    tooltip       = { shadow = false; opacity = 1.0; focus = true; blur = false; };
+    dropdown_menu = { shadow = false; opacity = 1.0; focus = true; blur = false; };
+    popup_menu    = { shadow = false; opacity = 1.0; focus = true; blur = false; };
+    utility       = { shadow = false; opacity = 1.0; focus = true; blur = false; };
+};
 
 # ------------------------------------------------------------------------
 # opacity
 
-focus-exclude = "x = 0 && y = 0 && override_redirect = true";
-
-inactive-opacity          = 0.9;
-active-opacity            = 0.97;
-frame-opacity             = 0.9;
-detect-client-opacity     = true;
-inactive-opacity-override = false;
+inactive-opacity          = 0.90;
+active-opacity            = 0.98;
+frame-opacity             = 1.00;
+detect-client-opacity     = false;
+inactive-opacity-override = true;
 
 opacity-rule = [
-    "99:class_g = 'qutebrowser'",
     "99:class_g = 'Chromium'",
     "99:class_g = 'Inkscape'",
     "99:class_g = 'Gimp'",
     "99:class_g = 'zoom'",
 ];
 
+focus-exclude = [
+    "class_i = 'dwm'"
+];
+
 # ------------------------------------------------------------------------
 # blur
 
diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py
index 666fd77..7a10037 100644
--- a/.config/qutebrowser/config.py
+++ b/.config/qutebrowser/config.py
@@ -3,112 +3,339 @@ from qutebrowser.api import interceptor, message
 
 config.load_autoconfig(False)
 
-# ------------------------------------------------------------------------
-# colors
-
-nord = {
-    # Polar Night
-    'nord0': '#2e3440',
-    'nord1': '#3b4252',
-    'nord2': '#434c5e',
-    'nord3': '#4c566a',
-    # Snow Storm
-    'nord4': '#d8dee9',
-    'nord5': '#e5e9f0',
-    'nord6': '#eceff4',
-    # Frost
-    'nord7': '#8fbcbb',
-    'nord8': '#88c0d0',
-    'nord9': '#81a1c1',
-    'nord10': '#5e81ac',
-    # Aurora
-    'nord11': '#bf616a',
-    'nord12': '#d08770',
-    'nord13': '#ebcb8b',
-    'nord14': '#a3be8c',
-    'nord15': '#b48ead',
-}
+# gruvbox dark hard qutebrowser theme by Florian Bruhin <me@the-compiler.org>
+#
+# Originally based on:
+#   base16-qutebrowser (https://github.com/theova/base16-qutebrowser)
+#   Base16 qutebrowser template by theova and Daniel Mulford
+#   Gruvbox dark, hard scheme by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
+
+bg0_hard = "#1d2021"
+bg0_soft = '#32302f'
+bg0_normal = '#282828'
+
+bg0 = "#3c3836"
+bg1 = bg0_normal
+bg2 = "#504945"
+bg3 = "#665c54"
+bg4 = "#7c6f64"
+
+fg0 = "#fbf1c7"
+fg1 = "#ebdbb2"
+fg2 = "#d5c4a1"
+fg3 = "#bdae93"
+fg4 = "#a89984"
+
+bright_red = "#fb4934"
+bright_green = "#b8bb26"
+bright_yellow = "#fabd2f"
+bright_blue = "#83a598"
+bright_purple = "#d3869b"
+bright_aqua = "#8ec07c"
+bright_gray = "#928374"
+bright_orange = "#fe8019"
+
+dark_red = "#cc241d"
+dark_green = "#98971a"
+dark_yellow = "#d79921"
+dark_blue = "#458588"
+dark_purple = "#b16286"
+dark_aqua = "#689d6a"
+dark_gray = "#a89984"
+dark_orange = "#d65d0e"
+
+### Completion
+
+# Text color of the completion widget. May be a single color to use for
+# all columns or a list of three colors, one for each column.
+c.colors.completion.fg = [fg1, bright_blue, fg4]
+
+# Background color of the completion widget for odd rows.
+c.colors.completion.odd.bg = bg0
+
+# Background color of the completion widget for even rows.
+c.colors.completion.even.bg = bg0
+
+# Foreground color of completion widget category headers.
+c.colors.completion.category.fg = bright_blue
+
+# Background color of the completion widget category headers.
+c.colors.completion.category.bg = bg1
+
+# Top border color of the completion widget category headers.
+c.colors.completion.category.border.top = c.colors.completion.category.bg
+
+# Bottom border color of the completion widget category headers.
+c.colors.completion.category.border.bottom = c.colors.completion.category.bg
+
+# Foreground color of the selected completion item.
+c.colors.completion.item.selected.fg = fg0
+
+# Background color of the selected completion item.
+c.colors.completion.item.selected.bg = bg4
+
+# Top border color of the selected completion item.
+c.colors.completion.item.selected.border.top = bg2
+
+# Bottom border color of the selected completion item.
+c.colors.completion.item.selected.border.bottom = c.colors.completion.item.selected.border.top
+
+# Foreground color of the matched text in the selected completion item.
+c.colors.completion.item.selected.match.fg = dark_yellow
+
+# Foreground color of the matched text in the completion.
+c.colors.completion.match.fg = c.colors.completion.item.selected.match.fg
+
+# Color of the scrollbar handle in the completion view.
+c.colors.completion.scrollbar.fg = c.colors.completion.item.selected.fg
+
+# Color of the scrollbar in the completion view.
+c.colors.completion.scrollbar.bg = c.colors.completion.category.bg
+
+### Context menu
+
+# Background color of disabled items in the context menu.
+c.colors.contextmenu.disabled.bg = bg3
+
+# Foreground color of disabled items in the context menu.
+c.colors.contextmenu.disabled.fg = fg3
+
+# Background color of the context menu. If set to null, the Qt default is used.
+c.colors.contextmenu.menu.bg = bg0
+
+# Foreground color of the context menu. If set to null, the Qt default is used.
+c.colors.contextmenu.menu.fg =  fg2
+
+# Background color of the context menu’s selected item. If set to null, the Qt default is used.
+c.colors.contextmenu.selected.bg = bg2
+
+#Foreground color of the context menu’s selected item. If set to null, the Qt default is used.
+c.colors.contextmenu.selected.fg = c.colors.contextmenu.menu.fg
+
+### Downloads
+
+# Background color for the download bar.
+c.colors.downloads.bar.bg = bg0
+
+# Color gradient start for download text.
+c.colors.downloads.start.fg = bg0
+
+# Color gradient start for download backgrounds.
+c.colors.downloads.start.bg = bright_blue
+
+# Color gradient end for download text.
+c.colors.downloads.stop.fg = c.colors.downloads.start.fg
+
+# Color gradient stop for download backgrounds.
+c.colors.downloads.stop.bg = bright_aqua
+
+# Foreground color for downloads with errors.
+c.colors.downloads.error.fg = bright_red
+
+### Hints
+
+# Font color for hints.
+c.colors.hints.fg = bg0
+
+# Background color for hints.
+c.colors.hints.bg = bright_yellow
+
+# Font color for the matched part of hints.
+c.colors.hints.match.fg = bg4
+
+### Keyhint widget
+
+# Text color for the keyhint widget.
+c.colors.keyhint.fg = fg4
+
+# Highlight color for keys to complete the current keychain.
+c.colors.keyhint.suffix.fg = fg0
+
+# Background color of the keyhint widget.
+c.colors.keyhint.bg = bg0
+
+### Messages
+
+# Foreground color of an error message.
+c.colors.messages.error.fg = bg0
+
+# Background color of an error message.
+c.colors.messages.error.bg = bright_red
+
+# Border color of an error message.
+c.colors.messages.error.border = c.colors.messages.error.bg
+
+# Foreground color of a warning message.
+c.colors.messages.warning.fg = bg0
+
+# Background color of a warning message.
+c.colors.messages.warning.bg = bright_purple
+
+# Border color of a warning message.
+c.colors.messages.warning.border = c.colors.messages.warning.bg
+
+# Foreground color of an info message.
+c.colors.messages.info.fg = fg2
+
+# Background color of an info message.
+c.colors.messages.info.bg = bg0
+
+# Border color of an info message.
+c.colors.messages.info.border = c.colors.messages.info.bg
+
+### Prompts
+
+# Foreground color for prompts.
+c.colors.prompts.fg = fg2
+
+# Border used around UI elements in prompts.
+c.colors.prompts.border = f'1px solid {bg1}'
+
+# Background color for prompts.
+c.colors.prompts.bg = bg3
+
+# Background color for the selected item in filename prompts.
+c.colors.prompts.selected.bg = bg2
+
+### Statusbar
+
+# Foreground color of the statusbar.
+c.colors.statusbar.normal.fg = fg2
+
+# Background color of the statusbar.
+c.colors.statusbar.normal.bg = bg0
+
+# Foreground color of the statusbar in insert mode.
+c.colors.statusbar.insert.fg = bg0
+
+# Background color of the statusbar in insert mode.
+c.colors.statusbar.insert.bg = bright_blue
+
+# Foreground color of the statusbar in passthrough mode.
+c.colors.statusbar.passthrough.fg = bg0
+
+# Background color of the statusbar in passthrough mode.
+c.colors.statusbar.passthrough.bg = dark_blue
+
+# Foreground color of the statusbar in private browsing mode.
+c.colors.statusbar.private.fg = bright_purple
+
+# Background color of the statusbar in private browsing mode.
+c.colors.statusbar.private.bg = bg0
+
+# Foreground color of the statusbar in command mode.
+c.colors.statusbar.command.fg = fg3
+
+# Background color of the statusbar in command mode.
+c.colors.statusbar.command.bg = bg1
+
+# Foreground color of the statusbar in private browsing + command mode.
+c.colors.statusbar.command.private.fg = c.colors.statusbar.private.fg
+
+# Background color of the statusbar in private browsing + command mode.
+c.colors.statusbar.command.private.bg = c.colors.statusbar.command.bg
+
+# Foreground color of the statusbar in caret mode.
+c.colors.statusbar.caret.fg = bg0
+
+# Background color of the statusbar in caret mode.
+c.colors.statusbar.caret.bg = dark_purple
+
+# Foreground color of the statusbar in caret mode with a selection.
+c.colors.statusbar.caret.selection.fg = c.colors.statusbar.caret.fg
+
+# Background color of the statusbar in caret mode with a selection.
+c.colors.statusbar.caret.selection.bg = bright_purple
+
+# Background color of the progress bar.
+c.colors.statusbar.progress.bg = bright_blue
+
+# Default foreground color of the URL in the statusbar.
+c.colors.statusbar.url.fg = fg4
+
+# Foreground color of the URL in the statusbar on error.
+c.colors.statusbar.url.error.fg = dark_red
+
+# Foreground color of the URL in the statusbar for hovered links.
+c.colors.statusbar.url.hover.fg = bright_orange
+
+# Foreground color of the URL in the statusbar on successful load
+# (http).
+c.colors.statusbar.url.success.http.fg = bright_red
+
+# Foreground color of the URL in the statusbar on successful load
+# (https).
+c.colors.statusbar.url.success.https.fg = fg0
+
+# Foreground color of the URL in the statusbar when there's a warning.
+c.colors.statusbar.url.warn.fg = bright_purple
+
+### tabs
+
+# Background color of the tab bar.
+c.colors.tabs.bar.bg = bg0
+
+# Color gradient start for the tab indicator.
+c.colors.tabs.indicator.start = bright_blue
+
+# Color gradient end for the tab indicator.
+c.colors.tabs.indicator.stop = bright_aqua
+
+# Color for the tab indicator on errors.
+c.colors.tabs.indicator.error = bright_red
+
+# Foreground color of unselected odd tabs.
+c.colors.tabs.odd.fg = fg2
+
+# Background color of unselected odd tabs.
+c.colors.tabs.odd.bg = bg3
+
+# Foreground color of unselected even tabs.
+c.colors.tabs.even.fg = c.colors.tabs.odd.fg
+
+# Background color of unselected even tabs.
+c.colors.tabs.even.bg = bg3
+
+# Foreground color of selected odd tabs.
+c.colors.tabs.selected.odd.fg = fg0
+
+# Background color of selected odd tabs.
+c.colors.tabs.selected.odd.bg = bg0
+
+# Foreground color of selected even tabs.
+c.colors.tabs.selected.even.fg = c.colors.tabs.selected.odd.fg
+
+# Background color of selected even tabs.
+c.colors.tabs.selected.even.bg = bg0
+
+# Background color of pinned unselected even tabs.
+c.colors.tabs.pinned.even.bg = bright_green
+
+# Foreground color of pinned unselected even tabs.
+c.colors.tabs.pinned.even.fg = bg2
+
+# Background color of pinned unselected odd tabs.
+c.colors.tabs.pinned.odd.bg = bright_green
+
+# Foreground color of pinned unselected odd tabs.
+c.colors.tabs.pinned.odd.fg = c.colors.tabs.pinned.even.fg
+
+# Background color of pinned selected even tabs.
+c.colors.tabs.pinned.selected.even.bg = bg0
+
+# Foreground color of pinned selected even tabs.
+c.colors.tabs.pinned.selected.even.fg = c.colors.tabs.selected.odd.fg
+
+# Background color of pinned selected odd tabs.
+c.colors.tabs.pinned.selected.odd.bg = c.colors.tabs.pinned.selected.even.bg
+
+# Foreground color of pinned selected odd tabs.
+c.colors.tabs.pinned.selected.odd.fg = c.colors.tabs.selected.odd.fg
 
-c.colors.completion.category.bg = nord['nord0']
-c.colors.completion.category.border.bottom = nord['nord0']
-c.colors.completion.category.border.top = nord['nord0']
-c.colors.completion.category.fg = nord['nord5']
-c.colors.completion.even.bg = nord['nord1']
-c.colors.completion.odd.bg = nord['nord2']
-c.colors.completion.fg = nord['nord4']
-c.colors.completion.item.selected.bg = nord['nord3']
-c.colors.completion.item.selected.border.bottom = nord['nord3']
-c.colors.completion.item.selected.border.top = nord['nord3']
-c.colors.completion.item.selected.fg = nord['nord6']
-c.colors.completion.match.fg = nord['nord13']
-c.colors.completion.scrollbar.bg = nord['nord1']
-c.colors.completion.scrollbar.fg = nord['nord5']
-
-c.colors.downloads.bar.bg = nord['nord0']
-c.colors.downloads.error.bg = nord['nord11']
-c.colors.downloads.error.fg = nord['nord5']
-c.colors.downloads.stop.bg = nord['nord15']
-c.colors.downloads.system.bg = 'none'
-
-c.colors.hints.bg = nord['nord13']
-c.colors.hints.fg = nord['nord0']
-c.colors.hints.match.fg = nord['nord10']
-
-c.colors.keyhint.bg = nord['nord1']
-c.colors.keyhint.fg = nord['nord5']
-c.colors.keyhint.suffix.fg = nord['nord13']
-c.colors.messages.error.bg = nord['nord11']
-
-c.colors.messages.error.border = nord['nord11']
-c.colors.messages.error.fg = nord['nord5']
-c.colors.messages.info.bg = nord['nord8']
-c.colors.messages.info.border = nord['nord8']
-c.colors.messages.info.fg = nord['nord5']
-c.colors.messages.warning.bg = nord['nord12']
-c.colors.messages.warning.border = nord['nord12']
-c.colors.messages.warning.fg = nord['nord5']
-
-c.colors.prompts.bg = nord['nord2']
-c.colors.prompts.border = '1px solid ' + nord['nord0']
-c.colors.prompts.fg = nord['nord5']
-c.colors.prompts.selected.bg = nord['nord3']
-
-c.colors.statusbar.caret.bg = nord['nord15']
-c.colors.statusbar.caret.fg = nord['nord5']
-
-c.colors.statusbar.caret.selection.bg = nord['nord15']
-c.colors.statusbar.caret.selection.fg = nord['nord5']
-c.colors.statusbar.command.bg = nord['nord2']
-c.colors.statusbar.command.fg = nord['nord5']
-c.colors.statusbar.command.private.bg = nord['nord2']
-c.colors.statusbar.command.private.fg = nord['nord5']
-c.colors.statusbar.insert.bg = nord['nord14']
-c.colors.statusbar.insert.fg = nord['nord1']
-c.colors.statusbar.normal.bg = nord['nord0']
-c.colors.statusbar.normal.fg = nord['nord5']
-c.colors.statusbar.passthrough.bg = nord['nord10']
-c.colors.statusbar.passthrough.fg = nord['nord5']
-c.colors.statusbar.private.bg = nord['nord3']
-c.colors.statusbar.private.fg = nord['nord5']
-c.colors.statusbar.progress.bg = nord['nord5']
-c.colors.statusbar.url.error.fg = nord['nord11']
-c.colors.statusbar.url.fg = nord['nord5']
-c.colors.statusbar.url.hover.fg = nord['nord8']
-c.colors.statusbar.url.success.http.fg = nord['nord5']
-c.colors.statusbar.url.success.https.fg = nord['nord14']
-c.colors.statusbar.url.warn.fg = nord['nord12']
-c.colors.tabs.bar.bg = nord['nord3']
-c.colors.tabs.even.bg = nord['nord3']
-c.colors.tabs.even.fg = nord['nord5']
-c.colors.tabs.indicator.error = nord['nord11']
-
-c.colors.tabs.indicator.system = 'none'
-c.colors.tabs.odd.bg = nord['nord3']
-c.colors.tabs.odd.fg = nord['nord5']
-c.colors.tabs.selected.even.bg = nord['nord0']
-c.colors.tabs.selected.even.fg = nord['nord5']
-c.colors.tabs.selected.odd.bg = nord['nord0']
-c.colors.tabs.selected.odd.fg = nord['nord5']
+# Background color for webpages if unset (or empty to use the theme's
+# color).
+# c.colors.darkmode.enabled = True
+# c.colors.webpage.bg = bg4
 
 # ------------------------------------------------------------------------
 # fonts
@@ -205,9 +432,11 @@ c.content.javascript.enabled = False
 js_whitelist = [
         "*://localhost/*",
         "*://github.com/*",
+        "*://gitlab.com/*",
         "*://news.ycombinator.com/*",
         "*://hn.algolia.com/*",
         "*://duckduckgo.com/*",
+        "*://gitlab.com/*",
         "*://app.slack.com/*",
         "*://*.youtube.com/*",
         "*://covid19-scenarios.org/*",
diff --git a/.config/qutebrowser/quickmarks b/.config/qutebrowser/quickmarks
index 0b743b8..bd753fe 100644
--- a/.config/qutebrowser/quickmarks
+++ b/.config/qutebrowser/quickmarks
@@ -3,3 +3,10 @@ git https://git.nbnoll.xyz
 blas http://www.netlib.org/blas/
 intel https://software.intel.com/sites/landingpage/IntrinsicsGuide/#techs=MMX,SSE,SSE2,SSE3,SSSE3,SSE4_1,SSE4_2,AVX,AVX2&text=xorpd&expand=6141,6144
 c http://www.quut.com/c/ANSI-C-grammar-y-2011.html
+quanta https://www.quantamagazine.org/
+npjl https://cheatsheets.quantecon.org/
+vae https://github.com/alecokas/flux-vae/blob/master/conv-vae/main.jl
+vk https://github.com/vinjn/awesome-vulkan#libraries
+mmo https://www.reddit.com/r/gamedev/comments/2s74pj/writing_a_game_server_protocol_parts_15_ongoing/
+x11 https://github.com/gamedevtech/X11OpenGLWindow/blob/master/X11.cpp
+x11egl https://gist.github.com/jfuerth/82b816510bb2cc063c9945baf1093fd9
diff --git a/.config/tmux/config b/.config/tmux/config
index 65d63f0..0c13432 100644
--- a/.config/tmux/config
+++ b/.config/tmux/config
@@ -10,6 +10,9 @@ bind-key ` send-prefix
 # Stay in the vi world
 setw -g mode-keys vi
 
+# Use mouse
+set -g mouse on
+
 # Change split creation tools
 bind | split-window -h
 bind _ split-window -v
@@ -71,6 +74,9 @@ set -q -g status-utf8 on
 # Address vim mode switching
 set -sg escape-time 0 
 
+set -g base-index 1
+setw -g pane-base-index 1
+
 # loud or quiet?
 set-option -g visual-activity off
 set-option -g visual-bell off
@@ -78,48 +84,69 @@ set-option -g visual-silence off
 set-window-option -g monitor-activity off
 set-option -g bell-action none
 
-#  modes
-setw -g clock-mode-colour colour5
-setw -g mode-style 'fg=colour3,bg=colour8,bold'
+######################
+# colors
+######################
+
+### theme settings ###
+
+# window separators
+set-option -wg window-status-separator ""
+
+# monitor window changes
+set-option -wg monitor-activity on
+set-option -wg monitor-bell on
+
+# set statusbar update interval
+set-option -g status-interval 1
+
+### colorscheme ###
+
+# change window screen colors
+set-option -wg mode-style bg="#A89984",fg="#3C3836"
+
+# default statusbar colors (terminal bg should be #282828)
+set-option -g status-style bg=terminal,fg="#A89984"
+
+# default window title colors
+set-option -wg window-status-style bg="#3C3836",fg="#7C6F64"
 
-# panes
-set -g pane-border-style 'bg=default,fg=colour8'
-set -g pane-active-border-style 'bg=default,fg=colour2'
+# colors for windows with activity
+set-option -wg window-status-activity-style bg="#3C3836",fg="#A89984"
 
-# statusbar
-set -g status-position bottom
-set -g status-justify centre
-set -g status-style 'fg=colour0,bg=colour0,dim'
-set -g status-right-length 3
-set -g status-left-length 3
+# colors for windows with bells
+set-option -wg window-status-bell-style bg="#3C3836",fg="#FE8019"
 
-# window focus
-set -g window-style 'fg=default,bg=default'
+# active window title colors
+set-option -wg window-status-current-style bg="#FE8019",fg="#3C3836"
 
-# window 
-setw -g window-status-current-style 'fg=colour2,bg=colour8,bold'
-setw -g window-status-current-format ' #I#[fg=colour2]:#[fg=colour2]#W#[fg=colour2]#F '
+# pane border
+set-option -g pane-active-border-style fg="#83a598"
+set-option -g pane-border-style fg="#504945"
 
-setw -g window-status-style 'fg=colour250,bg=colour8,bold'
-setw -g window-status-format ' #I#[fg=colour250]:#[fg=colour250]#W#[fg=colour250]#F '
+# message info
+set-option -g message-style bg="#A89984",fg="#3C3836"
 
-setw -g window-status-bell-style 'fg=colour255,bg=colour1,bold'
+# writing commands inactive
+set-option -g message-command-style bg="#A89984",fg="#3C3836"
 
-# messages
-set -g message-style 'fg=colour1,bg=colour8'
+# pane number display
+set-option -g display-panes-active-colour "#83a598"
+set-option -g display-panes-colour "#A89984"
 
-#################################
-# Plugins
-#################################
+# clock
+set-option -wg clock-mode-colour "#FE8019"
 
-set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-resurrect'
-set -g @plugin 'tmux-plugins/tmux-continuum'
+# copy mode highlighting
+%if #{>=:#{version},3.2}
+    set-option -wg copy-mode-match-style "bg=#A89984,fg=#3C3836"
+    set-option -wg copy-mode-current-match-style "bg=#A9b665,fg=#3C3836"
+%endif
 
-#################################
-# Plugin variables
-#################################
-#
-set -g @continuum-restore 'on'
+# statusbar formatting
+# "#fe8019" MUST be in lowercase here (conflicts with statusline alias otherwise)
+set-option -g status-left "#[bg=#A89984, fg=#3C3836]#{?client_prefix,#[bg=#bbc585],#[bg=#A89984]} #{session_name} "
+set-option -g status-right "#[bg=#A89984, fg=#3C3836]#{?client_prefix,#[bg=#bbc585],#[bg=#A89984]} #{host_short} "
 
-run -b '~/.tmux/plugins/tpm/tpm'
+set-option -wg window-status-current-format "#{?window_zoomed_flag,#[fg=default bold],#[fg=default]}#[bg=#83a598] #{window_index}:#{?window_zoomed_flag,*, }#{window_name}#{?window_zoomed_flag,*, }"
+set-option -wg window-status-format "#{?window_zoomed_flag,#[fg=#fbf1c7 bold],#[fg=#fbf1c7]}#[bg=#504945] #{window_index}: #{window_name} "
diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc
index d1382d1..114c31b 100644
--- a/.config/zathura/zathurarc
+++ b/.config/zathura/zathurarc
@@ -8,7 +8,7 @@
 set adjust-open "best-fit"
 
 # Font size
-set font "Ubuntu 12"
+set font "Consolas 12"
 
 # Zoom size
 set zoom-step 20
@@ -27,31 +27,46 @@ set scroll-step 80
 # System colors + display
 #####################
 
-# Colors of search
-set highlight-color "#8fbcbb"
-set highlight-active-color "#ebcb8b"
-
-# BG color
-set default-bg "#3b4252"
-
-# Toolbar colors
-set statusbar-fg "#a3be8c"
-set statusbar-bg "#2e3440"
-
-set inputbar-fg "#d8dee9"
-set inputbar-bg "#3b4252"
-
-set notification-error-fg "#d8dee9"
-set notification-error-bg "#bf616a"
-
-set notification-warning-fg "#d8dee9"
-set notification-warning-bg "#bf616a"
-
-set completion-fg "#e5e9f0"
-set completion-bg "#2e3440"
-
-set completion-highlight-fg "#5e81ac"
-set completion-highlight-bg "#4c566a"
+set notification-error-bg       "#3c3836" # bg
+set notification-error-fg       "#fb4934" # bright:red
+set notification-warning-bg     "#3c3836" # bg
+set notification-warning-fg     "#fabd2f" # bright:yellow
+set notification-bg             "#3c3836" # bg
+set notification-fg             "#b8bb26" # bright:green
+
+set completion-bg               "#504945" # bg2
+set completion-fg               "#ebdbb2" # fg
+set completion-group-bg         "#3c3836" # bg1
+set completion-group-fg         "#928374" # gray
+set completion-highlight-bg     "#83a598" # bright:blue
+set completion-highlight-fg     "#504945" # bg2
+
+# Define the color in index mode
+set index-bg                    "#504945" # bg2
+set index-fg                    "#ebdbb2" # fg
+set index-active-bg             "#83a598" # bright:blue
+set index-active-fg             "#504945" # bg2
+
+set inputbar-bg                 "#3c3836" # bg
+set inputbar-fg                 "#ebdbb2" # fg
+
+set statusbar-bg                "#504945" # bg2
+set statusbar-fg                "#ebdbb2" # fg
+
+set highlight-color             "#fabd2f" # bright:yellow
+set highlight-active-color      "#fe8019" # bright:orange
+
+set default-bg                  "#3c3836" # bg
+set default-fg                  "#ebdbb2" # fg
+set render-loading              true
+set render-loading-bg           "#3c3836" # bg
+set render-loading-fg           "#ebdbb2" # fg
+
+# Recolor book content's color
+set recolor-lightcolor          "#3c3836" # bg
+set recolor-darkcolor           "#ebdbb2" # fg
+set recolor                     "true"
+# set recolor-keephue             true      # keep original color
 
 # Distance between successive pages.
 set page-padding 10
@@ -62,4 +77,3 @@ set page-padding 10
 
 map <S-=> zoom in
 map - zoom
-
diff --git a/.xinitrc b/.xinitrc
index b008090..5e8b1c0 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 picom --experimental-backends --config ~/.config/picom/config &
-feh --bg-scale ~/media/pics/surf.jpg
+feh --bg-scale ~/media/background.jpg
+
+~/.screenlayout/home.sh
 
 xbanish &
 status &