stuff

tmux/.tmux.conf

@@ -71,7 +71,6 @@ bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iq v
 bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-j) || tmux select-pane -D"
 bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-k) || tmux select-pane -U"
 bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-l) || tmux select-pane -R"
-#bind -n C-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys 'C-\\') || tmux select-pane -l"
 
 # allowd pane-navigation while in copy-mode
 bind-key -T copy-mode-vi C-h select-pane -L
@@ -96,14 +95,11 @@ bind-key C-a set-option -g prefix C-a
 # No delay for escape key press
 set -sg escape-time 0
 
-#set -g @continuum-restore 'off'
-#set -g @resurrect-save-shell-history 'on'
-#set -g @resurrect-strategy-vim 'session'
-
-#set -g @themepack 'powerline/double/cyan'
-source-file "${HOME}/.tmux/osiris-theme.conf"
+setw -g window-status-format "#[fg=$thm_bg,bg=$thm_blue] #I #[fg=$thm_fg,bg=$thm_gray] #W "
+setw -g window-status-current-format "#[fg=$thm_bg,bg=$thm_orange] #I #[fg=$thm_fg,bg=$thm_bg] #W "
 
 # List of plugins
+set -g @plugin 'catppuccin/tmux'
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'tmux-plugins/tmux-yank'
@@ -113,5 +109,7 @@ set -g @plugin 'tmux-plugins/tmux-battery'
 set -g @plugin 'tmux-plugins/tmux-cowboy' # Kill process in pane w/ prefix+*
 #set -g @plugin 'odedlaz/tmux-onedark-theme'
 
+# set -g @catppuccin_flavour 'latte' # or frappe, macchiato, mocha
+
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
 run '~/.tmux/plugins/tpm/tpm'

vim/.vim/lua/plugins.lua

@@ -16,3 +16,10 @@ require("catppuccin-config")
 require("symbols-outline-config")
 
 require "fidget".setup{}
+
+-- redundant w/ lsp_lines
+vim.diagnostic.config({
+  virtual_text = false,
+})
+require("lsp_lines").setup()
+require("scrollbar").setup()

vim/.vim/prefs/cmp.vim

@@ -1,6 +0,0 @@
-lua << EOF
-  require 'lspconfig'
-  require("lsp")
-  require("diagnostics")
-  require("telescope")
-EOF

vim/.vim/prefs/plugins.vim

@@ -18,55 +18,44 @@ Plug 'simrat39/symbols-outline.nvim'
 " required only for diagnostics
 Plug 'folke/trouble.nvim'
 
+" Nvim
+Plug 'kosayoda/nvim-lightbulb'
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+Plug 'jghauser/mkdir.nvim'
+Plug 'petertriho/nvim-scrollbar'
+Plug 'ErichDonGubler/lsp_lines.nvim'
 
 Plug 'nvim-lua/plenary.nvim'           " lua helpers
 Plug 'nvim-telescope/telescope.nvim'   " actual plugin
 Plug 'sso://user/vintharas/telescope-codesearch.nvim'
+Plug 'nvim-lualine/lualine.nvim'
+Plug 'rcarriga/nvim-notify'
 
 " UI EXTENSIONS
 Plug 'ntpeters/vim-better-whitespace'  "auto-set tab/space size
 Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
-Plug 'nvim-lualine/lualine.nvim'
-Plug 'rcarriga/nvim-notify'
-" Plug 'vim-airline/vim-airline'         " ...
-" Plug 'vim-airline/vim-airline-themes'
+
 Plug 'nathanaelkane/vim-indent-guides'
-Plug 'Konfekt/vim-scratchpad'
-Plug 'guns/xterm-color-table.vim'
 Plug 'mbbill/undotree'
 Plug 'tversteeg/registers.nvim', { 'branch': 'main' }
-" Plug 'ryanoasis/vim-devicons'
 
 " INTEGRATION
 Plug 'AndrewRadev/linediff.vim'
 Plug 'tpope/vim-fugitive'             " git
-Plug 'junegunn/gv.vim'                " git commit browser
 Plug 'tpope/vim-git'
 Plug 'airblade/vim-gitgutter'         " live git diff gutter
 Plug 'tmux-plugins/vim-tmux'          " tmux
 Plug 'preservim/vimux'
 Plug 'christoomey/vim-tmux-navigator' " tmux
-Plug 'ferrine/md-img-paste.vim'       " copy-paste images to markdown
-Plug 'junegunn/vim-easy-align'        " markdown table aligns
 Plug 'skywind3000/asyncrun.vim'
-Plug 'dhruvasagar/vim-table-mode'     " git readme tables
-Plug 'NLKNguyen/cloudformation-syntax.vim'
-Plug 'stephpy/vim-yaml'
-Plug 'towolf/vim-helm'
-Plug 'tell-k/vim-autoflake' " remove unused python imports
-Plug 'embear/vim-uncrustify'
-Plug 'sakhnik/nvim-gdb', { 'do': 'bash ./install.sh \| UpdateRemotePlugins' }
-Plug 'kburdett/vim-nuuid'
-Plug 'easymotion/vim-easymotion'
+" Plug 'easymotion/vim-easymotion'
 
 " AUTO-COMPLETION
 Plug 'christoomey/vim-titlecase'
 Plug 'chiedo/vim-case-convert'
 
 " FILE INTERACTIONS
-" Plug 'mileszs/ack.vim'      " Ack bindings
 Plug 'jremmen/vim-ripgrep'
 
 Plug 'preservim/nerdtree'  " File Tree
@@ -77,27 +66,9 @@ Plug 'udalov/kotlin-vim'
 Plug 'hsanson/vim-android'
 Plug 'OmniSharp/omnisharp-vim'
 Plug 'whatyouhide/vim-tmux-syntax'
-Plug 'chase/vim-ansible-yaml'
-Plug 'justinmk/vim-syntax-extra'
-Plug 'NLKNguyen/c-syntax.vim'
-Plug 'octol/vim-cpp-enhanced-highlight'
-Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
-Plug 'hexdigest/gounit-vim'
-Plug 'pangloss/vim-javascript'
-Plug 'mattn/emmet-vim'
 
-Plug 'jparise/vim-graphql'
-Plug 'StanAngeloff/php.vim'
-Plug 'sealemar/vtl'
-Plug 'wavded/vim-stylus'
-Plug 'nikvdp/ejs-syntax'
-Plug 'lepture/vim-velocity'
 au BufNewFile,BufRead *.vtl, set ft=velocity
 
-" MARKUP/OBJECT NOTATION
-Plug 'plasticboy/vim-markdown'
-Plug 'elzr/vim-json'
-
 " FUNCTIONALITY STUFF
 Plug 'tmux-plugins/vim-tmux-focus-events'
 set autoread
@@ -108,28 +79,11 @@ Plug 'wesQ3/vim-windowswap'
 " FORMATTING
 Plug 'tpope/vim-surround'       " easily surround with delimiters
 Plug 'scrooloose/nerdcommenter' " comment bindings
-Plug 'junegunn/vim-easy-align'
-Plug 'tommcdo/vim-exchange'
 
 " THEMES
 Plug 'catppuccin/nvim', { 'as': 'catppuccin' }
-Plug 'altercation/vim-colors-solarized'
-Plug 'vim-airline/vim-airline-themes'
 Plug 'jdkanani/vim-material-theme'
-Plug 'sonph/onehalf', { 'rtp': 'vim' }
-Plug 'gosukiwi/vim-atom-dark'
-Plug 'jacoborus/tender.vim'
 Plug 'kristijanhusak/vim-hybrid-material'
-Plug 'NLKNguyen/papercolor-theme'
-Plug 'arcticicestudio/nord-vim'
-Plug 'chase/focuspoint-vim'
-Plug 'patstockwell/vim-monokai-tasty' " airline
-Plug 'fxn/vim-monochrome'
-Plug 'robertmeta/nofrils'
-Plug 'kristiandupont/shades-of-teal'
-Plug 'joshdick/onedark.vim'
-Plug 'google/vim-colorscheme-primary'
-Plug 'kyoz/purify', { 'rtp': 'vim' }
 Plug 'kyazdani42/nvim-web-devicons'
 
 " ONE LINERS ONLY

vim/.vimrc

@@ -104,7 +104,6 @@ call plug#end()            " required
 lua require("plugins")
 
 if filereadable(expand("~/use_google"))
-    source ~/.vim/prefs/cmp.vim
     source ~/.vim/prefs/imp.vim
     source ~/.vim/prefs/google_comments.vim
     lua require("google_comments")