3 files changed, 16 insertions, 5 deletions

diff --git a/.shenanigans.sh b/.shenanigans.sh
index be3e7d3..ab8d5ab 100755
--- a/.shenanigans.sh
+++ b/.shenanigans.sh
@@ -1,7 +1,7 @@
 # Software list (Void Linux):
 #   void-repo-nonfree void-repo-multilib void-repo-multilib-nonfree
 #   file-roller xfce4-plugins thunar-archive-plugin
-#   lm_sensors conky maim xlockmore picom cwm xclip xsetroot xdotool
+#   lm_sensors conky maim xlockmore picom cwm xclip xsel xsetroot xdotool
 #   xss-lock wmctrl zip mc htop entr cifs-utils rsync jq rofi st fd
 #   clang clang-tools-extra vim git curl tmux hstr tree make cmake gdb
 #   nvtop ctags stow newsboat mpv rsync python3-pipx lazygit
diff --git a/.tmux.conf b/.tmux.conf
index 6d060f8..a4996f0 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -17,6 +17,8 @@ set -g status-bg '#222222'
 set -g status-fg '#ffffff'
 set -g window-status-current-format "#[fg=#ffffff]#[bg=#000000]#[fg=#ffffff]#[bg=#000000] #I:#W #[fg=#ffffff]#[bg=#000000]"
 
+bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xsel -i --clipboard"
+
 bind-key Up    select-pane -U
 bind-key Down  select-pane -D
 bind-key Left  select-pane -L
diff --git a/.vimrc b/.vimrc
index 6b08d02..1fc7921 100644
--- a/.vimrc
+++ b/.vimrc
@@ -12,10 +12,17 @@ call plug#end()
 set encoding=utf8 spelllang=en_us laststatus=2 tabstop=4 shiftwidth=4
 set number autoindent cursorline ignorecase hlsearch incsearch signcolumn=yes
 set hidden nowrap nobackup noswapfile noundofile autoread updatetime=300
-set backspace=indent,eol,start completeopt=menuone path+=** 
+set backspace=indent,eol,start completeopt=menuone path+=**
+set foldmethod=syntax foldlevel=99 foldopen= lazyredraw
 set wildignore+=*/.git/*,*/.hg/*,*/.svn/*,*/vendor,tags,*.o,*.a,*.so
+set grepprg=rg\ --vimgrep\ --no-heading\ --smart-case
 colorscheme wildcharm
 
+if executable('rg')
+  set grepprg=rg\ --vimgrep\ --smart-case
+  set grepformat=%f:%l:%c:%m
+endif
+
 nnoremap <C-Right> :bnext<CR>
 nnoremap <C-Left> :bprevious<CR>
 nnoremap <C-q> :copen<CR>
@@ -28,15 +35,17 @@ nnoremap <Leader>d :bd<CR>
 nnoremap <leader>t :term<CR>
 nnoremap <Leader>q :nohlsearch<CR>
 nnoremap <Leader>e :ALEPopulateQuickfix<CR>:sleep 100m<CR>:copen<CR>
-nnoremap <leader>w :vimgrep /<C-r><C-w>/gj **/*<CR>:copenx<CR>
+" nnoremap <leader>w :vimgrep /<C-r><C-w>/gj **/*<CR>:copen<CR>
+
+nnoremap <leader>w :silent! grep! <cword> \| cwindow \| redraw!<CR>
+
 
 nmap <silent> gr :ALEFindReferences -quickfix<CR>:sleep 100m<CR>:copen<CR>
 nmap <silent> gd :ALEGoToDefinition<CR>
 nmap <silent> re :ALERename<CR>
 
-" let g:ctrlp_use_caching = 0
+let g:ctrlp_use_caching = 0
 " let g:ctrlp_working_path_mode = ''
-
 let g:ctrlp_working_path_mode = 'ra'
 let g:ale_hover_to_floating_preview = 1
 let g:ale_detail_to_floating_preview = 1