4 files changed, 36 insertions, 15 deletions

diff --git a/alacritty.yml b/alacritty.yml
index 5340f2d..4100a4a 100644
--- a/alacritty.yml
+++ b/alacritty.yml
@@ -17,4 +17,4 @@ font:
 
 colors:
   primary:
-    background: "#151515"
+    background: "#131313"
diff --git a/shenanigans.sh b/shenanigans.sh
index 34b8ea7..32bec7a 100755
--- a/shenanigans.sh
+++ b/shenanigans.sh
@@ -1,6 +1,5 @@
 # Software list.
-# cifs-utils tree s3cmd xclip mc gnupg ripgrep jq xmlstarlet fzf
-# htop nvtop newsboat tmux
+# cifs-utils tree s3cmd xclip mc gnupg ripgrep jq xmlstarlet fzf htop nvtop newsboat tmux
 
 # Magical environment variables.
 
diff --git a/tmux.conf b/tmux.conf
index 23c8d9b..56d0cb3 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -20,9 +20,9 @@ set -g status-bg '#480b8e'
 set -g status-fg '#ffffff'
 
 # Set inactive/active window styles.
-set -g window-status-current-format "#[fg=#ffffff]#[bg=#151515]#[fg=#ffffff]#[bg=#151515] #I:#W #[fg=#ffffff]#[bg=#151515]"
+set -g window-status-current-format "#[fg=#ffffff]#[bg=#131313]#[fg=#ffffff]#[bg=#131313] #I:#W #[fg=#ffffff]#[bg=#131313]"
 set -g window-style 'bg=#222222'
-set -g window-active-style 'bg=#151515'
+set -g window-active-style 'bg=#131313'
 
 # Other settings
 set-option -sg escape-time 10
diff --git a/vimrc b/vimrc
index c9b8838..6e593ca 100644
--- a/vimrc
+++ b/vimrc
@@ -1,9 +1,4 @@
-" https://vimhelp.org/options.txt.html
-
 set nocompatible
-syntax enable
-
-" Sane defaults.
 set path+=**
 set relativenumber
 set smartcase
@@ -20,13 +15,40 @@ set backspace=2
 set scrolloff=4
 set spelllang=en_us
 set laststatus=2
+set shiftwidth=4
+set tabstop=4
+
+filetype plugin on
+filetype indent on
+
+syntax enable
 
-" Buffer navigation remaps.
 nnoremap <C-]> :bnext<cr>
 nnoremap <C-[> :bprevious<cr>
+nnoremap <C-b> :buffers<cr>:buffer 
+nnoremap <C-p> :Explore<cr>
+nnoremap <C-l> :Lex<cr>
+
+" Commenting blocks of code.
+augroup commenting_blocks_of_code
+        autocmd!
+        autocmd FileType c,cpp,go,scala   let b:comment_leader = '// '
+        autocmd FileType sh,ruby,python   let b:comment_leader = '# '
+        autocmd FileType conf,fstab       let b:comment_leader = '# '
+        autocmd FileType lua              let b:comment_leader = '-- '
+        autocmd FileType vim              let b:comment_leader = '" '
+augroup END
+noremap <silent> gcc :<C-B>silent <C-E>s/^/<C-R>=escape(b:comment_leader,'\/')<CR>/<CR>:nohlsearch<CR>
+noremap <silent> gcu :<C-B>silent <C-E>s/^\V<C-R>=escape(b:comment_leader,'\/')<CR>//e<CR>:nohlsearch<CR>
 
-" Language specific indentation.
-filetype plugin indent on
-autocmd Filetype make,go,sh setlocal noexpandtab tabstop=4 shiftwidth=4
-autocmd Filetype c,cpp,html,javascript,css,python setlocal expandtab tabstop=2 shiftwidth=2
+" Go autoformat.
+function! GoFmt()
+        let file = expand('%')
+        silent execute "!gofmt -w " . file
+        edit!
+endfunction
+command! GoFmt call GoFmt()
+augroup go_autocmd
+        autocmd BufWritePost *.go GoFmt
+augroup END