4 files changed, 13 insertions, 26 deletions

diff --git a/.cwmrc b/.cwmrc
index 5520579..511aa8c 100644
--- a/.cwmrc
+++ b/.cwmrc
@@ -14,7 +14,7 @@ bind-key 4-e thunar
 bind-key 4-r simplescreenrecorder
 bind-key 4-p "rofi -show drun -theme ~/.black.rasi"
 bind-key 4-s "xmagnify -s 1000 -z 3"
-bind-key 4-b "wmctrl -r :ACTIVE: -e 0,3408,1050,416,236"
+bind-key 4-b "wmctrl -r :ACTIVE: -e 0,3408,1060,416,236"
 bind-key 4-bracketright "pats -t"
 bind-key C-grave "pactl set-source-mute @DEFAULT_SOURCE@ toggle"
 bind-key XF86AudioLowerVolume "pactl set-sink-volume @DEFAULT_SINK@ -5%"
diff --git a/.feeds.txt b/.feeds.txt
index b45ee86..9dac07a 100644
--- a/.feeds.txt
+++ b/.feeds.txt
@@ -1,23 +1,13 @@
 https://geohot.github.io/blog/feed.xml
-https://willhbr.net/feed.xml
 https://til.simonwillison.net/tils/feed.atom
 https://voussoir.net/writing/writing.atom
-https://richiejp.com/atom.xml
 https://world.hey.com/dhh/feed.atom
 https://matduggan.com/rss/
 https://michael.stapelberg.ch/feed.xml
 https://www.duskborn.com/index.xml
-https://mirzapandzo.com/rss.xml
 https://offbeatpursuit.com/blog/index.rss
 https://tomscii.sig7.se/feed.xml
-https://protesilaos.com/master.xml
 https://www.computerenhance.com/feed
 
-https://crawl.develz.org/wordpress/feed
-https://go.dev/blog/feed.atom
-https://github.com/papers-we-love/papers-we-love/commits.atom
-https://github.com/nothings/stb/commits.atom
 https://github.com/srevinsaju/Brave-AppImage/releases.atom
-https://github.com/raysan5/raylib/releases.atom
 https://github.com/X11Libre/xserver/releases.atom
-https://github.com/diasurgical/DevilutionX/releases.atom
diff --git a/.shenanigans.sh b/.shenanigans.sh
index 0236e0e..d49b42d 100755
--- a/.shenanigans.sh
+++ b/.shenanigans.sh
@@ -1,10 +1,10 @@
 # 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 fd
-#   xss-lock wmctrl zip mc htop entr cifs-utils rsync jq rofi st lynx
+#   lm_sensors conky maim xlockmore picom cwm xclip 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 tcc lf
+#   nvtop ctags stow newsboat mpv rsync python3-pipx lazygit
 # Additonal stuff:
 #   go install golang.org/x/tools/gopls@latest
 #   pipx install pyright mdformat
@@ -26,13 +26,12 @@ if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then
         export PS1="\n$SYMBOL \u@\h \t \w \$(git_branch)\n$SYMBOL "
 
         # General aliases.
-        alias l='ls -lh --group-directories-first'
-        alias ll='ls -lha --group-directories-first'
+        alias l='ls -lh --group-directories-first --color=always'
+        alias ll='ls -lha --group-directories-first --color=always'
         alias t='tree -L 2'
         alias ..='cd ..'
         alias less='less -R'
         alias tmux='tmux -u'
-        alias gg='lazygit'
         alias server='python3 -m http.server 6969'
         alias newsboat='newsboat -r -u ~/.feeds.txt'
 
@@ -80,10 +79,6 @@ backup() {
         rm -Rf /tmp/$SNAPSHOT
 }
 
-screenrecord() {
-        ffmpeg -f x11grab -s 3840x2560 -i :0.0 -r 60 -vcodec h264_nvenc -preset fast ~/Videos/$(date +%Y-%m-%d-%H-%M-%S).mp4
-}
-
 mic_status() {
         pactl get-source-mute @DEFAULT_SOURCE@ | grep -q "no" && echo 1 || echo 0;
 }
diff --git a/.vimrc b/.vimrc
index 135cdb4..d7328d0 100644
--- a/.vimrc
+++ b/.vimrc
@@ -3,13 +3,14 @@ filetype plugin on
 
 call plug#begin()
         Plug 'tpope/vim-commentary'
+        Plug 'tpope/vim-fugitive'
         Plug 'mitjafelicijan/sniper.vim'
         Plug 'ctrlpvim/ctrlp.vim'
         Plug 'dense-analysis/ale'
 call plug#end()
 
 set encoding=utf8 spelllang=en_us laststatus=2 tabstop=4 shiftwidth=4
-set number autoindent cursorline ignorecase hlsearch incsearch
+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
 set path+=** wildignore+=tags,*.o,*.a,*.so
@@ -17,16 +18,17 @@ colorscheme wildcharm
 
 nnoremap <C-Right> :bnext<CR>
 nnoremap <C-Left> :bprevious<CR>
-nnoremap <C-q> :CtrlPQuickfix<CR>
+nnoremap <C-q> :copen<CR>
 nnoremap <C-b> :CtrlPBuffer<CR>
 nnoremap <C-k> :ALEHover<CR>
 nnoremap <C-j> :ALEDetail<CR>
 nnoremap <Leader>d :bd<CR>
+nnoremap <leader>t :term<CR>
 nnoremap <Leader>q :nohlsearch<CR>
-nnoremap <Leader>e :ALEPopulateQuickfix<CR>:sleep 100m<CR>:CtrlPQuickfix<CR>
-nnoremap <leader>w :vimgrep /<C-r><C-w>/gj **/*<CR>:CtrlPQuickfix<CR>
+nnoremap <Leader>e :ALEPopulateQuickfix<CR>:sleep 100m<CR>:copen<CR>
+nnoremap <leader>w :vimgrep /<C-r><C-w>/gj **/*<CR>:copenx<CR>
 
-nmap <silent> gr :ALEFindReferences -quickfix<CR>:sleep 100m<CR>:CtrlPQuickfix<CR>
+nmap <silent> gr :ALEFindReferences -quickfix<CR>:sleep 100m<CR>:copen<CR>
 nmap <silent> gd :ALEGoToDefinition<CR>
 nmap <silent> re :ALERename<CR>