This commit is contained in:
2015-10-02 04:00:34 +02:00
parent 5588f08075
commit 56f2017437
4 changed files with 23 additions and 8 deletions

View File

@@ -21,7 +21,7 @@
logl = log --graph --decorate --pretty=oneline --abbrev-commit --all logl = log --graph --decorate --pretty=oneline --abbrev-commit --all
pushall = "!sh -c 'for r in $(git remote) ; do echo \"[$r] \" ; git push $r $1; done' -" pushall = "!sh -c 'for r in $(git remote) ; do echo \"--- [$r] ---\" ; git push $r $1; done' -"
[core] [core]
editor = vim editor = vim

View File

@@ -375,4 +375,3 @@ bar {
i3bar_command i3bar i3bar_command i3bar
status_command bash ~/.i3/scripts/i3bar_wrapper.bash ~/.i3/scripts/statusbar.conkyrc status_command bash ~/.i3/scripts/i3bar_wrapper.bash ~/.i3/scripts/statusbar.conkyrc
} }

View File

@@ -22,6 +22,8 @@ Plugin 'tpope/vim-commentary'
Plugin 'tpope/vim-fugitive' Plugin 'tpope/vim-fugitive'
Plugin 'tpope/vim-speeddating' Plugin 'tpope/vim-speeddating'
Plugin 'tpope/vim-surround' Plugin 'tpope/vim-surround'
Plugin 'junegunn/goyo.vim'
Plugin 'junegunn/limelight.vim'
"Plugin 'Lokaltog/vim-easymotion' "Plugin 'Lokaltog/vim-easymotion'
"Plugin 'PeterRincker/vim-argumentative' "Plugin 'PeterRincker/vim-argumentative'
@@ -64,7 +66,7 @@ set number
set wildmode=list:longest set wildmode=list:longest
set lazyredraw set lazyredraw
set wildmenu set wildmenu
set showmatch set noshowmatch
set colorcolumn=80 set colorcolumn=80
set laststatus=2 set laststatus=2
set matchtime=5 set matchtime=5
@@ -136,6 +138,7 @@ set ttimeout
set timeoutlen=1000 set timeoutlen=1000
set ttimeoutlen=0 set ttimeoutlen=0
set virtualedit=block set virtualedit=block
set whichwrap=b,s
" == line breaking == " == line breaking ==
set linebreak set linebreak
@@ -182,6 +185,7 @@ nnoremap <leader>v <C-w>v<C-w>l
nnoremap <leader>u :GundoToggle<CR> nnoremap <leader>u :GundoToggle<CR>
nmap <leader>w :Goyo<CR>:TogglePencil<CR>:Limelight!!<CR>
" no more ex mode " no more ex mode
nnoremap Q <nop> nnoremap Q <nop>
@@ -229,6 +233,16 @@ let g:airline#extensions#whitespace#enabled = 1
let g:airline#extensions#whitespace#symbol = '' let g:airline#extensions#whitespace#symbol = ''
let g:airline#extensions#whitespace#checks = ['trailing'] let g:airline#extensions#whitespace#checks = ['trailing']
" == pencil ==
let g:pencil#textwidth = 80
let g:pencil#autoformat = 1
let g:pencil#cursorwrap = 1
" == goyo ==
let g:goyo_width = 80
let g:goyo_height = "90%"
let g:goyo_linenr = 0
" === functions === " === functions ===
function! DeleteTrailingWS() function! DeleteTrailingWS()
exe "normal mz" exe "normal mz"

View File

@@ -152,6 +152,8 @@ alias cat="cat -v"
alias vimrc="vim -c ':e \$MYVIMRC'" alias vimrc="vim -c ':e \$MYVIMRC'"
alias zshrc="vim -c ':e ~/.zshrc'" alias zshrc="vim -c ':e ~/.zshrc'"
alias vim="nvim"
# rebase the current branch onto WTF ARE YOU DOING YOU ARE DRUNNK TO GO BED # rebase the current branch onto WTF ARE YOU DOING YOU ARE DRUNNK TO GO BED
##alias rebase="git rebase -i $(git branch --contains HEAD | grep -v '\*.*' | head -1)" ##alias rebase="git rebase -i $(git branch --contains HEAD | grep -v '\*.*' | head -1)"