diff --git a/.shenanigans.sh b/.shenanigans.sh
index 57aa713095781c3b5b264384b0d544a7ced43f72..d341bebe54f2dd5075057f49f6363470c3f54947 100755
--- a/.shenanigans.sh
+++ b/.shenanigans.sh
@@ -2,9 +2,9 @@ # 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 rofi picom cwm xclip xsetroot st
-#   xss-lock wmctrl zip mc htop entr ack cifs-utils rsync xdotool jq
+#   xss-lock wmctrl zip mc htop entr cifs-utils rsync jq ripgrep
 #   clang clang-tools-extra vim git curl tmux hstr tree make cmake
-#   nvtop ctags stow newsboat mpv rsync python3-pipx lazygit fossil
+#   nvtop ctags stow newsboat mpv rsync python3-pipx lazygit tcc
 # Additonal stuff:
 #   pipx install pyright
 #   go install golang.org/x/tools/gopls@latest
diff --git a/.vimrc b/.vimrc
index d5a034f4dcaf6052bb290dc16c889e44f97f2bb8..679c052a258248a92fcc6f6259198a5375479a0a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -7,10 +7,10 @@ 	Plug 'mitjafelicijan/sniper.vim'
 	Plug 'ctrlpvim/ctrlp.vim'
 call plug#end()
 
-set path+=** laststatus=2 encoding=utf8 spelllang=en_us tabstop=4 shiftwidth=4
-set number relativenumber autoindent cursorline ignorecase hlsearch incsearch 
+set encoding=utf8 spelllang=en_us laststatus=2 tabstop=4 shiftwidth=4
+set path+=** number autoindent cursorline ignorecase hlsearch incsearch
 set hidden nowrap nobackup noswapfile noundofile autoread updatetime=300
-set backspace=indent,eol,start completeopt=menuone
+set backspace=indent,eol,start completeopt=menuone grepprg=rg\ --vimgrep
 colorscheme wildcharm
 
 nnoremap <C-Right> :bnext<cr>
@@ -19,8 +19,7 @@ nnoremap <C-q> :copen<cr>
 nnoremap <C-b> :CtrlPBuffer<cr>
 nnoremap <Leader>q :nohlsearch<cr>
 nnoremap <Leader>c :silent call system('ctags --c++-kinds=+p -R .')<CR>
-nnoremap <leader>g :vimgrepadd /<C-r><C-w>/gj **/*<CR>:copen<CR>
-nnoremap <leader>t :vimgrepadd /TODO:\\|FIXME:\\|XXX:/gj **/*<CR>:copen<CR>
+nnoremap <leader>r :grep <C-r><C-w><CR>:copen<CR>
 
 let g:ctrlp_use_caching = 0
 let g:ctrlp_working_path_mode = ''