sáb dic 8 18:26:43 CET 2018

3 files changed, 92 insertions, 91 deletions

diff --git a/files/rcs/.Xresources b/files/rcs/.Xresources
index 0602423..37996ce 100644
--- a/files/rcs/.Xresources
+++ b/files/rcs/.Xresources
@@ -9,56 +9,33 @@
 !*cursor:			#a8a19f
 !*background:		#1b1918
 
-! black
-!black
+! Light
 *color0: #000000
-!jet
-*color8: #343434
-! red
-!Red (NCS)
-*color1: #c40233
-!Red (Munsell)
-*color9: #f2003c
-! green
-!Shamrock
-*color2: #009e60
-!Spring green
-*color10: #00ff7f
-! yellow
-!Yellow (Munsell)
-*color3: #efcc00
-!Aureolin
-*color11: #fdee00
-! blue
-!Indigo
-*color4: #3f00ff
-!Electric Indigo
-*color12: #6f00ff
-! magenta
-!Magenta dye
-*color5: #ca1f7b
-!Hollywood cerise
-*color13: #f400a1
-! cyan
-!Baby blue
-*color6: #89cff0
-!Cyan
-*color14: #00ffff
-! white
-!silver
-*color7: #c0c0c0
-!white
-*color15: #ffffff
+*color8: #242424
+*color1: #d1375d
+*color9: #ff4e7a
+*color2: #6da48e
+*color10: #bceebc
+*color3: #fff04b
+*color11: #ffff7d
+*color4: #696eff
+*color12: #a5acff
+*color5: #e45eff
+*color13: #eb87ff
+*color6: #00ffff
+*color14: #89cff0
+*color7: #b2ffe5
+*color15: #cdfffc
 
 ! [<n>] is opacity %
 URxvt.background:	Black
 URxvt.foreground:	#b2ffe5
 URxvt.scrollBar:	false
-URxvt.cursorColor:	#3f00ff
+URxvt.cursorColor:	#b2ffe5
 !URxvt.title:		urxvt
 URxvt.fading:		20
 URxvt.transparent:	true
-URxvt.shading:		20
+URxvt.shading:		15
 !URxvt.visualBell:	true ! Visual signal when bell character processed
 
 URxvt.font:		xft:monospace:size=10
diff --git a/files/rcs/.bash_aliases b/files/rcs/.bash_aliases
index e49b2b2..b5aaa03 100644
--- a/files/rcs/.bash_aliases
+++ b/files/rcs/.bash_aliases
@@ -8,12 +8,15 @@ alias cb="vim ~/.bashrc"
 alias cba="vim ~/.bash_aliases"
 alias cx="vim ~/.Xresources"
 alias ci3="vim ~/.config/i3/config"
+alias ci3b="vim ~/.i3status.conf"
 alias cv="vim ~/.vimrc"
 alias cqb="vim ~/.config/qutebrowser/config.py"
 alias cr="vim ~/.config/ranger/rc.conf"
 alias crifle="vim ~/.config/ranger/rifle.conf"
 alias ccmus="vim ~/.config/cmus/autosave"
 alias cg="vim ~/.gitconfig"
+alias cnb="vim ~/.newsboat/config"
+alias cnbu="vim ~/.newsboat/urls"
 
 alias ydlmp3="youtube-dl -x --audio-format mp3"
 
diff --git a/files/rcs/.vimrc b/files/rcs/.vimrc
index 13fff72..2ab3be9 100644
--- a/files/rcs/.vimrc
+++ b/files/rcs/.vimrc
@@ -1,12 +1,23 @@
-" From "How to Install, Use and Extend LaTeX" https://youtu.be/NwnYHoNtfJ0
-execute pathogen#infect()
-filetype plugin indent on
-
+"       _
+"__   _(_)_ __ ___  _ __ ___
+"\ \ / / | '_ ` _ \| '__/ __|
+" \ V /| | | | | | | | | (__
+"  \_/ |_|_| |_| |_|_|  \___|
+"
 " Inspired by https://github.com/LukeSmithxyz/voidrice/blob/master/.vimrc
+
+let mapleader = ","
+call plug#begin('~/.vim/plugged')
+Plug 'junegunn/goyo.vim'
+Plug 'PotatoesMaster/i3-vim-syntax'
+call plug#end()
+
 set nocompatible
+filetype plugin indent on
 set encoding=utf-8
-set number
-set relativenumber
+set number relativenumber
+set scrolloff=3
+set wildmode=longest,list,full
 set splitbelow
 set splitright
 
@@ -15,6 +26,10 @@ map <C-h> <C-w>h
 map <C-j> <C-w>j
 map <C-k> <C-w>k
 map <C-l> <C-w>l
+"map <C-H> <C-w>H
+"map <C-J> <C-w>J
+"map <C-K> <C-w>K
+"map <C-L> <C-w>L
 
 " Make tabs appear as 4 spaces (default is 8)
 set tabstop=4
@@ -24,71 +39,77 @@ set tabstop=4
 syntax enable
 syntax on
 
+"Clean trailing whitespaces on save
+autocmd BufWritePre * %s/\s\+$//e
+
 " Autoupdate ~/.Xresources
 autocmd BufWritePost ~/.Xresources !xrdb %
 
 """ Remaps """
 inoremap Y y$
-inoremap ,, <Esc>/<++><Enter>cf>
-inoremap ,e <Esc>
-inoremap ,w <Esc>:w<Enter>
-inoremap ,d <Esc>ddA
-nnoremap ,p "+p
-vnoremap ,y "+y
-vnoremap ,d "+d
+inoremap <leader><leader> <Esc>/<++><Enter>cf>
+inoremap <leader>e <Esc>
+inoremap <leader>w <Esc>:w<Enter>
+inoremap <leader>d <Esc>ddA
+nnoremap <leader>p "+p
+vnoremap <leader>y "+y
+vnoremap <leader>d "+d
+
+map <leader>g :Goyo \| set linebreak<CR>
+map <leader>s :!clear && shellcheck %<CR>
 
 "" html
 
 " Layout elements
-inoremap ,hheader <header><Enter><Enter></header><Enter><++><Esc>kki
-inoremap ,hnav <nav><Enter><Enter></nav><Enter><++><Esc>kki
-inoremap ,hsection <section><Enter><Enter></section><Enter><++><Esc>kki
-inoremap ,harticle <article><Enter><Enter></article><Enter><++><Esc>kki
-inoremap ,hfooter <footer><Enter><Enter></footer><Enter><++><Esc>kki
-inoremap ,haside <aside><Enter><Enter></aside><Enter><++><Esc>kki
-inoremap ,hdiv <div class=""><Enter><++><Enter></div><Enter><++><Esc>?""<Enter>a
+inoremap <leader>hheader <header><Enter><Enter></header><Enter><++><Esc>kki
+inoremap <leader>hnav <nav><Enter><Enter></nav><Enter><++><Esc>kki
+inoremap <leader>hsection <section><Enter><Enter></section><Enter><++><Esc>kki
+inoremap <leader>harticle <article><Enter><Enter></article><Enter><++><Esc>kki
+inoremap <leader>hfooter <footer><Enter><Enter></footer><Enter><++><Esc>kki
+inoremap <leader>haside <aside><Enter><Enter></aside><Enter><++><Esc>kki
+inoremap <leader>hdiv <div class=""><Enter><++><Enter></div><Enter><++><Esc>?""<Enter>a
 
 " Headers and paragraphs
-inoremap ,hh1 <h1></h1><Enter><++><Esc>?</h1><Enter>i
-inoremap ,hh2 <h2></h2><Enter><++><Esc>?</h2><Enter>i
-inoremap ,hh3 <h3></h3><Enter><++><Esc>?</h3><Enter>i
-inoremap ,hh4 <h4></h4><Enter><++><Esc>?</h4><Enter>i
-inoremap ,hh5 <h5></h5><Enter><++><Esc>?</h5><Enter>i
-inoremap ,hh6 <h6></h6><Enter><++><Esc>?</h6><Enter>i
-inoremap ,hp <p></p><Enter><++><Esc>?</p><Enter>i
+inoremap <leader>hh1 <h1></h1><Enter><++><Esc>?</h1><Enter>i
+inoremap <leader>hh2 <h2></h2><Enter><++><Esc>?</h2><Enter>i
+inoremap <leader>hh3 <h3></h3><Enter><++><Esc>?</h3><Enter>i
+inoremap <leader>hh4 <h4></h4><Enter><++><Esc>?</h4><Enter>i
+inoremap <leader>hh5 <h5></h5><Enter><++><Esc>?</h5><Enter>i
+inoremap <leader>hh6 <h6></h6><Enter><++><Esc>?</h6><Enter>i
+inoremap <leader>hp <p></p><Enter><++><Esc>?</p><Enter>i
 
 " Text formatting
-inoremap ,hb <b></b><++><Esc>?</b><Enter>i
-inoremap ,hi <i></i><++><Esc>?</i><Enter>i
-inoremap ,hem <em></em><++><Esc>?</em><Enter>i
-inoremap ,hcode <code></code><++><Esc>?</code><Enter>i
-inoremap ,hsub <sub></sub><++><Esc>?</sub><Enter>i
-inoremap ,hsup <sup></sup><++><Esc>?</sup><Enter>i
-inoremap ,hcite <cite></cite><++><Esc>?</cite><Enter>i
+inoremap <leader>hb <b></b><++><Esc>?</b><Enter>i
+inoremap <leader>hi <i></i><++><Esc>?</i><Enter>i
+inoremap <leader>hem <em></em><++><Esc>?</em><Enter>i
+inoremap <leader>hcode <code></code><++><Esc>?</code><Enter>i
+inoremap <leader>hsub <sub></sub><++><Esc>?</sub><Enter>i
+inoremap <leader>hsup <sup></sup><++><Esc>?</sup><Enter>i
+inoremap <leader>hcite <cite></cite><++><Esc>?</cite><Enter>i
 
 " Tables
-inoremap ,htable <table border=""><Enter><caption><++></caption><Enter><thead><Enter><tr><Enter><++><Enter></tr><Enter></thead><Enter><tbody><Enter><++><Enter></tbody><Enter></table><Enter><++><Esc>?""<Enter>a
-inoremap ,htr <tr><Enter><Enter></tr><Enter><++><Esc>kki
-inoremap ,hth <th></th><Enter><++><Esc>?</<Enter>i
-inoremap ,htd <td></td><Enter><++><Esc>?</<Enter>i
+inoremap <leader>htable <table border=""><Enter><caption><++></caption><Enter><thead><Enter><tr><Enter><++><Enter></tr><Enter></thead><Enter><tbody><Enter><++><Enter></tbody><Enter></table><Enter><++><Esc>?""<Enter>a
+inoremap <leader>htr <tr><Enter><Enter></tr><Enter><++><Esc>kki
+inoremap <leader>hth <th></th><Enter><++><Esc>?</<Enter>i
+inoremap <leader>htd <td></td><Enter><++><Esc>?</<Enter>i
 
 " Lists
-inoremap ,hul <ul><Enter><li></li><Enter><++><Enter></ul><Enter><++><Esc>?</l<Enter>i
-inoremap ,hol <ol><Enter><li></li><Enter><++><Enter></ol><Enter><++><Esc>?</l<Enter>i
-inoremap ,hli <li></li><Enter><++><Esc>?</<Enter>i
+inoremap <leader>hul <ul><Enter><li></li><Enter><++><Enter></ul><Enter><++><Esc>?</l<Enter>i
+inoremap <leader>hol <ol><Enter><li></li><Enter><++><Enter></ol><Enter><++><Esc>?</l<Enter>i
+inoremap <leader>hli <li></li><Enter><++><Esc>?</<Enter>i
 
 " Forms
-inoremap ,hform <form><Enter><fieldset><Enter><Enter></fieldset><Enter></form><Enter><++><Esc>3ki
-inoremap ,hfs <fieldset><Enter><Enter></fieldset><Enter><++><Esc>kki
-inoremap ,hlegend <legend></legend><Enter><++><Esc>?</<Enter>i
-inoremap ,hlabel <label><input type="<++>"></label><Enter><++><Esc>?<i<Enter>i
+inoremap <leader>hform <form><Enter><fieldset><Enter><Enter></fieldset><Enter></form><Enter><++><Esc>3ki
+inoremap <leader>hfs <fieldset><Enter><Enter></fieldset><Enter><++><Esc>kki
+inoremap <leader>hlegend <legend></legend><Enter><++><Esc>?</<Enter>i
+inoremap <leader>hlabel <label><input type="<++>"></label><Enter><++><Esc>?<i<Enter>i
 
 " Media
-inoremap ,ha <a href=""><++></a><Enter><++><Esc>?""<Enter>a
-inoremap ,himg <img src="" alt="<++>"><Enter><++><Esc>?""<Enter>a
+inoremap <leader>ha <a href=""><++></a><Enter><++><Esc>?""<Enter>a
+inoremap <leader>himg <img src="" alt="<++>"><Enter><++><Esc>?""<Enter>a
 
 " Misc
 " Comment a line
-nnoremap ,hc I<!-- <Esc>A --><Esc>0
-" Uncomment a line
-nnoremap ,hC 05x/--><Enter>3x0
+nnoremap <leader>hc I<!-- <Esc>A --><Esc>0
+" Uncomme<leader>t a line
+nnoremap <leader>hC 05x/--><Enter>3x0