feat: added vty options

6 files changed, 70 insertions, 42 deletions

diff --git a/.bash_profile b/.bash_profile
index c4b4855..8df2062 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -33,7 +33,10 @@ export QT_QPA_PLATFORMTHEME=qt5ct
 sed -i 's/echo Agent pid [0-9]*;$//g' $HOME/.ssh/ssh-agent.env
 source $HOME/.ssh/ssh-agent.env
 
-set -o vi
+# recolor if we are linux
+if [[ $TERM = "linux" ]]; then
+    recolor-vty
+fi
 
 # Get the aliases and functions
 [ -f $HOME/.bashrc ] && . $HOME/.bashrc
diff --git a/.bashrc b/.bashrc
index b0b9d5c..a6ecd75 100644
--- a/.bashrc
+++ b/.bashrc
@@ -18,7 +18,6 @@ alias .....='cd ../../../..'
 
 alias dots='git --git-dir=$HOME/.dots --work-tree=$HOME'
 alias lofi="mpv 'https://www.youtube.com/watch?v=5qap5aO4i9A' --no-video"
-alias tmux='tmux -f $HOME/.config/tmux/config'
 alias mail='neomutt'
 
 dbg()
@@ -65,13 +64,13 @@ pkg()
                 install | i)
                     shift 1
                     (
-                        cd $HOME/opt/void-packages;
+                        cd "$HOME/opt/void-packages" || exit;
                         xi "$@"
                     )
                 ;;
                 *)
                     (
-                        cd $HOME/opt/void-packages;
+                        cd "$HOME/opt/void-packages" || exit;
                         ./xbps-src "$@"
                     )
                 ;;
@@ -105,6 +104,9 @@ g()
         clone | cl)
             git clone "$@"
         ;;
+        diff | d)
+            git diff "$@"
+        ;;
         checkout | co)
             git checkout "$@"
         ;;
@@ -152,6 +154,18 @@ g()
 }
 export -f g
 
+tmux()
+{
+    shift 1
+    if [[ "$TERM" == linux ]]
+    then
+        command tmux -f "$HOME/.config/tmux/linux" "$@"
+    else
+        command tmux -f "$HOME/.config/tmux/config" "$@"
+    fi
+}
+export -f tmux
+
 # su
 su()
 {
@@ -315,3 +329,5 @@ prompt_init()
 if [ -z "${prompt_skip_init:-}" ]; then
   prompt_init
 fi
+
+set -o vi
diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua
index a856f96..de61f3b 100644
--- a/.config/nvim/lua/settings.lua
+++ b/.config/nvim/lua/settings.lua
@@ -5,6 +5,8 @@ local home = vim.env.HOME
 local opt  = vim.opt
 local tmp  = home .. '/.config/nvim/cache'
 
+local term = vim.fn.getenv("TERM")
+
 opt.autoindent     = true                              -- maintain indent of current line
 opt.backspace      = 'indent,start,eol'                -- allow unrestricted backspacing in insert mode
 opt.backup         = false                             -- don't make backups before writing
@@ -111,7 +113,11 @@ opt.swapfile      = false                   -- don't create swap files
 opt.switchbuf     = 'usetab'                -- try to reuse windows/tabs when switching buffers
 opt.synmaxcol     = 200                     -- don't bother syntax highlighting long lines
 opt.tabstop       = 4                       -- spaces per tab
-opt.termguicolors = true                    -- use guifg/guibg instead of ctermfg/ctermbg in terminal
+if term ~= "linux" and term ~= "screen-256color" then
+    opt.termguicolors = true                -- use guifg/guibg instead of ctermfg/ctermbg in terminal
+else
+    opt.termguicolors = false
+end
 opt.textwidth     = 0                       -- automatically hard wrap at 0 columns
 
 -- TODO: turn into native lua functions
diff --git a/.config/nvim/lua/theme.lua b/.config/nvim/lua/theme.lua
index 4fb69c6..217bf3c 100644
--- a/.config/nvim/lua/theme.lua
+++ b/.config/nvim/lua/theme.lua
@@ -86,59 +86,59 @@ local theme = {
     Normal            = { },
     EndOfBuffer       = { },
     NonText           = { ctermfg="238", guifg=color.gray[4] },
-    Comment           = { ctermfg="241", guifg=color.gray[3], gui="italic" },
+    Comment           = { ctermfg="8",   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] },
+    Constant          = { ctermfg="3",   guifg=color.orange[2] },
+    String            = { ctermfg="74",  guifg=color.blue[1] },
+    Identifier        = { ctermfg="250", guifg=color.white[2], gui="bold" },
+    Statement         = { ctermfg="10",  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] },
-    Special           = { ctermfg="243", guifg=color.purple[1] },
-    Error             = { ctermfg="132", guifg=color.orange[1] },
+    PreProc           = { ctermfg="166", guifg=color.red[2] },
+    Type              = { ctermfg="178", guifg=color.yellow[2] },
+    Special           = { ctermfg="5",   guifg=color.purple[1] },
+    Error             = { ctermfg="1",   guifg=color.orange[1] },
     Warning           = { ctermfg="179", guifg=color.yellow[1] },
     ModeMsg           = { ctermfg="243", guifg=color.blue[1], gui="bold" },
-    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] },
+    Todo              = { ctermfg="160", cterm="bold", guifg=color.red[1], guibg=color.black[1], gui="bold" },
+    Underlined        = { ctermfg="251", cterm="bold", guifg=color.white[3], gui="underline" },
+    StatusLine        = { ctermbg="7",   ctermfg="0",  guibg=color.white[5], guifg=color.gray[5], gui="bold" },
+    StatusLineNC      = { ctermbg="236", ctermfg="0", guibg=color.gray[4], guifg=color.white[3] },
+    WildMenu          = { ctermbg="246", 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], gui="bold" },
-    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] },
+    CursorLineNr      = { ctermfg="4",   guifg=color.blue[1], gui="bold" },
+    Cursor            = { ctermbg="4",   guibg=color.blue[1], guifg=color.white[3] },
+    CursorLine        = { ctermbg="8",   guibg=color.black[0] },
+    ColorColumn       = { ctermbg="236", guibg=color.black[1] },
     SignColumn        = { ctermfg="243", guifg=color.gray[2] },
     Visual            = { ctermbg="237", guibg=color.gray[2] },
     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] },
+    PmenuThumb        = { ctermbg="199", 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" },
+    IncSearch         = { ctermbg="6",   ctermfg="235", guibg=color.aqua[1], guifg=color.black[1] },
+    Search            = { ctermbg="4",   ctermfg="235", guibg=color.blue[1], guifg=color.black[1] },
+    Directory         = { ctermfg="4",   guifg=color.blue[1] },
+    MatchParen        = { ctermfg="6",   cterm="bold", guifg=color.aqua[1], gui="bold" },
+    SpellBad          = { ctermfg="5",   cterm="underline", guifg=color.purple[1], gui="underline" },
+    SpellCap          = { ctermfg="6",   cterm="underline", guifg=color.aqua[1], gui="underline" },
+    SpellLocal        = { ctermfg="11",  cterm="underline", guifg=color.yellow[1], gui="underline" },
     QuickFixLine      = { ctermbg="234", guibg=color.black[1] },
-    DiffAdd           = { ctermbg="236", ctermfg="108", guifg=color.aqua[1] },
-    DiffChange        = { ctermbg="236", guifg=color.yellow[1] },
-    DiffName          = { ctermbg="236", ctermfg="132", guifg=color.purple[1] },
-    DiffDelete        = { ctermbg="236", ctermfg="132", guifg=color.red[1] },
-    DiffText          = { ctermbg="236", ctermfg="179", guifg=color.yellow[1] },
+    DiffAdd           = { ctermfg="6",   guifg=color.aqua[1] },
+    DiffChange        = { ctermfg="179", guifg=color.yellow[1] },
+    DiffName          = { ctermbg="5", ctermfg="132", guifg=color.purple[1] },
+    DiffDelete        = { ctermbg="1",  ctermfg="132", guifg=color.red[1] },
+    DiffText          = { ctermbg="179", ctermfg="179", guifg=color.yellow[1] },
 
-    helpHyperTextJump = { ctermfg="140",  guifg=color.blue[1] },
-    netrwExe          = { guifg=color.aqua[1] },
-    mailQuoted1       = { guifg=color.gray[1] },
-    mailQuoted2       = { guifg=color.gray[3] },
+    helpHyperTextJump = { ctermfg="4",  guifg=color.blue[1] },
+    netrwExe          = { ctermfg="6",  guifg=color.aqua[1] },
+    mailQuoted1       = { ctermfg="246", guifg=color.gray[1] },
+    mailQuoted2       = { ctermfg="238", guifg=color.gray[3] },
 }
 
 local links = {
diff --git a/.config/nvim/pack/vendor/packages b/.config/nvim/pack/vendor/packages
index 79d5ad8..4ec144e 100644
--- a/.config/nvim/pack/vendor/packages
+++ b/.config/nvim/pack/vendor/packages
@@ -17,6 +17,8 @@ tpope/vim-surround
 tpope/vim-repeat
 tpope/vim-vinegar
 tpope/vim-commentary
+tpope/vim-unimpaired
+tpope/vim-eunuch
 
 simeji/winresizer
 adelarsq/vim-matchit
diff --git a/.config/tmux/config b/.config/tmux/config
index 98afd39..f6bbf78 100644
--- a/.config/tmux/config
+++ b/.config/tmux/config
@@ -75,8 +75,9 @@ bind-key u capture-pane \;\
 # Design Changes 
 ######################
 
-set -g default-terminal "screen-256color"
-set -sa terminal-overrides ",term*:Tc:sitm=\E[3m:ritm=\E[23m:Smulx=\E[4::%p1%dm:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m"
+set default-terminal "tmux-256color"
+# set -sa terminal-overrides ",term*:Tc:sitm=\E[3m:ritm=\E[23m:Smulx=\E[4::%p1%dm:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m"
+set-option -a terminal-overrides ",*256col*:RGB"
 
 # UTF-8
 set -q -g status-utf8 on