Merge branch 'master' into jenipapo

This commit is contained in:
Thomas Ruoff
2017-04-24 09:50:43 +02:00
6 changed files with 172 additions and 241 deletions

View File

@@ -9,13 +9,6 @@ Xft.rgba: rgb
Xft.hinting: true
Xft.hintstyle: hintslight
!-------------------------------------------------------------------------------
! URxvt settings
! Colours lifted from Solarized (http://ethanschoonover.com/solarized)
! More info at:
! http://pod.tst.eu/http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.1.pod
!-------------------------------------------------------------------------------
URxvt*depth: 32
URxvt*geometry: 90x30
URxvt*transparent: false
@@ -28,23 +21,22 @@ URxvt*lineSpace: 0
URxvt*skipBuiltinGlyphs: true
! Fonts
URxvt*font: xft:DejaVu Sans Mono:style=Book:size=10, \
URxvt*font: xft:Fira Mono:style=Regular:size=11, \
xft:Droid Sans Fallback:style=Regular, \
xft:Droid Sans Japanese:style=Regular, \
xft:unifont:style=Medium
URxvt*boldFont: xft:DejaVu Sans Mono:style=Book:size=10, \
URxvt*boldFont: xft:Fira Mono:style=Bold:size=11, \
xft:Droid Sans Fallback:style=Regular, \
xft:Droid Sans Japanese:style=Regular, \
xft:unifont:style=Medium
URxvt*italicFont: xft:DejaVu Sans Mono:style=Book:size=10, \
URxvt*italicFont: xft:Fira Mono:style=Regular:size=11, \
xft:Droid Sans Fallback:style=Regular, \
xft:Droid Sans Japanese:style=Regular, \
xft:unifont:style=Medium
URxvt*boldItalicFont: xft:DejaVu Sans Mono:style=Book:size=10, \
URxvt*boldItalicFont: xft:Fira Mono:style=Bold:size=11, \
xft:Droid Sans Fallback:style=Regular, \
xft:Droid Sans Japanese:style=Regular, \
xft:unifont:style=Medium
! Font size
! Scrollbar
URxvt*scrollStyle: rxvt
@@ -64,15 +56,6 @@ URxvt.keysym.C-Down: perl:font-size:decrease
URxvt.keysym.C-S-Up: perl:font-size:incglobal
URxvt.keysym.C-S-Down: perl:font-size:decglobal
! Cursor
URxvt*cursorBlink: true
URxvt*cursorColor: #657b83
URxvt*cursorUnderline: false
! Pointer
URxvt*pointerBlank: true
! scrollback buffer lines - 65535 is max on most machines (64 is default)
URxvt*saveLines: 65536
@@ -81,104 +64,57 @@ URxvt*saveLines: 65536
! <CTRL>+<PRINT> : current screen and scrollbackbuffer
URxvt*print-pipe: cat > $(echo /tmp/urxvt.dump.$(date +'%Y-%m-%d--%H:%M:%S'))
! Base16 Solarized Dark
! Scheme: Ethan Schoonover (http://ethanschoonover.com/solarized)
! Base16 Gruvbox dark, medium
! Scheme: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
#define base00 #002b36
#define base01 #073642
#define base02 #586e75
#define base03 #657b83
#define base04 #839496
#define base05 #93a1a1
#define base06 #eee8d5
#define base07 #fdf6e3
#define base08 #dc322f
#define base09 #cb4b16
#define base0A #b58900
#define base0B #859900
#define base0C #2aa198
#define base0D #268bd2
#define base0E #6c71c4
#define base0F #d33682
#define base00 #282828
#define base01 #3c3836
#define base02 #504945
#define base03 #665c54
#define base04 #bdae93
#define base05 #d5c4a1
#define base06 #ebdbb2
#define base07 #fbf1c7
#define base08 #fb4934
#define base09 #fe8019
#define base0A #fabd2f
#define base0B #b8bb26
#define base0C #8ec07c
#define base0D #83a598
#define base0E #d3869b
#define base0F #d65d0e
URxvt*foreground: base05
URxvt*background: base00
URxvt*cursorColor: base05
*.foreground: base05
#ifdef background_opacity
*.background: [background_opacity]base00
#else
*.background: base00
#endif
*.cursorColor: base05
URxvt*color0: base00
URxvt*color1: base08
URxvt*color2: base0B
URxvt*color3: base0A
URxvt*color4: base0D
URxvt*color5: base0E
URxvt*color6: base0C
URxvt*color7: base05
*.color0: base00
*.color1: base08
*.color2: base0B
*.color3: base0A
*.color4: base0D
*.color5: base0E
*.color6: base0C
*.color7: base05
URxvt*color8: base03
URxvt*color9: base08
URxvt*color10: base0B
URxvt*color11: base0A
URxvt*color12: base0D
URxvt*color13: base0E
URxvt*color14: base0C
URxvt*color15: base07
*.color8: base03
*.color9: base08
*.color10: base0B
*.color11: base0A
*.color12: base0D
*.color13: base0E
*.color14: base0C
*.color15: base07
! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt),
! use 'shell' template to set these if necessary
URxvt*color16: base09
URxvt*color17: base0F
URxvt*color18: base01
URxvt*color19: base02
URxvt*color20: base04
URxvt*color21: base06
! Base16 Solarized
! Scheme: Ethan Schoonover (http://ethanschoonover.com/solarized)
!
!#define base00 #002b36
!#define base01 #073642
!#define base02 #586e75
!#define base03 #657b83
!#define base04 #839496
!#define base05 #93a1a1
!#define base06 #eee8d5
!#define base07 #fdf6e3
!#define base08 #dc322f
!#define base09 #cb4b16
!#define base0A #b58900
!#define base0B #859900
!#define base0C #2aa198
!#define base0D #268bd2
!#define base0E #6c71c4
!#define base0F #d33682
!
!URxvt*foreground: base02
!URxvt*background: base07
!URxvt*cursorColor: base02
!
!URxvt*color0: base00
!URxvt*color1: base08
!URxvt*color2: base0B
!URxvt*color3: base0A
!URxvt*color4: base0D
!URxvt*color5: base0E
!URxvt*color6: base0C
!URxvt*color7: base05
!
!URxvt*color8: base03
!URxvt*color9: base08
!URxvt*color10: base0B
!URxvt*color11: base0A
!URxvt*color12: base0D
!URxvt*color13: base0E
!URxvt*color14: base0C
!URxvt*color15: base07
!
! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt),
! use 'shell' template to set these if necessary
!URxvt*color16: base09
!URxvt*color17: base0F
!URxvt*color18: base01
!URxvt*color19: base02
!URxvt*color20: base04
!URxvt*color21: base06
*.color16: base09
*.color17: base0F
*.color18: base01
*.color19: base02
*.color20: base04
*.color21: base06

107
tmux.conf
View File

@@ -8,57 +8,45 @@ set -g base-index 1
# colors
set -g default-terminal "screen-256color"
# unicode
setw -g utf8 on
set -g status-utf8 on
# Use vim keybindings in copy mode
setw -g mode-keys vi
# bah, C-B is ugly
unbind C-b
set -g prefix C-a
bind C-a send-prefix
# Use vim keybindings in copy mode
setw -g mode-keys vi
#
# Smart pane switching with awareness of Vim splits.
is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
is_fzf="ps -o state= -o comm= -t '#{pane_tty}' \
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?fzf$'"
bind -n C-h run "($is_vim && tmux send-keys C-h) || \
tmux select-pane -L"
bind -n C-j run "($is_vim && tmux send-keys C-j) || \
($is_fzf && tmux send-keys C-j) || \
tmux select-pane -D"
bind -n C-k run "($is_vim && tmux send-keys C-k) || \
($is_fzf && tmux send-keys C-k) || \
tmux select-pane -U"
bind -n C-l run "($is_vim && tmux send-keys C-l) || \
tmux select-pane -R"
bind-key -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
# Setup 'v' to begin selection as in Vim
bind-key -t vi-copy v begin-selection
bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy"
# Update default binding of `Enter` to also use copy-pipe
unbind -t vi-copy Enter
bind-key -t vi-copy Enter copy-pipe "reattach-to-user-namespace pbcopy"
# splitting panes
bind v split-window -h
bind s split-window -v
# moving between panes
bind h select-pane -L
bind j select-pane -D
bind k select-pane -U
bind l select-pane -R
# Pane resizing
bind -r H resize-pane -L 5
bind -r J resize-pane -D 5
bind -r K resize-pane -U 5
bind -r L resize-pane -R 5
# Smart pane switching with awareness of vim splits
bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)g?(view|n?vim?)(diff)?$' && tmux send-keys C-h) || tmux select-pane -L"
bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)g?(view|n?vim?)(diff)?$' && tmux send-keys C-j) || tmux select-pane -D"
bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)g?(view|n?vim?)(diff)?$' && tmux send-keys C-k) || tmux select-pane -U"
bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)g?(view|n?vim?)(diff)?$' && tmux send-keys C-l) || tmux select-pane -R"
bind -n C-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)g?(view|n?vim?)(diff)?$' && tmux send-keys 'C-\\') || tmux select-pane -l"
# status bar config
set -g status-left "#h:[#S]"
set -g status-left-length 50
set -g status-right-length 50
#set -g status-right "⚡ #(~/bin/tmux-battery) [✉#(~/bin/imap_check.py)] %H:%M %d-%h-%Y"
set -g status-right "%H:%M %d-%h-%Y"
setw -g window-status-current-format "|#I:#W|"
set-window-option -g automatic-rename off
bind | split-window -h
bind - split-window -v
# listen to alerts from all windows
set -g bell-action any
@@ -66,32 +54,29 @@ set -g bell-action any
# mouse support
set -g mouse on
# This tmux statusbar config was created by tmuxline.vim
# on Sun, 15 Feb 2015
set -g status-bg "colour235"
set -g message-command-fg "colour230"
set -g status-justify "left"
set -g status-left-length "100"
# looks
set -g status "on"
set -g pane-active-border-fg "colour33"
set -g message-bg "colour239"
set -g status-right-length "100"
set -g status-right-attr "none"
set -g message-fg "colour230"
set -g message-command-bg "colour239"
set -g status-attr "none"
set -g status-utf8 "on"
set -g pane-border-fg "colour239"
set -g status-left-attr "none"
setw -g window-status-fg "colour245"
set -g pane-active-border-fg "colour248"
set -g pane-border-fg "colour238"
set -g status-bg "colour236"
set -g message-fg "colour237"
set -g message-bg "colour248"
set -g message-command-fg "colour237"
set -g message-command-bg "colour248"
setw -g window-status-fg "colour237"
setw -g window-status-bg "colour214"
setw -g window-status-attr "none"
setw -g window-status-activity-bg "colour235"
setw -g window-status-activity-bg "colour237"
setw -g window-status-activity-attr "none"
setw -g window-status-activity-fg "colour33"
setw -g window-status-activity-fg "colour248"
setw -g window-status-separator ""
setw -g window-status-bg "colour235"
set -g status-left "#[fg=colour230,bg=colour33] #S "
set -g status-right "#[fg=colour245,bg=colour239] %Y-%m-%d %H:%M #[fg=colour235,bg=colour244] #h "
setw -g window-status-format "#[fg=colour245,bg=colour235] #I #[fg=colour245,bg=colour235] #W "
setw -g window-status-current-format "#[fg=colour230,bg=colour239] #I #[fg=colour230,bg=colour239] #W "
set -g status-left "#[fg=colour248,bg=colour241] #S #[fg=colour241,bg=colour237]"
set -g status-right "#[fg=colour239,bg=colour237]#[fg=colour246,bg=colour239] %Y-%m-%d %H:%M #[fg=colour248,bg=colour239]#[fg=colour237,bg=colour248] #h "
setw -g window-status-format "#[fg=colour237,bg=colour239]#[fg=colour223,bg=colour239] #I:#[fg=colour223,bg=colour239] #W #[fg=colour239,bg=colour237]"
setw -g window-status-current-format "#[fg=colour239,bg=colour248]#[fg=colour239,bg=colour214] #I:#[fg=colour239,bg=colour214] #W #[fg=colour214,bg=colour237]"

View File

@@ -1,6 +1,6 @@
"" lightline
let g:lightline = {
\ 'colorscheme': 'solarized',
\ 'colorscheme': 'default',
\ 'active': {
\ 'left': [ [ 'mode', 'paste' ], [ 'fugitive', 'filename' ], ['ctrlpmark'] ],
\ 'right': [ [ 'ale', 'lineinfo' ], ['percent'], [ 'fileformat', 'fileencoding', 'filetype' ] ]

125
vimrc
View File

@@ -1,8 +1,6 @@
" vim: set fenc=utf-8 nu et sts=4 sw=4 ft=vim fdm=marker fmr={{{,}}}:
" vim: set fenc=utf-8 ft=vim fdm=marker fmr={{{,}}}:
" file: ~/.vimrc
" author: Thomas Ruoff (with the help of a myriad others)
scriptencoding utf-8
" author: Thomas Ruoff (with the help of a myriad others)
" Plugins {{{
call plug#begin('~/.vim/plugged')
@@ -17,7 +15,7 @@ Plug 'Raimondi/delimitMate'
Plug 'editorconfig/editorconfig-vim'
Plug 'Valloric/YouCompleteMe', { 'do': './install.sh --tern-completer' }
Plug 'lifepillar/vim-mucomplete'
Plug 'ludovicchabant/vim-gutentags'
@@ -50,65 +48,75 @@ Plug 'junegunn/fzf.vim'
Plug 'sheerun/vim-polyglot'
Plug 'christoomey/vim-tmux-navigator'
call plug#end()
" }}}
" Basics {{{
set encoding=utf-8
set nocompatible " choose no compatibility with legacy vi
filetype plugin indent on " Load filetype plugin/indent files.
syntax on " Enable syntax highlighting.
set nocompatible
filetype plugin indent on
syntax on
set hidden
set ttyfast
set synmaxcol=512 " Limit syntax highlighting to 512 characters per line
set modeline " Use file-specific settings, if available.
set nobackup " Make backup files.
set synmaxcol=512
set modeline
set nobackup
set noswapfile
set mouse=a " Mouse support everywhere.
set mousehide " Auto-hide cursor while typing.
set wildmode=list:longest,full " Make completion more like zsh.
set wildmenu " Turn on command-line completion wild style.
set wildignore+=*.swp,*.bak,*.jpg,*.gif,*.png,*.git,
set ignorecase " Ignore case, except...
set smartcase " ...when search string contains uppercase.
set incsearch " Highlight as you type search phrase.
set hlsearch
set number " Show line numbers.
set report=0 " Tell me when anything is changed via :...
set ruler " Show current positions along bottom.
set scrolloff=5 " Keep 5 lines (top/bottom) for scope.
set showcmd " Show command being typed.
set showmatch " Show matching brackets.
set spell " Highlight misspelled words.
set spellcapcheck= " Don't highlight uncapitalized first word.
set complete+=kspell " Use <C-n> and <C-p> to get suggested spelling completions.
set splitright " Split to the right when executing :vsplit.
let g:netrw_liststyle=3 " Use tree style directory listing.
set background=dark
set mouse=a
set mousehide
set path+=**
set clipboard=unnamed
set wildmode=list:longest,full
set wildmenu
set wildignore+=*.swp,*.bak,*.jpg,*.gif,*.png,*.git,
let g:netrw_liststyle=3
set splitright
set splitbelow
set ignorecase
set smartcase
set incsearch
set hlsearch
set number
set report=0
set scrolloff=5
set showcmd
set showmatch
set spell
set spellcapcheck=
set complete+=kspell
" }}}
" Local .vimrc {{{
set exrc " Enable use of directory-specific .vimrc
set secure " Only run autocommands owned by me
set exrc
set secure
" }}}
" Text Formatting {{{
set list " Show real tabs (so they can be removed).
set list
set listchars=tab:▸\ ,extends:,precedes:,nbsp:␣,trail:-
set linebreak " Don't soft-wrap in the middle of a word.
set showbreak= " Show `…' at the beginning of a soft-broken line.
set tabstop=4 " Real tabs are 4 columns long.
set expandtab " No real tabs (use spaces for tabs).
set softtabstop=4 " Set # of spaces when hitting tab/delete.
set shiftwidth=4 " Set # of softtabs when using cindent, <<, >>, ...
set textwidth=80 " Set max # of characters on each line.
set autoindent " Use indentation level of previous line.
set nojoinspaces " Don't add extra space after ., !, etc. when joining.
set formatoptions+=j " Delete comment character when joining commented lines.
set linebreak
set showbreak=
set tabstop=4
set expandtab
set softtabstop=4
set shiftwidth=4
set textwidth=80
set autoindent
set nojoinspaces
" }}}
" Folding {{{
@@ -118,9 +126,9 @@ set foldlevelstart=10
" Diff settings {{{
set fillchars+=diff:⣿
set diffopt=vertical " Use in vertical diff mode
set diffopt+=filler " blank lines to keep sides aligned
set diffopt+=iwhite " Ignore whitespace changes
set diffopt=vertical
set diffopt+=filler
set diffopt+=iwhite
" }}}
" {{{ Undo
@@ -131,9 +139,13 @@ set undoreload=10000
" }}}
" Visual Setting {{{
"
set background=dark
set cursorline
let base16colorspace=256
colorscheme base16-solarized-dark
if filereadable(expand("~/.vimrc_background"))
let base16colorspace=256
source ~/.vimrc_background
endif
set number
if exists('+relativenumber')
@@ -169,7 +181,10 @@ nnoremap <leader>w :update<cr>
nnoremap <leader><space> :noh<cr>
"" fast window switching
noremap <leader>, <C-W>w
nnoremap <C-J> <C-W><C-J>
nnoremap <C-K> <C-W><C-K>
nnoremap <C-L> <C-W><C-L>
nnoremap <C-H> <C-W><C-H>
"" open next,prev buffer, cycle
noremap <leader>. :bn<cr>
@@ -236,8 +251,10 @@ iab xnow <c-r>=strftime("%Y-%m-%d %H:%M")<cr>
" Plugin Configuration {{{
"" youcompleteme
let g:ycm_autoclose_preview_window_after_insertion = 1
"" mucomplete
set completeopt+=menuone
set shortmess+=c
set completeopt+=noinsert
"" gutentags

View File

@@ -20,10 +20,6 @@ xrdb $HOME/.Xresources
xset +fp /usr/share/fonts/local
xset fp rehash
# sync primary and secondary clipboard
autocutsel -fork &
autocutsel -selection PRIMARY -fork &
echo $1 > ~/.xinitrc-arg

9
zshrc
View File

@@ -50,10 +50,6 @@ alias urlm='uttr --report=lastMonth'
# dead simple todo list
alias todo="mkdir -p ~/todos/\$(date +"%Y"); vim ~/todos/\$(date +"%Y")/todo-\$(date +"%m-%d").md"
# colourscheme
alias dark='zsh ~/.base16-shell/scripts/base16-solarized-dark.sh'
alias light='zsh ~/.base16-shell/scripts/base16-solarized-light.sh'
# colors
autoload -U colors && colors
alias ls='ls --color=tty'
@@ -76,9 +72,10 @@ bindkey ' ' magic-space
# Base16 Shell
BASE16_SHELL=$HOME/.base16-shell/
[ -n "$PS1" ] && dark
[ -n "$PS1" ] && [ -s $BASE16_SHELL/profile_helper.sh ] && eval "$($BASE16_SHELL/profile_helper.sh)"
base16_gruvbox-dark-medium
# fzf
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
# zplug