commit 6dcaa5f25df9ec36a97b973802f704e431afe4a3
parent efefe6e516389558a92fb83b142e7726003f29f8
Author: Pablo Cárdenas <pablo-cardenas@outlook.com>
Date: Thu, 19 Jul 2018 20:06:05 -0500
Before base16
Diffstat:
13 files changed, 188 insertions(+), 41 deletions(-)
diff --git a/X11/.Xresources b/X11/.Xresources
@@ -1,3 +1,3 @@
-#include ".Xresources.d/themes/gruvbox-light.xresources"
+#include ".Xresources.d/themes/solarized.xresources"
#include ".Xresources.d/rxvt-unicode"
#include ".Xresources.d/fonts"
diff --git a/X11/.Xresources.d/rxvt-unicode b/X11/.Xresources.d/rxvt-unicode
@@ -1,31 +1,13 @@
URxvt*geometry: 80x30
-URxvt*font: xft:xos4 Terminus:pixelsize=12
-URxvt*boldFont: xft:xos4 Terminus:pixelsize=12
+URxvt*font: xft:Fira Mono:book:pixelsize=12;xft:FontAwesome
+URxvt*boldFont: xft:Fira Mono:bold:pixelsize=12;xft:FontAwesome
+!URxvt*font: xft:xos4 Terminus:pixelsize=12
+!URxvt*boldFont: xft:xos4 Terminus:pixelsize=12
URxvt.intensityStyles: false
URxvt.scrollBar: false
URxvt.internalBorder: 0
URxvt.saveLines: 20000
-
-!Total Transparency
-!urxvt.background: black
-!urxvt.foreground: white
-!urxvt.tintColor: white
-!urxvt.fading: 15
-!urxvt.fadeColor: black
-!urxvt.shading: 75
-!urxvt.inheritPixmap: true
-!urxvt.pointerColor: black
-!urxvt.pointerColor2: white
-
-!Fake Transparency
-!urxvt*transparent: true
-!urxvt*shading: 30
-
-!True Transparency
-!URxvt*depth: 32
-!URxvt*background: rgba:2828/2828/2828/C000
-!URxvt*background: rgba:0000/0000/0000/C000
-
+URxvt.cursorBlink: true
! Para clases 480p
!URxvt*font: xft:xos4 Terminus:pixelsize=16:bold
diff --git a/X11/.Xresources.d/themes/solarized.xresources b/X11/.Xresources.d/themes/solarized.xresources
@@ -0,0 +1,68 @@
+! Solarized color scheme for the X Window System
+!
+! http://ethanschoonover.com/solarized
+
+
+! Common
+
+#define S_yellow #b58900
+#define S_orange #cb4b16
+#define S_red #dc322f
+#define S_magenta #d33682
+#define S_violet #6c71c4
+#define S_blue #268bd2
+#define S_cyan #2aa198
+#define S_green #859900
+
+
+! Dark
+
+#define S_base03 #002b36
+#define S_base02 #073642
+#define S_base01 #586e75
+#define S_base00 #657b83
+#define S_base0 #839496
+#define S_base1 #93a1a1
+#define S_base2 #eee8d5
+#define S_base3 #fdf6e3
+
+
+! Light
+
+! #define S_base03 #fdf6e3
+! #define S_base02 #eee8d5
+! #define S_base01 #93a1a1
+! #define S_base00 #839496
+! #define S_base0 #657b83
+! #define S_base1 #586e75
+! #define S_base2 #073642
+! #define S_base3 #002b36
+
+
+URxvt*depth: 32
+URxvt*background: [80]S_base03
+
+*background: S_base03
+*foreground: S_base0
+*fading: 40
+*fadeColor: S_base03
+*cursorColor: S_base1
+*pointerColorBackground: S_base01
+*pointerColorForeground: S_base1
+
+*color0: S_base02
+*color1: S_red
+*color2: S_green
+*color3: S_yellow
+*color4: S_blue
+*color5: S_magenta
+*color6: S_cyan
+*color7: S_base2
+*color9: S_orange
+*color8: S_base03
+*color10: S_base01
+*color11: S_base00
+*color12: S_base0
+*color13: S_violet
+*color14: S_base1
+*color15: S_base3
diff --git a/X11/.Xresources.d/themes/zenburn.xresources b/X11/.Xresources.d/themes/zenburn.xresources
@@ -0,0 +1,23 @@
+URxvt*termName: rxvt-256color
+URxvt*xftAntialias: true
+URxvt*background: #3f3f3f
+URxvt*foreground: #dcdccc
+URxvt*cursorColor: #aaaaaa
+URxvt*colorUL: #366060
+URxvt*underlineColor: #dfaf8f
+URxvt*color0: #3f3f3f
+URxvt*color1: #cc9393
+URxvt*color2: #7f9f7f
+URxvt*color3: #d0bf8f
+URxvt*color4: #6ca0a3
+URxvt*color5: #dc8cc3
+URxvt*color6: #93e0e3
+URxvt*color7: #dcdccc
+URxvt*color8: #000000
+URxvt*color9: #dca3a3
+URxvt*color10: #bfebbf
+URxvt*color11: #f0dfaf
+URxvt*color12: #8cd0d3
+URxvt*color13: #dc8cc3
+URxvt*color14: #93e0e3
+URxvt*color15: #ffffff
diff --git a/X11/.xinitrc b/X11/.xinitrc
@@ -20,8 +20,13 @@ fi
setxkbmap es
[[ -d /usr/share/fonts/terminus ]] && xset +fp /usr/share/fonts/terminus
+command -v compton >/dev/null 2>&1 && compton -b &
+command -v feh >/dev/null 2>&1 && feh --bg-scale $HOME/.wallpaper
+udiskie &
+dunst &
+redshift &
+xset -b
-#command -v compton >/dev/null 2>&1 && compton -b &
session=${1:-i3}
case $session in
diff --git a/bash/.bashrc b/bash/.bashrc
@@ -22,5 +22,7 @@ if [ -x /usr/bin/dircolors ]; then
alias egrep='egrep --color=auto'
fi
+export EDITOR=nvim
+
# Para clases
-#export PS1='\[\033[01;31m\]$\[\033[00m\] '
+#export PS1='\[\033[01;31m\]\W $\[\033[00m\] '
diff --git a/git/.gitconfig b/git/.gitconfig
@@ -1,3 +1,6 @@
[user]
name = Pablo Cárdenas
email = pablo-cardenas@outlook.com
+[alias]
+ lod = log --oneline --decorate
+ unstage = reset HEAD --
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
@@ -2,7 +2,10 @@ set $mod Mod4
# Font for window titles. Will also be used by the bar unless a different font
# is used in the bar {} block below.
-font pango:xos4 Terminus 12px
+font:pango Fira Mono 10
+
+# Start polybar
+exec_always --no-startup-id $HOME/.config/polybar/polybar.sh
# Use Mouse+$mod to drag floating windows to their wanted position
floating_modifier $mod
@@ -14,7 +17,7 @@ bindsym $mod+Return exec i3-sensible-terminal
bindsym $mod+Shift+q kill
# start dmenu (a program launcher)
-bindsym $mod+d exec dmenu_run -i -fn 'xos4 Terminus:pixelsize=12'
+bindsym $mod+d exec dmenu_run -fn 'Fira Mono-10' -nb '#282828' -nf '#ebdbb2' -sb '#98971a' -sf '#282828' -i -p ' RUN '
# change focus
bindsym $mod+j focus left
@@ -127,9 +130,23 @@ bindsym $mod+r mode "resize"
# Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available)
-bar {
- status_command i3status
-}
+#bar {
+# status_command i3status
+# colors {
+# background #002b36
+# statusline #839496
+# separator #586e75
+# focused_workspace #b58900 #b58900 #002b36
+# active_workspace #586e75 #586e75 #002b36
+# inactive_workspace #073642 #002b36 #839496
+# urgent_workspace #dc322f #dc322f #fdf6e3
+# }
+#}
+
+client.focused #002b36 #586e75 #fdf6e3 #268bd2
+client.focused_inactive #002b36 #073642 #839496 #073642
+client.unfocused #002b36 #073642 #839496 #073642
+client.urgent #002b36 #dc322f #fdf6e3 #002b36
#Alsa key bindings
@@ -146,3 +163,9 @@ bindsym XF86AudioPrev exec playerctl previous
#Brightness key bindings
bindsym XF86MonBrightnessUp exec xbacklight -inc 5
bindsym XF86MonBrightnessDown exec xbacklight -dec 5
+
+new_window pixel 2
+new_float pixel 2
+gaps inner 8
+gaps outer 8
+smart_gaps on
diff --git a/latexmk/.latexmkrc b/latexmk/.latexmkrc
@@ -0,0 +1,3 @@
+$pdf_previewer = 'start zathura';
+@generated_exts = (@generated_exts, 'synctex.gz');
+$pdflatex = 'pdflatex -synctex=1 -interaction=nonstopmode';
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
@@ -1,2 +1,35 @@
set -g default-terminal tmux-256color # Use 256 colors
set -g history-limit 100000 # Scrollback buffer number of lines
+
+
+#### COLOUR (Solarized 256)
+
+# default statusbar colors
+set-option -g status-bg colour235 #base02
+set-option -g status-fg colour136 #yellow
+set-option -g status-attr default
+
+# default window title colors
+set-window-option -g window-status-fg colour244 #base0
+set-window-option -g window-status-bg default
+#set-window-option -g window-status-attr dim
+
+# active window title colors
+set-window-option -g window-status-current-fg colour166 #orange
+set-window-option -g window-status-current-bg default
+#set-window-option -g window-status-current-attr bright
+
+# pane border
+set-option -g pane-border-fg colour235 #base02
+set-option -g pane-active-border-fg colour240 #base01
+
+# message text
+set-option -g message-bg colour235 #base02
+set-option -g message-fg colour166 #orange
+
+# pane number display
+set-option -g display-panes-active-colour colour33 #blue
+set-option -g display-panes-colour colour166 #orange
+
+# clock
+set-window-option -g clock-mode-colour colour64 #green
diff --git a/vim/.vim/gvimrc b/vim/.vim/gvimrc
@@ -20,8 +20,8 @@ set columns=120
" Set font. It depends on which operating system I'm using.
if has("win32") || has("win64")
set guifont=Terminus:h12,Consolas:h11,Courier\ New:h10
-elseif has("gui_gtk2")
- set guifont=Terminus\ 12,Monospace\ 10
+elseif has("gui_gtk2") || has("gui_gtk3")
+ set guifont=xos4\ Terminus\ 12,Terminus\ 12,Monospace\ 10
elseif has("x11")
set guifont=-*-terminus-*-*-*-*-12-*-*-*-*-*-*-*
endif
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
@@ -17,8 +17,8 @@ Plug 'editorconfig/editorconfig-vim'
Plug 'scrooloose/nerdtree'
Plug 'ntpeters/vim-better-whitespace'
Plug 'ron89/thesaurus_query.vim'
-Plug 'Valloric/YouCompleteMe'
-Plug 'rdnetto/YCM-Generator'
+"Plug 'Valloric/YouCompleteMe'
+"Plug 'rdnetto/YCM-Generator'
" Language support
Plug 'wlangstroth/vim-racket'
@@ -29,6 +29,7 @@ Plug 'alvan/vim-closetag'
Plug 'rust-lang/rust.vim'
Plug 'racer-rust/vim-racer'
Plug 'lervag/vimtex'
+Plug 'nvie/vim-flake8'
" Colorschemes
Plug 'morhetz/gruvbox'
@@ -51,13 +52,14 @@ set tabstop=8 " spaces for <TAB>
set encoding=utf-8 " always use unicode
set backspace=indent,eol,start " backspace always works on insert mode
set hidden
+set colorcolumn=80
" Some programming languages work better when only 2 spaces padding is used.
autocmd FileType html,css,sass,scss,javascript setlocal sw=2 sts=2
autocmd FileType json setlocal sw=2 sts=2
autocmd FileType ruby,eruby setlocal sw=2 sts=2
autocmd FileType yaml setlocal sw=2 sts=2
-autocmd FileType tex setlocal sw=2 sts=2
+autocmd FileType tex,plaintex setlocal sw=2 sts=2 nocuc cc=66,84,102,126,150
" Required for alvan/vim-closetag
let g:closetag_filenames = "*.html,*.xhtml,*.phtml,*.html.erb,*.xml.erb,*.xml"
@@ -65,8 +67,9 @@ let g:closetag_filenames = "*.html,*.xhtml,*.phtml,*.html.erb,*.xml.erb,*.xml"
" Are we supporting colors?
if &t_Co > 2 || has("gui_running")
syntax on
- set colorcolumn=80
silent! color gruvbox
+else
+ set colorcolumn=0
endif
" Extra fancyness if full pallete is supported.
@@ -85,7 +88,7 @@ set nowrap " don't wrap long lines
set number " show line numbers
set relativenumber " show numbers as relative by default
set showmatch " higlight matching parentheses and brackets
-let mapleader=","
+"let mapleader=","
set spelllang=es_es
"set thesaurus='~/.vim/thesaurus/es_ES.txt'
@@ -94,9 +97,11 @@ let g:tq_openoffice_en_file="/usr/share/myspell/th_en_US_v2"
let g:tq_openoffice_es_file="/usr/share/myspell/th_es_ES_v2"
map <Leader>nt :NERDTreeToggle<CR>
-let NERDTreeQuitOnOpen=1
+"let NERDTreeQuitOnOpen=0
let NERDTreeWinSize=20
+let g:vimtex_view_method = 'zathura'
+
"let g:ycm_server_python_interpreter = 'python2'
"let g:ycm_path_to_python_interpreter = '/usr/bin/python2'
"let g:ycm_python_binary_path = '/usr/bin/python2'
@@ -105,7 +110,7 @@ let NERDTreeWinSize=20
"let g:ycm_seed_identifiers_with_syntax = 1 " Completion for programming language's keyword
"let g:ycm_complete_in_comments = 1 " Completion in comments
"let g:ycm_complete_in_strings = 1 " Completion in string
-let g:ycm_auto_trigger = 0
+"let g:ycm_auto_trigger = 0
"" Para clases
"set nocuc
@@ -117,4 +122,3 @@ let g:ycm_auto_trigger = 0
"set sts=2
"set sw=2
"set mouse=a
-"set mouse=a
diff --git a/zathura/.config/zathura/zathurarc b/zathura/.config/zathura/zathurarc
@@ -0,0 +1 @@
+set selection-clipboard clipboard
