1 files changed, 43 insertions, 14 deletions

diff --git a/.vim/vimrc b/.vim/vimrc
index 7abab94..2f5d820 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -1,9 +1,7 @@
-" All system-wide defaults are set in $VIMRUNTIME/debian.vim and sourced by
-" the call to :runtime you can find below.  If you wish to change any of those
-" settings, you should do it in this file (/etc/vim/vimrc), since debian.vim
+" All system-wide defaults are set in $VIMRUNTIME/debian.vim and sourced by 
+" the call to :runtime you can find below.  If you wish to change any of those " settings, you should do it in this file (/etc/vim/vimrc), since debian.vim
 " will be overwritten everytime an upgrade of the vim packages is performed.
-" It is recommended to make changes after sourcing debian.vim since it alters
-" the value of the 'compatible' option.
+" It is recommended to make changes after sourcing debian.vim since it alters " the value of the 'compatible' option.
 
 " This line should not be removed as it ensures that various options are
 " properly set to work with the Vim-related packages available in Debian.
@@ -30,7 +28,7 @@ set background=dark
 
 " Uncomment the following to have Vim jump to the last position when
 " reopening a file
-"au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
+au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
 
 " Uncomment the following to have Vim load indentation rules and plugins
 " according to the detected filetype.
@@ -51,7 +49,13 @@ set number			" Enable line numbers
 set relativenumber      " Enable line numbers to be displayed relative to current position
 set tabstop=4           " Set default tab size to 4 spaces
 set autoindent          " Keep current tab depth on new line
-colorscheme slate
+
+" Colors
+let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+" set termguicolors
+colorscheme gruvbox
+" hi Normal ctermbg=NONE cterm=NONE
 
 " Document compilation
 map <leader>c :!compile % <CR><CR> 
@@ -62,13 +66,13 @@ map <leader>s :setlocal spell! spelllang=en_us<CR>
 " Disable auto comment continuation
 autocmd filetype * set formatoptions-=cro
 
-
 " C mappings
 autocmd filetype c inoremap ;c /*  */<Left><Left><Left>
 autocmd filetype c inoremap ;p printf(" \n");<Esc>5hi
 
 " Python mappings
-autocmd filetype python noremap <C-m> i<Return><Return><Return>def main():<Return>pass<Return><Return><Return>if __name__ == '__main__':<Return>main()<Esc>gg
+" autocmd filetype python noremap <C-m> ggI#!/usr/bin/env python3<Return><Return>def main():<Return>pass<Return><Return><Return>if __name__ == '__main__':<Return>main()<Esc>ggji
+let g:autopep8_on_save = 1
 
 " Java 'IDE' remappings
 autocmd filetype java inoremap [p System.out.println();<Left><Left>
@@ -80,6 +84,21 @@ autocmd filetype nroff inoremap ;c .\"
 autocmd filetype nroff inoremap ;b \*[BOLDER]'\*[BOLDERX] <Esc>F'cl
 autocmd filetype nroff inoremap ;h .HEADING 
 
+" HTML Mappings
+autocmd filetype html inoremap ;; <Esc>/<++><Enter>"_c4l
+autocmd filetype html inoremap ;1 <h1></h1><Enter><++><Esc>FhT>i
+autocmd filetype html inoremap ;2 <h2>`</h2><Enter><++><Esc>k$F`"_cl
+autocmd filetype html inoremap ;3 <h3>`</h3><Enter><++><Esc>k$F`"_cl
+autocmd filetype html inoremap ;b <strong></strong> <++><Esc>F<F<i
+autocmd filetype html inoremap ;i <em></em> <++><Esc>F<F<i
+autocmd filetype html inoremap ;l <li></li> <++><Esc>F<F<i
+autocmd filetype html inoremap ;u <ul>`</ul><Enter><Enter><++><Esc>2k$F`"_cl
+autocmd filetype html inoremap ;p <p>`</p><Enter><Enter><++><Esc>2k$F`"_cl
+autocmd filetype html inoremap ;c <pre><code>`</code></pre><Enter><Enter><++><Esc>2k$F`"_cl
+
+" XML (for RSS)
+autocmd filetype xml inoremap ;i <item><Enter><title></title><Enter><guid></guid><Enter><link></link><Enter><pubDate></pubDate><Enter><description><![CDATA[]]></description><Enter></item><Esc>k$F[a
+
 " Restart sxhkd when config file is changed
 autocmd BufWritePost *sxhkdrc !pkill -SIGUSR1 sxhkd
 
@@ -95,10 +114,20 @@ autocmd BufWritePost ~/.config/x11/xresources !xrdb ~/.config/x11/xresources
 " Reload dunst after editing configuration file
 autocmd BufWritePost ~/.config/dunst/dunstrc !pkill dunst; setsid -f dunst
 
-"set completeopt =menuone,longest
+autocmd BufWritePost ~/.config/picom/picom.conf !pkill -SIGUSR1 picom
+
+autocmd BufWritePost ~/.local/bin/bar !pkill bar; setsid -f ~/.local/bin/bar
+
+set completeopt =menuone,longest
+
+" Start NERDTree and put the cursor back in the other window.
+autocmd VimEnter * NERDTree | wincmd p
+
+" Show hidden files in NERDTree
+let NERDTreeShowHidden=1
 
-" Source a global configuration file if available
-if filereadable("/etc/vim/vimrc.local")
-  source /etc/vim/vimrc.local
-endif
+" Exit Vim if NERDTree is the only window remaining in the only tab.
+autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif
 
+" Open the existing NERDTree on each new tab.
+autocmd BufWinEnter * if getcmdwintype() == '' | silent NERDTreeMirror | endif