diff --git a/.gitmodules b/.gitmodules
index d11c30f..c025ae9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,12 @@
 [submodule "vim/.vim/pack/default/start/fzf.vim"]
 	path = vim/.vim/pack/default/start/fzf.vim
 	url = https://github.com/junegunn/fzf.vim.git
+[submodule "vim/.vim/pack/default/start/vim-mucomplete"]
+	path = vim/.vim/pack/default/start/vim-mucomplete
+	url = https://github.com/lifepillar/vim-mucomplete.git
+[submodule "vim/.vim/pack/default/start/vim-fugitive"]
+	path = vim/.vim/pack/default/start/vim-fugitive
+	url = https://github.com/tpope/vim-fugitive.git
+[submodule "vim/.vim/pack/default/start/vim-flog"]
+	path = vim/.vim/pack/default/start/vim-flog
+	url = https://github.com/rbong/vim-flog.git
diff --git a/vim/.vim/colors/catppuccin_frappe.vim b/vim/.vim/colors/catppuccin_frappe.vim
new file mode 100644
index 0000000..b16bdf3
--- /dev/null
+++ b/vim/.vim/colors/catppuccin_frappe.vim
@@ -0,0 +1,155 @@
+" Name: catppuccin_frappe.vim
+
+set background=dark
+hi clear
+
+if exists('syntax on')
+    syntax reset
+endif
+
+let g:colors_name='catppuccin_frappe'
+set t_Co=256
+
+let s:rosewater = "#F2D5CF"
+let s:flamingo = "#EEBEBE"
+let s:pink = "#F4B8E4"
+let s:mauve = "#CA9EE6"
+let s:red = "#E78284"
+let s:maroon = "#EA999C"
+let s:peach = "#EF9F76"
+let s:yellow = "#E5C890"
+let s:green = "#A6D189"
+let s:teal = "#81C8BE"
+let s:sky = "#99D1DB"
+let s:sapphire = "#85C1DC"
+let s:blue = "#8CAAEE"
+let s:lavender = "#BABBF1"
+
+let s:text = "#C6D0F5"
+let s:subtext1 = "#B5BFE2"
+let s:subtext0 = "#A5ADCE"
+let s:overlay2 = "#949CBB"
+let s:overlay1 = "#838BA7"
+let s:overlay0 = "#737994"
+let s:surface2 = "#626880"
+let s:surface1 = "#51576D"
+let s:surface0 = "#414559"
+
+let s:base = "#303446"
+let s:mantle = "#292C3C"
+let s:crust = "#232634"
+
+function! s:hi(group, guisp, guifg, guibg, gui, cterm)
+  let cmd = ""
+  if a:guisp != ""
+    let cmd = cmd . " guisp=" . a:guisp
+  endif
+  if a:guifg != ""
+    let cmd = cmd . " guifg=" . a:guifg
+  endif
+  if a:guibg != ""
+    let cmd = cmd . " guibg=" . a:guibg
+  endif
+  if a:gui != ""
+    let cmd = cmd . " gui=" . a:gui
+  endif
+  if a:cterm != ""
+    let cmd = cmd . " cterm=" . a:cterm
+  endif
+  if cmd != ""
+    exec "hi " . a:group . cmd
+  endif
+endfunction
+
+
+
+call s:hi("Normal", "NONE", s:text, s:base, "NONE", "NONE")
+call s:hi("Visual", "NONE", "NONE", s:surface1,"bold", "bold")
+call s:hi("Conceal", "NONE", s:overlay1, "NONE", "NONE", "NONE")
+call s:hi("ColorColumn", "NONE", "NONE", s:surface0, "NONE", "NONE")
+call s:hi("Cursor", "NONE", s:base, s:text, "NONE", "NONE")
+call s:hi("lCursor", "NONE", s:base, s:text, "NONE", "NONE")
+call s:hi("CursorIM", "NONE", s:base, s:text, "NONE", "NONE")
+call s:hi("CursorColumn", "NONE", "NONE", s:mantle, "NONE", "NONE")
+call s:hi("CursorLine", "NONE", "NONE", s:surface0, "NONE", "NONE")
+call s:hi("Directory", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("DiffAdd", "NONE", s:base, s:green, "NONE", "NONE")
+call s:hi("DiffChange", "NONE", s:base, s:yellow, "NONE", "NONE")
+call s:hi("DiffDelete", "NONE", s:base, s:red, "NONE", "NONE")
+call s:hi("DiffText", "NONE", s:base, s:blue, "NONE", "NONE")
+call s:hi("EndOfBuffer", "NONE", "NONE", "NONE", "NONE", "NONE")
+call s:hi("ErrorMsg", "NONE", s:red, "NONE", "bolditalic"    , "bold,italic")
+call s:hi("VertSplit", "NONE", s:crust, "NONE", "NONE", "NONE")
+call s:hi("Folded", "NONE", s:blue, s:surface1, "NONE", "NONE")
+call s:hi("FoldColumn", "NONE", s:overlay0, s:base, "NONE", "NONE")
+call s:hi("SignColumn", "NONE", s:surface1, s:base, "NONE", "NONE")
+call s:hi("IncSearch", "NONE", s:surface1, s:pink, "NONE", "NONE")
+call s:hi("CursorLineNR", "NONE", s:lavender, "NONE", "NONE", "NONE")
+call s:hi("LineNr", "NONE", s:surface1, "NONE", "NONE", "NONE")
+call s:hi("MatchParen", "NONE", s:peach, "NONE", "bold", "bold")
+call s:hi("ModeMsg", "NONE", s:text, "NONE", "bold", "bold")
+call s:hi("MoreMsg", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("NonText", "NONE", s:overlay0, "NONE", "NONE", "NONE")
+call s:hi("Pmenu", "NONE", s:overlay2, s:surface0, "NONE", "NONE")
+call s:hi("PmenuSel", "NONE", s:text, s:surface1, "bold", "bold")
+call s:hi("PmenuSbar", "NONE", "NONE", s:surface1, "NONE", "NONE")
+call s:hi("PmenuThumb", "NONE", "NONE", s:overlay0, "NONE", "NONE")
+call s:hi("Question", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("QuickFixLine", "NONE", "NONE", s:surface1, "bold", "bold")
+call s:hi("Search", "NONE", s:pink, s:surface1, "bold", "bold")
+call s:hi("SpecialKey", "NONE", s:subtext0, "NONE", "NONE", "NONE")
+call s:hi("SpellBad", s:red, "NONE", "NONE", "underline", "underline")
+call s:hi("SpellCap", s:yellow, "NONE", "NONE", "underline", "underline")
+call s:hi("SpellLocal", s:blue, "NONE", "NONE", "underline", "underline")
+call s:hi("SpellRare", s:green, "NONE", "NONE", "underline", "underline")
+call s:hi("StatusLine", "NONE", s:text, s:mantle, "NONE", "NONE")
+call s:hi("StatusLineNC", "NONE", s:surface1, s:mantle, "NONE", "NONE")
+call s:hi("TabLine", "NONE", s:surface1, s:mantle, "NONE", "NONE")
+call s:hi("TabLineFill", "NONE", "NONE", s:mantle, "NONE", "NONE")
+call s:hi("TabLineSel", "NONE", s:green, s:surface1, "NONE", "NONE")
+call s:hi("Title", "NONE", s:blue, "NONE", "bold", "bold")
+call s:hi("VisualNOS", "NONE", "NONE", s:surface1, "bold", "bold")
+call s:hi("WarningMsg", "NONE", s:yellow, "NONE", "NONE", "NONE")
+call s:hi("WildMenu", "NONE", "NONE", s:overlay0, "NONE", "NONE")
+call s:hi("Comment", "NONE", s:surface2, "NONE", "NONE", "NONE")
+call s:hi("Constant", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Identifier", "NONE", s:flamingo, "NONE", "NONE", "NONE")
+call s:hi("Statement", "NONE", s:mauve, "NONE", "NONE", "NONE")
+call s:hi("PreProc", "NONE", s:pink, "NONE", "NONE", "NONE")
+call s:hi("Type", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("Special", "NONE", s:pink, "NONE", "NONE", "NONE")
+call s:hi("Underlined", "NONE", s:text, s:base, "underline", "underline")
+call s:hi("Error", "NONE", s:red, "NONE", "NONE", "NONE")
+call s:hi("Todo", "NONE", s:base, s:yellow, "bold", "bold")
+
+call s:hi("String", "NONE", s:green, "NONE", "NONE", "NONE")
+call s:hi("Character", "NONE", s:teal, "NONE", "NONE", "NONE")
+call s:hi("Number", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Boolean", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Float", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Function", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("Conditional", "NONE", s:red, "NONE", "NONE", "NONE")
+call s:hi("Repeat", "NONE", s:red, "NONE", "NONE", "NONE")
+call s:hi("Label", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Operator", "NONE", s:sky, "NONE", "NONE", "NONE")
+call s:hi("Keyword", "NONE", s:pink, "NONE", "NONE", "NONE")
+call s:hi("Include", "NONE", s:pink, "NONE", "NONE", "NONE")
+call s:hi("StorageClass", "NONE", s:yellow, "NONE", "NONE", "NONE")
+call s:hi("Structure", "NONE", s:yellow, "NONE", "NONE", "NONE")
+call s:hi("Typedef", "NONE", s:yellow, "NONE", "NONE", "NONE")
+call s:hi("debugPC", "NONE", "NONE", s:crust, "NONE", "NONE")
+call s:hi("debugBreakpoint", "NONE", s:overlay0, s:base, "NONE", "NONE")
+
+hi link Define PreProc
+hi link Macro PreProc
+hi link PreCondit PreProc
+hi link SpecialChar Special
+hi link Tag Special
+hi link Delimiter Special
+hi link SpecialComment Special
+hi link Debug Special
+hi link Exception Error
+hi link StatusLineTerm StatusLine
+hi link StatusLineTermNC StatusLineNC
+hi link Terminal Normal
+hi link Ignore Comment
diff --git a/vim/.vim/colors/catppuccin_latte.vim b/vim/.vim/colors/catppuccin_latte.vim
new file mode 100644
index 0000000..8cd085d
--- /dev/null
+++ b/vim/.vim/colors/catppuccin_latte.vim
@@ -0,0 +1,155 @@
+" Name: catppuccin_latte.vim
+
+set background=dark
+hi clear
+
+if exists('syntax on')
+    syntax reset
+endif
+
+let g:colors_name='catppuccin_latte'
+set t_Co=256
+
+let s:rosewater = "#DC8A78"
+let s:flamingo = "#DD7878"
+let s:pink = "#EA76CB"
+let s:mauve = "#8839EF"
+let s:red = "#D20F39"
+let s:maroon = "#E64553"
+let s:peach = "#FE640B"
+let s:yellow = "#DF8E1D"
+let s:green = "#40A02B"
+let s:teal = "#179299"
+let s:sky = "#04A5E5"
+let s:sapphire = "#209FB5"
+let s:blue = "#1E66F5"
+let s:lavender = "#7287FD"
+
+let s:text = "#4C4F69"
+let s:subtext1 = "#5C5F77"
+let s:subtext0 = "#6C6F85"
+let s:overlay2 = "#7C7F93"
+let s:overlay1 = "#8C8FA1"
+let s:overlay0 = "#9CA0B0"
+let s:surface2 = "#ACB0BE"
+let s:surface1 = "#BCC0CC"
+let s:surface0 = "#CCD0DA"
+
+let s:base = "#EFF1F5"
+let s:mantle = "#E6E9EF"
+let s:crust = "#DCE0E8"
+
+function! s:hi(group, guisp, guifg, guibg, gui, cterm)
+  let cmd = ""
+  if a:guisp != ""
+    let cmd = cmd . " guisp=" . a:guisp
+  endif
+  if a:guifg != ""
+    let cmd = cmd . " guifg=" . a:guifg
+  endif
+  if a:guibg != ""
+    let cmd = cmd . " guibg=" . a:guibg
+  endif
+  if a:gui != ""
+    let cmd = cmd . " gui=" . a:gui
+  endif
+  if a:cterm != ""
+    let cmd = cmd . " cterm=" . a:cterm
+  endif
+  if cmd != ""
+    exec "hi " . a:group . cmd
+  endif
+endfunction
+
+
+
+call s:hi("Normal", "NONE", s:text, s:base, "NONE", "NONE")
+call s:hi("Visual", "NONE", "NONE", s:surface1,"bold", "bold")
+call s:hi("Conceal", "NONE", s:overlay1, "NONE", "NONE", "NONE")
+call s:hi("ColorColumn", "NONE", "NONE", s:surface0, "NONE", "NONE")
+call s:hi("Cursor", "NONE", s:base, s:text, "NONE", "NONE")
+call s:hi("lCursor", "NONE", s:base, s:text, "NONE", "NONE")
+call s:hi("CursorIM", "NONE", s:base, s:text, "NONE", "NONE")
+call s:hi("CursorColumn", "NONE", "NONE", s:mantle, "NONE", "NONE")
+call s:hi("CursorLine", "NONE", "NONE", s:surface0, "NONE", "NONE")
+call s:hi("Directory", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("DiffAdd", "NONE", s:base, s:green, "NONE", "NONE")
+call s:hi("DiffChange", "NONE", s:base, s:yellow, "NONE", "NONE")
+call s:hi("DiffDelete", "NONE", s:base, s:red, "NONE", "NONE")
+call s:hi("DiffText", "NONE", s:base, s:blue, "NONE", "NONE")
+call s:hi("EndOfBuffer", "NONE", "NONE", "NONE", "NONE", "NONE")
+call s:hi("ErrorMsg", "NONE", s:red, "NONE", "bolditalic"    , "bold,italic")
+call s:hi("VertSplit", "NONE", s:crust, "NONE", "NONE", "NONE")
+call s:hi("Folded", "NONE", s:blue, s:surface1, "NONE", "NONE")
+call s:hi("FoldColumn", "NONE", s:overlay0, s:base, "NONE", "NONE")
+call s:hi("SignColumn", "NONE", s:surface1, s:base, "NONE", "NONE")
+call s:hi("IncSearch", "NONE", s:surface1, s:pink, "NONE", "NONE")
+call s:hi("CursorLineNR", "NONE", s:lavender, "NONE", "NONE", "NONE")
+call s:hi("LineNr", "NONE", s:surface1, "NONE", "NONE", "NONE")
+call s:hi("MatchParen", "NONE", s:peach, "NONE", "bold", "bold")
+call s:hi("ModeMsg", "NONE", s:text, "NONE", "bold", "bold")
+call s:hi("MoreMsg", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("NonText", "NONE", s:overlay0, "NONE", "NONE", "NONE")
+call s:hi("Pmenu", "NONE", s:overlay2, s:surface0, "NONE", "NONE")
+call s:hi("PmenuSel", "NONE", s:text, s:surface1, "bold", "bold")
+call s:hi("PmenuSbar", "NONE", "NONE", s:surface1, "NONE", "NONE")
+call s:hi("PmenuThumb", "NONE", "NONE", s:overlay0, "NONE", "NONE")
+call s:hi("Question", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("QuickFixLine", "NONE", "NONE", s:surface1, "bold", "bold")
+call s:hi("Search", "NONE", s:pink, s:surface1, "bold", "bold")
+call s:hi("SpecialKey", "NONE", s:subtext0, "NONE", "NONE", "NONE")
+call s:hi("SpellBad", s:red, "NONE", "NONE", "underline", "underline")
+call s:hi("SpellCap", s:yellow, "NONE", "NONE", "underline", "underline")
+call s:hi("SpellLocal", s:blue, "NONE", "NONE", "underline", "underline")
+call s:hi("SpellRare", s:green, "NONE", "NONE", "underline", "underline")
+call s:hi("StatusLine", "NONE", s:text, s:mantle, "NONE", "NONE")
+call s:hi("StatusLineNC", "NONE", s:surface1, s:mantle, "NONE", "NONE")
+call s:hi("TabLine", "NONE", s:surface1, s:mantle, "NONE", "NONE")
+call s:hi("TabLineFill", "NONE", "NONE", s:mantle, "NONE", "NONE")
+call s:hi("TabLineSel", "NONE", s:green, s:surface1, "NONE", "NONE")
+call s:hi("Title", "NONE", s:blue, "NONE", "bold", "bold")
+call s:hi("VisualNOS", "NONE", "NONE", s:surface1, "bold", "bold")
+call s:hi("WarningMsg", "NONE", s:yellow, "NONE", "NONE", "NONE")
+call s:hi("WildMenu", "NONE", "NONE", s:overlay0, "NONE", "NONE")
+call s:hi("Comment", "NONE", s:surface2, "NONE", "NONE", "NONE")
+call s:hi("Constant", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Identifier", "NONE", s:flamingo, "NONE", "NONE", "NONE")
+call s:hi("Statement", "NONE", s:mauve, "NONE", "NONE", "NONE")
+call s:hi("PreProc", "NONE", s:pink, "NONE", "NONE", "NONE")
+call s:hi("Type", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("Special", "NONE", s:pink, "NONE", "NONE", "NONE")
+call s:hi("Underlined", "NONE", s:text, s:base, "underline", "underline")
+call s:hi("Error", "NONE", s:red, "NONE", "NONE", "NONE")
+call s:hi("Todo", "NONE", s:base, s:yellow, "bold", "bold")
+
+call s:hi("String", "NONE", s:green, "NONE", "NONE", "NONE")
+call s:hi("Character", "NONE", s:teal, "NONE", "NONE", "NONE")
+call s:hi("Number", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Boolean", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Float", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Function", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("Conditional", "NONE", s:red, "NONE", "NONE", "NONE")
+call s:hi("Repeat", "NONE", s:red, "NONE", "NONE", "NONE")
+call s:hi("Label", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Operator", "NONE", s:sky, "NONE", "NONE", "NONE")
+call s:hi("Keyword", "NONE", s:pink, "NONE", "NONE", "NONE")
+call s:hi("Include", "NONE", s:pink, "NONE", "NONE", "NONE")
+call s:hi("StorageClass", "NONE", s:yellow, "NONE", "NONE", "NONE")
+call s:hi("Structure", "NONE", s:yellow, "NONE", "NONE", "NONE")
+call s:hi("Typedef", "NONE", s:yellow, "NONE", "NONE", "NONE")
+call s:hi("debugPC", "NONE", "NONE", s:crust, "NONE", "NONE")
+call s:hi("debugBreakpoint", "NONE", s:overlay0, s:base, "NONE", "NONE")
+
+hi link Define PreProc
+hi link Macro PreProc
+hi link PreCondit PreProc
+hi link SpecialChar Special
+hi link Tag Special
+hi link Delimiter Special
+hi link SpecialComment Special
+hi link Debug Special
+hi link Exception Error
+hi link StatusLineTerm StatusLine
+hi link StatusLineTermNC StatusLineNC
+hi link Terminal Normal
+hi link Ignore Comment
diff --git a/vim/.vim/colors/catppuccin_macchiato.vim b/vim/.vim/colors/catppuccin_macchiato.vim
new file mode 100644
index 0000000..27511a6
--- /dev/null
+++ b/vim/.vim/colors/catppuccin_macchiato.vim
@@ -0,0 +1,155 @@
+" Name: catppuccin_macchiato.vim
+
+set background=dark
+hi clear
+
+if exists('syntax on')
+    syntax reset
+endif
+
+let g:colors_name='catppuccin_macchiato'
+set t_Co=256
+
+let s:rosewater = "#F4DBD6"
+let s:flamingo = "#F0C6C6"
+let s:pink = "#F5BDE6"
+let s:mauve = "#C6A0F6"
+let s:red = "#ED8796"
+let s:maroon = "#EE99A0"
+let s:peach = "#F5A97F"
+let s:yellow = "#EED49F"
+let s:green = "#A6DA95"
+let s:teal = "#8BD5CA"
+let s:sky = "#91D7E3"
+let s:sapphire = "#7DC4E4"
+let s:blue = "#8AADF4"
+let s:lavender = "#B7BDF8"
+
+let s:text = "#CAD3F5"
+let s:subtext1 = "#B8C0E0"
+let s:subtext0 = "#A5ADCB"
+let s:overlay2 = "#939AB7"
+let s:overlay1 = "#8087A2"
+let s:overlay0 = "#6E738D"
+let s:surface2 = "#5B6078"
+let s:surface1 = "#494D64"
+let s:surface0 = "#363A4F"
+
+let s:base = "#24273A"
+let s:mantle = "#1E2030"
+let s:crust = "#181926"
+
+function! s:hi(group, guisp, guifg, guibg, gui, cterm)
+  let cmd = ""
+  if a:guisp != ""
+    let cmd = cmd . " guisp=" . a:guisp
+  endif
+  if a:guifg != ""
+    let cmd = cmd . " guifg=" . a:guifg
+  endif
+  if a:guibg != ""
+    let cmd = cmd . " guibg=" . a:guibg
+  endif
+  if a:gui != ""
+    let cmd = cmd . " gui=" . a:gui
+  endif
+  if a:cterm != ""
+    let cmd = cmd . " cterm=" . a:cterm
+  endif
+  if cmd != ""
+    exec "hi " . a:group . cmd
+  endif
+endfunction
+
+
+
+call s:hi("Normal", "NONE", s:text, s:base, "NONE", "NONE")
+call s:hi("Visual", "NONE", "NONE", s:surface1,"bold", "bold")
+call s:hi("Conceal", "NONE", s:overlay1, "NONE", "NONE", "NONE")
+call s:hi("ColorColumn", "NONE", "NONE", s:surface0, "NONE", "NONE")
+call s:hi("Cursor", "NONE", s:base, s:text, "NONE", "NONE")
+call s:hi("lCursor", "NONE", s:base, s:text, "NONE", "NONE")
+call s:hi("CursorIM", "NONE", s:base, s:text, "NONE", "NONE")
+call s:hi("CursorColumn", "NONE", "NONE", s:mantle, "NONE", "NONE")
+call s:hi("CursorLine", "NONE", "NONE", s:surface0, "NONE", "NONE")
+call s:hi("Directory", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("DiffAdd", "NONE", s:base, s:green, "NONE", "NONE")
+call s:hi("DiffChange", "NONE", s:base, s:yellow, "NONE", "NONE")
+call s:hi("DiffDelete", "NONE", s:base, s:red, "NONE", "NONE")
+call s:hi("DiffText", "NONE", s:base, s:blue, "NONE", "NONE")
+call s:hi("EndOfBuffer", "NONE", "NONE", "NONE", "NONE", "NONE")
+call s:hi("ErrorMsg", "NONE", s:red, "NONE", "bolditalic"    , "bold,italic")
+call s:hi("VertSplit", "NONE", s:crust, "NONE", "NONE", "NONE")
+call s:hi("Folded", "NONE", s:blue, s:surface1, "NONE", "NONE")
+call s:hi("FoldColumn", "NONE", s:overlay0, s:base, "NONE", "NONE")
+call s:hi("SignColumn", "NONE", s:surface1, s:base, "NONE", "NONE")
+call s:hi("IncSearch", "NONE", s:surface1, s:pink, "NONE", "NONE")
+call s:hi("CursorLineNR", "NONE", s:lavender, "NONE", "NONE", "NONE")
+call s:hi("LineNr", "NONE", s:surface1, "NONE", "NONE", "NONE")
+call s:hi("MatchParen", "NONE", s:peach, "NONE", "bold", "bold")
+call s:hi("ModeMsg", "NONE", s:text, "NONE", "bold", "bold")
+call s:hi("MoreMsg", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("NonText", "NONE", s:overlay0, "NONE", "NONE", "NONE")
+call s:hi("Pmenu", "NONE", s:overlay2, s:surface0, "NONE", "NONE")
+call s:hi("PmenuSel", "NONE", s:text, s:surface1, "bold", "bold")
+call s:hi("PmenuSbar", "NONE", "NONE", s:surface1, "NONE", "NONE")
+call s:hi("PmenuThumb", "NONE", "NONE", s:overlay0, "NONE", "NONE")
+call s:hi("Question", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("QuickFixLine", "NONE", "NONE", s:surface1, "bold", "bold")
+call s:hi("Search", "NONE", s:pink, s:surface1, "bold", "bold")
+call s:hi("SpecialKey", "NONE", s:subtext0, "NONE", "NONE", "NONE")
+call s:hi("SpellBad", s:red, "NONE", "NONE", "underline", "underline")
+call s:hi("SpellCap", s:yellow, "NONE", "NONE", "underline", "underline")
+call s:hi("SpellLocal", s:blue, "NONE", "NONE", "underline", "underline")
+call s:hi("SpellRare", s:green, "NONE", "NONE", "underline", "underline")
+call s:hi("StatusLine", "NONE", s:text, s:mantle, "NONE", "NONE")
+call s:hi("StatusLineNC", "NONE", s:surface1, s:mantle, "NONE", "NONE")
+call s:hi("TabLine", "NONE", s:surface1, s:mantle, "NONE", "NONE")
+call s:hi("TabLineFill", "NONE", "NONE", s:mantle, "NONE", "NONE")
+call s:hi("TabLineSel", "NONE", s:green, s:surface1, "NONE", "NONE")
+call s:hi("Title", "NONE", s:blue, "NONE", "bold", "bold")
+call s:hi("VisualNOS", "NONE", "NONE", s:surface1, "bold", "bold")
+call s:hi("WarningMsg", "NONE", s:yellow, "NONE", "NONE", "NONE")
+call s:hi("WildMenu", "NONE", "NONE", s:overlay0, "NONE", "NONE")
+call s:hi("Comment", "NONE", s:surface2, "NONE", "NONE", "NONE")
+call s:hi("Constant", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Identifier", "NONE", s:flamingo, "NONE", "NONE", "NONE")
+call s:hi("Statement", "NONE", s:mauve, "NONE", "NONE", "NONE")
+call s:hi("PreProc", "NONE", s:pink, "NONE", "NONE", "NONE")
+call s:hi("Type", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("Special", "NONE", s:pink, "NONE", "NONE", "NONE")
+call s:hi("Underlined", "NONE", s:text, s:base, "underline", "underline")
+call s:hi("Error", "NONE", s:red, "NONE", "NONE", "NONE")
+call s:hi("Todo", "NONE", s:base, s:yellow, "bold", "bold")
+
+call s:hi("String", "NONE", s:green, "NONE", "NONE", "NONE")
+call s:hi("Character", "NONE", s:teal, "NONE", "NONE", "NONE")
+call s:hi("Number", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Boolean", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Float", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Function", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("Conditional", "NONE", s:red, "NONE", "NONE", "NONE")
+call s:hi("Repeat", "NONE", s:red, "NONE", "NONE", "NONE")
+call s:hi("Label", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Operator", "NONE", s:sky, "NONE", "NONE", "NONE")
+call s:hi("Keyword", "NONE", s:pink, "NONE", "NONE", "NONE")
+call s:hi("Include", "NONE", s:pink, "NONE", "NONE", "NONE")
+call s:hi("StorageClass", "NONE", s:yellow, "NONE", "NONE", "NONE")
+call s:hi("Structure", "NONE", s:yellow, "NONE", "NONE", "NONE")
+call s:hi("Typedef", "NONE", s:yellow, "NONE", "NONE", "NONE")
+call s:hi("debugPC", "NONE", "NONE", s:crust, "NONE", "NONE")
+call s:hi("debugBreakpoint", "NONE", s:overlay0, s:base, "NONE", "NONE")
+
+hi link Define PreProc
+hi link Macro PreProc
+hi link PreCondit PreProc
+hi link SpecialChar Special
+hi link Tag Special
+hi link Delimiter Special
+hi link SpecialComment Special
+hi link Debug Special
+hi link Exception Error
+hi link StatusLineTerm StatusLine
+hi link StatusLineTermNC StatusLineNC
+hi link Terminal Normal
+hi link Ignore Comment
diff --git a/vim/.vim/colors/catppuccin_mocha.vim b/vim/.vim/colors/catppuccin_mocha.vim
new file mode 100644
index 0000000..a6064f6
--- /dev/null
+++ b/vim/.vim/colors/catppuccin_mocha.vim
@@ -0,0 +1,155 @@
+" Name: catppuccin_mocha.vim
+
+set background=dark
+hi clear
+
+if exists('syntax on')
+    syntax reset
+endif
+
+let g:colors_name='catppuccin_mocha'
+set t_Co=256
+
+let s:rosewater = "#F5E0DC"
+let s:flamingo = "#F2CDCD"
+let s:pink = "#F5C2E7"
+let s:mauve = "#CBA6F7"
+let s:red = "#F38BA8"
+let s:maroon = "#EBA0AC"
+let s:peach = "#FAB387"
+let s:yellow = "#F9E2AF"
+let s:green = "#A6E3A1"
+let s:teal = "#94E2D5"
+let s:sky = "#89DCEB"
+let s:sapphire = "#74C7EC"
+let s:blue = "#89B4FA"
+let s:lavender = "#B4BEFE"
+
+let s:text = "#CDD6F4"
+let s:subtext1 = "#BAC2DE"
+let s:subtext0 = "#A6ADC8"
+let s:overlay2 = "#9399B2"
+let s:overlay1 = "#7F849C"
+let s:overlay0 = "#6C7086"
+let s:surface2 = "#585B70"
+let s:surface1 = "#45475A"
+let s:surface0 = "#313244"
+
+let s:base = "#1E1E2E"
+let s:mantle = "#181825"
+let s:crust = "#11111B"
+
+function! s:hi(group, guisp, guifg, guibg, gui, cterm)
+  let cmd = ""
+  if a:guisp != ""
+    let cmd = cmd . " guisp=" . a:guisp
+  endif
+  if a:guifg != ""
+    let cmd = cmd . " guifg=" . a:guifg
+  endif
+  if a:guibg != ""
+    let cmd = cmd . " guibg=" . a:guibg
+  endif
+  if a:gui != ""
+    let cmd = cmd . " gui=" . a:gui
+  endif
+  if a:cterm != ""
+    let cmd = cmd . " cterm=" . a:cterm
+  endif
+  if cmd != ""
+    exec "hi " . a:group . cmd
+  endif
+endfunction
+
+
+
+call s:hi("Normal", "NONE", s:text, s:base, "NONE", "NONE")
+call s:hi("Visual", "NONE", "NONE", s:surface1,"bold", "bold")
+call s:hi("Conceal", "NONE", s:overlay1, "NONE", "NONE", "NONE")
+call s:hi("ColorColumn", "NONE", "NONE", s:surface0, "NONE", "NONE")
+call s:hi("Cursor", "NONE", s:base, s:text, "NONE", "NONE")
+call s:hi("lCursor", "NONE", s:base, s:text, "NONE", "NONE")
+call s:hi("CursorIM", "NONE", s:base, s:text, "NONE", "NONE")
+call s:hi("CursorColumn", "NONE", "NONE", s:mantle, "NONE", "NONE")
+call s:hi("CursorLine", "NONE", "NONE", s:surface0, "NONE", "NONE")
+call s:hi("Directory", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("DiffAdd", "NONE", s:base, s:green, "NONE", "NONE")
+call s:hi("DiffChange", "NONE", s:base, s:yellow, "NONE", "NONE")
+call s:hi("DiffDelete", "NONE", s:base, s:red, "NONE", "NONE")
+call s:hi("DiffText", "NONE", s:base, s:blue, "NONE", "NONE")
+call s:hi("EndOfBuffer", "NONE", "NONE", "NONE", "NONE", "NONE")
+call s:hi("ErrorMsg", "NONE", s:red, "NONE", "bolditalic"    , "bold,italic")
+call s:hi("VertSplit", "NONE", s:crust, "NONE", "NONE", "NONE")
+call s:hi("Folded", "NONE", s:blue, s:surface1, "NONE", "NONE")
+call s:hi("FoldColumn", "NONE", s:overlay0, s:base, "NONE", "NONE")
+call s:hi("SignColumn", "NONE", s:surface1, s:base, "NONE", "NONE")
+call s:hi("IncSearch", "NONE", s:surface1, s:pink, "NONE", "NONE")
+call s:hi("CursorLineNR", "NONE", s:lavender, "NONE", "NONE", "NONE")
+call s:hi("LineNr", "NONE", s:surface1, "NONE", "NONE", "NONE")
+call s:hi("MatchParen", "NONE", s:peach, "NONE", "bold", "bold")
+call s:hi("ModeMsg", "NONE", s:text, "NONE", "bold", "bold")
+call s:hi("MoreMsg", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("NonText", "NONE", s:overlay0, "NONE", "NONE", "NONE")
+call s:hi("Pmenu", "NONE", s:overlay2, s:surface0, "NONE", "NONE")
+call s:hi("PmenuSel", "NONE", s:text, s:surface1, "bold", "bold")
+call s:hi("PmenuSbar", "NONE", "NONE", s:surface1, "NONE", "NONE")
+call s:hi("PmenuThumb", "NONE", "NONE", s:overlay0, "NONE", "NONE")
+call s:hi("Question", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("QuickFixLine", "NONE", "NONE", s:surface1, "bold", "bold")
+call s:hi("Search", "NONE", s:pink, s:surface1, "bold", "bold")
+call s:hi("SpecialKey", "NONE", s:subtext0, "NONE", "NONE", "NONE")
+call s:hi("SpellBad", s:red, "NONE", "NONE", "underline", "underline")
+call s:hi("SpellCap", s:yellow, "NONE", "NONE", "underline", "underline")
+call s:hi("SpellLocal", s:blue, "NONE", "NONE", "underline", "underline")
+call s:hi("SpellRare", s:green, "NONE", "NONE", "underline", "underline")
+call s:hi("StatusLine", "NONE", s:text, s:mantle, "NONE", "NONE")
+call s:hi("StatusLineNC", "NONE", s:surface1, s:mantle, "NONE", "NONE")
+call s:hi("TabLine", "NONE", s:surface1, s:mantle, "NONE", "NONE")
+call s:hi("TabLineFill", "NONE", "NONE", s:mantle, "NONE", "NONE")
+call s:hi("TabLineSel", "NONE", s:green, s:surface1, "NONE", "NONE")
+call s:hi("Title", "NONE", s:blue, "NONE", "bold", "bold")
+call s:hi("VisualNOS", "NONE", "NONE", s:surface1, "bold", "bold")
+call s:hi("WarningMsg", "NONE", s:yellow, "NONE", "NONE", "NONE")
+call s:hi("WildMenu", "NONE", "NONE", s:overlay0, "NONE", "NONE")
+call s:hi("Comment", "NONE", s:surface2, "NONE", "NONE", "NONE")
+call s:hi("Constant", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Identifier", "NONE", s:flamingo, "NONE", "NONE", "NONE")
+call s:hi("Statement", "NONE", s:mauve, "NONE", "NONE", "NONE")
+call s:hi("PreProc", "NONE", s:pink, "NONE", "NONE", "NONE")
+call s:hi("Type", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("Special", "NONE", s:pink, "NONE", "NONE", "NONE")
+call s:hi("Underlined", "NONE", s:text, s:base, "underline", "underline")
+call s:hi("Error", "NONE", s:red, "NONE", "NONE", "NONE")
+call s:hi("Todo", "NONE", s:base, s:yellow, "bold", "bold")
+
+call s:hi("String", "NONE", s:green, "NONE", "NONE", "NONE")
+call s:hi("Character", "NONE", s:teal, "NONE", "NONE", "NONE")
+call s:hi("Number", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Boolean", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Float", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Function", "NONE", s:blue, "NONE", "NONE", "NONE")
+call s:hi("Conditional", "NONE", s:red, "NONE", "NONE", "NONE")
+call s:hi("Repeat", "NONE", s:red, "NONE", "NONE", "NONE")
+call s:hi("Label", "NONE", s:peach, "NONE", "NONE", "NONE")
+call s:hi("Operator", "NONE", s:sky, "NONE", "NONE", "NONE")
+call s:hi("Keyword", "NONE", s:pink, "NONE", "NONE", "NONE")
+call s:hi("Include", "NONE", s:pink, "NONE", "NONE", "NONE")
+call s:hi("StorageClass", "NONE", s:yellow, "NONE", "NONE", "NONE")
+call s:hi("Structure", "NONE", s:yellow, "NONE", "NONE", "NONE")
+call s:hi("Typedef", "NONE", s:yellow, "NONE", "NONE", "NONE")
+call s:hi("debugPC", "NONE", "NONE", s:crust, "NONE", "NONE")
+call s:hi("debugBreakpoint", "NONE", s:overlay0, s:base, "NONE", "NONE")
+
+hi link Define PreProc
+hi link Macro PreProc
+hi link PreCondit PreProc
+hi link SpecialChar Special
+hi link Tag Special
+hi link Delimiter Special
+hi link SpecialComment Special
+hi link Debug Special
+hi link Exception Error
+hi link StatusLineTerm StatusLine
+hi link StatusLineTermNC StatusLineNC
+hi link Terminal Normal
+hi link Ignore Comment
diff --git a/vim/.vim/pack/default/start/vim-flog b/vim/.vim/pack/default/start/vim-flog
new file mode 160000
index 0000000..72f8097
--- /dev/null
+++ b/vim/.vim/pack/default/start/vim-flog
@@ -0,0 +1 @@
+Subproject commit 72f80973021957741ceca35e488fce5b430faeea
diff --git a/vim/.vim/pack/default/start/vim-fugitive b/vim/.vim/pack/default/start/vim-fugitive
new file mode 160000
index 0000000..b3b838d
--- /dev/null
+++ b/vim/.vim/pack/default/start/vim-fugitive
@@ -0,0 +1 @@
+Subproject commit b3b838d690f315a503ec4af8c634bdff3b200aaf
diff --git a/vim/.vim/pack/default/start/vim-mucomplete b/vim/.vim/pack/default/start/vim-mucomplete
new file mode 160000
index 0000000..03bcd4a
--- /dev/null
+++ b/vim/.vim/pack/default/start/vim-mucomplete
@@ -0,0 +1 @@
+Subproject commit 03bcd4a7dfe0a2f6d432e8ce936d35273a15209d
diff --git a/vim/.vimrc b/vim/.vimrc
index 30834c0..ce561f2 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -55,7 +55,6 @@ let g:netrw_altv=1
 let g:netrw_liststyle=3
 let g:netrw_list_hide=netrw_gitignore#Hide()
 let g:netrw_list_hide.=',\(\^\|\s\s\)\zs\.\S\+'
-"map <C-n> :NERDTreeToggle<CR>
 map <C-n>  :Lex <bar> vertical resize 30 <CR>
 
 " Cursorline
@@ -109,8 +108,9 @@ set statusline+=\ [%n]
 " let g:vimspector_enable_mappings = 'HUMAN'
 " packadd! vimspector
 
-packadd! gruvbox
-colorscheme gruvbox
+set termguicolors
+" colorscheme gruvbox
+colorscheme catppuccin_macchiato
 set bg=dark
 
 packadd! vim-log-highlighting
@@ -118,13 +118,8 @@ packadd! vim-log-highlighting
 " tagbar, press F8
 nmap <F8> :TagbarToggle<CR>
 
-" packadd! ale
-packloadall
-" Load all of the helptags now, after plugins have been loaded.
-" All messages and errors will be ignored.
-silent! helptags ALL
 
-" ---------- Code Highlighting 
+" ---------- Selection Highlighting 
 " hlsearch colors
 highlight Search ctermbg=black ctermfg=darkgrey ctermbg=grey
 " Highlight all instances of word under cursor, when idle.
@@ -134,7 +129,7 @@ function! AutoHighlightToggle()
       au!
       au CursorHold * let @/ = '\V\<'.escape(expand('<cword>'), '\').'\>'
     augroup end
-    setl updatetime=300
+    setl updatetime=500
 endfunction
 call AutoHighlightToggle()
 
@@ -142,13 +137,35 @@ call AutoHighlightToggle()
 let g:ale_enabled = 1
 let g:ale_hover_enabled = 1
 " nmap gr :ALEFindReferences<CR>
-" nmap K :ALEHover<CR>
+nmap K :ALEHover<CR>
 
-" set omnifunc=syntaxcomplete#Complete
-set omnifunc=ale#completion#Complete
-let g:ale_completion_enabled=1
+set completeopt+=menuone
+set completeopt+=noselect
+set completeopt+=noinsert
+set shortmess+=c   " Shut off completion messages
+set belloff+=ctrlg " Add only if Vim beeps during completion
+let g:mucomplete#enable_auto_at_startup = 1
+let g:mucomplete#completion_delay = 1
+
+set omnifunc=syntaxcomplete#Complete
+" set omnifunc=ale#completion#Complete
+"set omnifunc=ale#completion#OmniFunc
+"let g:ale_completion_enabled=1
+"function! OpenCompletion()
+"    if !pumvisible() && ((v:char >= 'a' && v:char <= 'z') || (v:char >= 'A' && v:char <= 'Z'))
+"        call feedkeys("\<C-x>\<C-o>", "n")
+"    endif
+"endfunction
+"
+"autocmd InsertCharPre * call OpenCompletion()
 let g:ale_set_balloons=1
-
-set completeopt+=menuone,noselect,noinsert
+"
+"set completeopt+=longest,menu,menuone,preview,noselect,noinsert
+"" set completeopt+=menuone,noselect,noinsert
+""
 autocmd InsertLeave,CompleteDone * if pumvisible() == 0 | pclose | endif
 
+packloadall
+" Load all of the helptags now, after plugins have been loaded.
+" All messages and errors will be ignored.
+silent! helptags ALL