diff --git a/bin/extremedownload.py b/bin/extremedownload.py index 4427e90..2213bf3 100755 --- a/bin/extremedownload.py +++ b/bin/extremedownload.py @@ -9,7 +9,7 @@ import urllib.request def get_page(url): f = urllib.request.urlopen(url) - return f.readall().decode("utf-8") + return f.read().decode("utf-8") def retrieve(url, filename): urllib.request.urlretrieve(url, filename) @@ -22,7 +22,7 @@ def api_call(method, extreme_env): authtoken = extreme_env["API_AUTH"] request = urllib.request.Request(url, headers={"X-API-Auth": authtoken}) f = urllib.request.urlopen(request) - return json.loads(f.readall().decode("utf-8")) + return json.loads(f.read().decode("utf-8")) def get_extreme_env(url): page = get_page(url) diff --git a/bin/volume.sh b/bin/volume.sh index 348014b..918c11f 100755 --- a/bin/volume.sh +++ b/bin/volume.sh @@ -1,6 +1,6 @@ #!/bin/bash -CARD=$(aplay -l|sed -n 's/^Karte \([0-9]\+\): .*G930.*$/\1/p') +CARD=$(LANG=en_US aplay -l|sed -n 's/^\(Karte\|card\) \([0-9]\+\): .*G930.*$/\2/p') CH="PCM" if [ $# -eq 0 ] ; then diff --git a/i3/config b/i3/config index 962621a..5d1bcc1 100644 --- a/i3/config +++ b/i3/config @@ -196,7 +196,7 @@ bindsym $mod+r mode "resize" bar { status_command i3blocks i3bar_command /usr/bin/i3bar-icons - tray_output LVDS1 + tray_output DVI-0 } bindsym $mod+Shift+g mode "$mode_gaps" diff --git a/vim/plug.vim b/vim/plug.vim index 7bde328..7075a49 100644 --- a/vim/plug.vim +++ b/vim/plug.vim @@ -13,6 +13,8 @@ call plug#begin('~/.vim/plugged') " color Plug 'thomasba/wombat256.vim' +Plug 'altercation/vim-colors-solarized' +Plug 'baeuml/summerfruit256.vim' " filetype @@ -40,7 +42,8 @@ endif " Utility Plug 'Shougo/neocomplete.vim' Plug 'tpope/vim-speeddating' -Plug 'bling/vim-airline' +Plug 'vim-airline/vim-airline' +Plug 'vim-airline/vim-airline-themes' Plug 'vim-scripts/Tagbar' Plug 'vim-scripts/loremipsum', { 'on': 'Loremipsum' } Plug 'vim-scripts/LanguageTool', {'on': 'LanguageToolCheck'} diff --git a/vim/vimrc b/vim/vimrc index da1a77d..726f8d3 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -1,32 +1,38 @@ -" load plugins using vundle +" vim: set fdm=marker fdc=3 : +" load plugins using vundle {{{ if has("win32") source ~/vimfiles/plug.vim else source ~/.vim/plug.vim endif - -syntax on -filetype plugin indent on - - -" delete always on backspace -set backspace=indent,eol,start - -" set colorscheme -if &term =~# '^\(screen\|xterm\)$' +" }}} +" set colorscheme {{{ +if &term =~# '^\(screen\|xterm\)' set t_Co=256 + let g:solarized_termcolors=256 endif if (&t_Co >= 255 && &term !~ '^linux$') || has("gui_running") colorscheme wombat256_thomasba else colorscheme elflord2 endif - -if has("gui_running") +" }}} +" GUI settings {{{ +if has('gui_running') + " Make shift-insert work like in Xterm + map + map! set guifont="Monospace 10" + " Nooo, dont blink!! + set guicursor=a:blinkon0 endif - +" }}} +" editor settings {{{ +syntax on +filetype plugin indent on +" delete always on backspace +set backspace=indent,eol,start set hidden set number set numberwidth=4 @@ -51,39 +57,38 @@ set ttyfast set hlsearch set spelllang=de_de,en set copyindent - -" move by screen lines, not by real lines - great for creative writing +" }}} +" move by screen lines, not by real lines - great for creative writing {{{ nnoremap j gj nnoremap k gk nnoremap gk nnoremap gj - " also in visual mode vnoremap j gj vnoremap k gk vnoremap gk vnoremap gj - -nnoremap , : - +" }}} +" fileencoding {{{ set encoding=utf-8 set fileencodings=ucs-bom,utf-8,latin,windows-1252 - +" }}} +" TOhtml settings {{{ let g:html_prevent_copy = "fn" let html_use_xhtml=1 let html_use_css=1 - -" slightly highlight rows and columns +" }}} +" slightly highlight rows and columns {{{ "set cursorline "set cursorcolumn - -" mail +" }}} +" mail {{{ augroup mail autocmd! - autocmd FileType mail set textwidth=70 wrap fo=tcrq + autocmd FileType mail set textwidth=70 wrap fo=tcrq augroup END - -" auto completion and menu +" }}} +" auto completion and menu {{{ if has("wildmenu") set wildignore+=*.a,*.o set wildignore+=.DS_Store,.git,.hg,.svn @@ -91,7 +96,48 @@ if has("wildmenu") set wildmenu set wildmode=list,longest,full inoremap -endif +endif " }}} +" plugins {{{ + " syntastic {{{ + 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 + + let g:syntastic_perl_checkers = ['perl'] + let g:syntastic_enable_perl_checker = 1 + let g:syntastic_python_checkers = ['pylint'] + let g:syntastic_php_checkers = ['php'] + let g:syntastic_html_tidy_ignore_errors = ['warning:
proprietary attribute "data-role"', ' proprietary attribute "required"', ' proprietary attribute "pattern"', ' proprietary attribute "required"', ' proprietary attribute "pattern"', '