From 3c8c7d699bc43d022704ec10064887d2cdd59ca1 Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Wed, 19 Oct 2022 07:00:49 +0000
Subject: [PATCH] stuff

---
 tmux/.tmux.conf                 | 12 +++++-------
 tmux/.tmux/plugins/tmux         |  1 +
 vim/.vim/lua/plugins.lua        |  1 +
 vim/.vim/plugged/nvim-scrollbar |  1 +
 vim/.vim/prefs/plugins.vim      |  1 +
 5 files changed, 9 insertions(+), 7 deletions(-)
 create mode 160000 tmux/.tmux/plugins/tmux
 create mode 160000 vim/.vim/plugged/nvim-scrollbar

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index f5db732..fe6d86c 100644
--- a/tmux/.tmux.conf
+++ b/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'
diff --git a/tmux/.tmux/plugins/tmux b/tmux/.tmux/plugins/tmux
new file mode 160000
index 0000000..d9e5c6d
--- /dev/null
+++ b/tmux/.tmux/plugins/tmux
@@ -0,0 +1 @@
+Subproject commit d9e5c6d1e3b2c6f6f344f7663691c4c8e7ebeb4c
diff --git a/vim/.vim/lua/plugins.lua b/vim/.vim/lua/plugins.lua
index 072d372..f348d4b 100644
--- a/vim/.vim/lua/plugins.lua
+++ b/vim/.vim/lua/plugins.lua
@@ -22,3 +22,4 @@ vim.diagnostic.config({
   virtual_text = false,
 })
 require("lsp_lines").setup()
+require("scrollbar").setup()
diff --git a/vim/.vim/plugged/nvim-scrollbar b/vim/.vim/plugged/nvim-scrollbar
new file mode 160000
index 0000000..ce0df69
--- /dev/null
+++ b/vim/.vim/plugged/nvim-scrollbar
@@ -0,0 +1 @@
+Subproject commit ce0df6954a69d61315452f23f427566dc1e937ae
diff --git a/vim/.vim/prefs/plugins.vim b/vim/.vim/prefs/plugins.vim
index a60b683..b2c018a 100644
--- a/vim/.vim/prefs/plugins.vim
+++ b/vim/.vim/prefs/plugins.vim
@@ -22,6 +22,7 @@ Plug 'folke/trouble.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