master
Arne Schauf 8 years ago
parent dfe945cece
commit 332ba73a15
  1. 3
      gitconfig
  2. 18
      qtile_config.py
  3. 47
      vimrc

@ -1,5 +1,5 @@
[user] [user]
email = git@as-webservices.de email = git@asw.io
name = Arne Schauf name = Arne Schauf
[alias] [alias]
ci = commit ci = commit
@ -8,6 +8,7 @@
lv = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat lv = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
lg = log --graph --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative lg = log --graph --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
grep = grep -Ii grep = grep -Ii
diffs = diff --staged
[push] [push]
default = current default = current
[color] [color]

@ -61,21 +61,29 @@ keys = [
# Switch between windows in current stack pane # Switch between windows in current stack pane
Key( Key(
[mod], "k", [mod], "k",
lazy.layout.down() lazy.layout.right()
), ),
Key( Key(
[mod], "j", [mod], "j",
lazy.layout.up() lazy.layout.left()
), ),
# Move windows up or down in current stack # Move windows up or down in current stack
Key( Key(
[mod, "control"], "k", [mod, "control"], "k",
lazy.layout.shuffle_down() lazy.layout.shuffle_left()
), ),
Key( Key(
[mod, "control"], "j", [mod, "control"], "j",
lazy.layout.shuffle_up() lazy.layout.shuffle_right()
),
Key(
[mod, "control"], "h",
lazy.layout.grow_left()
),
Key(
[mod, "control"], "l",
lazy.layout.grow_right()
), ),
# Switch window focus to other pane(s) of stack # Switch window focus to other pane(s) of stack
@ -134,7 +142,7 @@ for i in groups:
) )
layouts = [ layouts = [
layout.tile.Tile(), layout.columns.Columns(border_width=1),
layout.Max(), layout.Max(),
layout.floating.Floating(), layout.floating.Floating(),
] ]

47
vimrc

@ -7,8 +7,6 @@ scriptencoding utf-8
"" filetype plugin and syntax "" filetype plugin and syntax
filetype off filetype off
syntax on
filetype indent plugin on
"" system "" system
set enc=utf-8 set enc=utf-8
@ -83,6 +81,8 @@ autocmd BufNewFile,BufReadPost Dockerfile set filetype=dockerfile
autocmd BufNewFile,BufReadPost *.yml set shiftwidth=2 autocmd BufNewFile,BufReadPost *.yml set shiftwidth=2
autocmd BufNewFile,BufReadPost *.yml set softtabstop=2 autocmd BufNewFile,BufReadPost *.yml set softtabstop=2
autocmd BufNewFile,BufReadPost *.ts set shiftwidth=2
autocmd BufNewFile,BufReadPost *.ts set softtabstop=2
"" Vundle "" Vundle
@ -99,6 +99,8 @@ endif
set rtp+=~/.vim/bundle/vundle/ set rtp+=~/.vim/bundle/vundle/
call vundle#rc() call vundle#rc()
Bundle 'gmarik/vundle' Bundle 'gmarik/vundle'
if iCanHazVundle == 0 if iCanHazVundle == 0
@ -127,7 +129,7 @@ let Tlist_Use_Right_Window=1
let Tlist_GainFocus_On_ToggleOpen = 1 let Tlist_GainFocus_On_ToggleOpen = 1
Bundle 'saltstack/salt-vim' Bundle 'saltstack/salt-vim'
au BufRead,BufNewFile *.sls set filetype=sls " au BufRead,BufNewFile *.sls set filetype=sls
Bundle 'bling/vim-airline' Bundle 'bling/vim-airline'
let g:airline#extensions#tabline#enabled = 1 let g:airline#extensions#tabline#enabled = 1
@ -144,8 +146,15 @@ Bundle 'ivyl/vim-bling'
Bundle 'jmcantrell/vim-virtualenv' Bundle 'jmcantrell/vim-virtualenv'
Bundle 'ervandew/supertab' Bundle 'ervandew/supertab'
" Bundle 'rstacruz/sparkup' " Bundle 'rstacruz/sparkup'
" Bundle 'scrooloose/syntastic' Bundle 'scrooloose/syntastic'
" let g:syntastic_python_flake8_args = "--ignore=E501,W0611,W0401" set statusline+=%#warningmsg#
set statusline+=%{SyntasticStatuslineFlag()}
set statusline+=%*
let g:syntastic_always_populate_loc_list = 1
let g:syntastic_auto_loc_list = 1
let g:syntastic_check_on_open = 1
let g:syntastic_check_on_wq = 0
" Bundle 'vim-scripts/indentpython.vim' " Bundle 'vim-scripts/indentpython.vim'
Bundle 'klen/python-mode' Bundle 'klen/python-mode'
@ -163,9 +172,18 @@ let g:pymode_options_max_line_length = 120
let g:pymode_virtualenv = 1 let g:pymode_virtualenv = 1
" set completeopt=menu " set completeopt=menu
set background=dark Plugin 'flazz/vim-colorschemes'
Bundle 'trevorrjohn/vim-obsidian' Plugin 'felixhummel/setcolors.vim'
colorscheme obsidian colorscheme molokai
set background=light
Plugin 'leafgarland/typescript-vim'
let g:syntastic_typescript_tsc_args = "--experimentalDecorators"
Plugin 'Shougo/vimproc.vim'
Plugin 'Quramy/tsuquyomi'
let g:tsuquyomi_disable_quickfix = 1
let g:syntastic_typescript_checkers = ['tsuquyomi']
Plugin 'othree/html5.vim' Plugin 'othree/html5.vim'
Plugin 'othree/yajs.vim', { 'for': 'html' } Plugin 'othree/yajs.vim', { 'for': 'html' }
@ -173,8 +191,11 @@ Plugin 'othree/javascript-libraries-syntax.vim'
Plugin 'vim-scripts/SyntaxComplete' Plugin 'vim-scripts/SyntaxComplete'
Plugin 'pangloss/vim-javascript' Plugin 'pangloss/vim-javascript'
Plugin 'posva/vim-vue' Plugin 'posva/vim-vue'
au BufNewFile,BufRead *.vue set filetype=html " au BufNewFile,BufRead *.vue set filetype=html
au BufNewFile,BufReadPost *.vue set shiftwidth=2 " au BufNewFile,BufReadPost *.vue set shiftwidth=2
au BufNewFile,BufReadPost *.vue set softtabstop=2 " au BufNewFile,BufReadPost *.vue set softtabstop=2
au BufNewFile,BufReadPost *.js set shiftwidth=2 " au BufNewFile,BufReadPost *.js set shiftwidth=2
au BufNewFile,BufReadPost *.js set softtabstop=2 " au BufNewFile,BufReadPost *.js set softtabstop=2
syntax on
filetype plugin indent on

Loading…
Cancel
Save