diff --git a/Xresources b/Xresources index 19cd95e..cd2f2af 100644 --- a/Xresources +++ b/Xresources @@ -27,8 +27,8 @@ URxvt.internalBorder: 3 URxvt.lineSpace: 0 ! Fonts -URxvt*font: xft:DejaVu Sans Mono:pixelsize=14 -URxvt*boldFont: xft:DejaVu Sans Mono:bold:pixelsize=14 +URxvt*font: xft:DejaVu Sans Mono:pixelsize=13 +URxvt*boldFont: xft:DejaVu Sans Mono:bold:pixelsize=13 ! Font size URxvt.keysym.C-Up: perl:font-size:increase @@ -62,11 +62,6 @@ URxvt.saveLines: 65536 ! + : current screen and scrollbackbuffer URxvt.print-pipe: cat > $(echo /tmp/urxvt.dump.$(date +'%Y-%m-%d--%H:%M:%S')) -! Colors - -URxvt.intensityStyles: false - - ! Solarized color scheme for the X Window System ! ! http://ethanschoonover.com/solarized @@ -112,28 +107,27 @@ URxvt.intensityStyles: false ! ! URxvt*background: 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 -!*color8: S_base03 -!*color9: S_orange -!*color10: S_base01 -!*color11: S_base00 -!*color12: S_base0 -!*color13: S_violet -!*color14: S_base1 -!*color15: S_base3 +*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/dircolors b/dircolors index f32324a..7dd2a39 100644 --- a/dircolors +++ b/dircolors @@ -1,425 +1,2 @@ -# Exact Solarized Dark color theme for the color GNU ls utility. -# Designed for dircolors (GNU coreutils) 5.97 -# -# This simple theme was simultaneously designed for these terminal color schemes: -# - Solarized dark (best) -# - Solarized light -# - default dark -# - default light -# with a slight optimization for Solarized Dark. -# -# How the colors were selected: -# - Terminal emulators often have an option typically enabled by default that makes -# bold a different color. It is important to leave this option enabled so that -# you can access the entire 16-color Solarized palette, and not just 8 colors. -# - We favor universality over a greater number of colors. So we limit the number -# of colors so that this theme will work out of the box in all terminals, -# Solarized or not, dark or light. -# - We choose to have the following category of files: -# NORMAL & FILE, DIR, LINK, EXEC and -# editable text including source, unimportant text, binary docs & multimedia source -# files, viewable multimedia, archived/compressed, and unimportant non-text -# - For uniqueness, we stay away from the Solarized foreground colors are -- either -# base00 (brightyellow) or base0 (brighblue). However, they can be used if -# you know what the bg/fg colors of your terminal are, in order to optimize the display. -# - 3 different options are provided: universal, solarized dark, and solarized light. -# The only difference between the universal scheme and one that's optimized for -# dark/light is the color of "unimportant" files, which should blend more with the -# background -# - We note that blue is the hardest color to see on dark bg and yellow is the hardest -# color to see on light bg (with blue being particularly bad). So we choose yellow -# for multimedia files which are usually accessed in a GUI folder browser anyway. -# And blue is kept for custom use of this scheme's user. -# - See table below to see the assignments. - - -# Insatllation instructions: -# This file goes in the /etc directory, and must be world readable. -# You can copy this file to .dir_colors in your $HOME directory to override -# the system defaults. - -# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not -# pipes. 'all' adds color characters to all output. 'none' shuts colorization -# off. -COLOR tty - -# Below, there should be one TERM entry for each termtype that is colorizable -TERM ansi -TERM color_xterm -TERM color-xterm -TERM con132x25 -TERM con132x30 -TERM con132x43 -TERM con132x60 -TERM con80x25 -TERM con80x28 -TERM con80x30 -TERM con80x43 -TERM con80x50 -TERM con80x60 -TERM cons25 -TERM console -TERM cygwin -TERM dtterm -TERM Eterm -TERM eterm-color -TERM gnome -TERM gnome-256color -TERM jfbterm -TERM konsole -TERM kterm -TERM linux -TERM linux-c -TERM mach-color -TERM mlterm -TERM nxterm -TERM putty -TERM rxvt -TERM rxvt-256color -TERM rxvt-cygwin -TERM rxvt-cygwin-native -TERM rxvt-unicode -TERM rxvt-unicode256 -TERM rxvt-unicode-256color -TERM screen -TERM screen-256color -TERM screen-256color-bce -TERM screen-bce -TERM screen.linux -TERM screen-w -TERM vt100 -TERM xterm -TERM xterm-16color -TERM xterm-256color -TERM xterm-88color -TERM xterm-color -TERM xterm-debian - -# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output) -EIGHTBIT 1 - -############################################################################# -# Below are the color init strings for the basic file types. A color init -# string consists of one or more of the following numeric codes: -# -# Attribute codes: -# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed -# Text color codes: -# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white -# Background color codes: -# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white -# -# NOTES: -# - See http://www.oreilly.com/catalog/wdnut/excerpt/color_names.html -# - Color combinations -# ANSI Color code Solarized Notes Universal SolDark SolLight -# ~~~~~~~~~~~~~~~ ~~~~~~~~~ ~~~~~ ~~~~~~~~~ ~~~~~~~ ~~~~~~~~ -# 00 none NORMAL, FILE -# 30 black base02 -# 01;30 bright black base03 bg of SolDark -# 31 red red docs & mm src -# 01;31 bright red orange EXEC -# 32 green green editable text -# 01;32 bright green base01 unimportant text -# 33 yellow yellow unclear in light bg multimedia -# 01;33 bright yellow base00 fg of SolLight unimportant non-text -# 34 blue blue unclear in dark bg user customized -# 01;34 bright blue base0 fg in SolDark unimportant text -# 35 magenta magenta LINK -# 01;35 bright magenta violet archive/compressed -# 36 cyan cyan DIR -# 01;36 bright cyan base1 unimportant non-text -# 37 white base2 -# 01;37 bright white base3 bg in SolLight -# 05;37;41 unclear in Putty dark - - -### By file type - -# global default -NORMAL 00 -# normal file -FILE 00 -# directory -DIR 36 -# symbolic link -LINK 35 - -# pipe, socket, block device, character device (blue bg) -FIFO 30;44 -SOCK 35;44 -DOOR 35;44 # Solaris 2.5 and later -BLK 33;44 -CHR 37;44 - - -############################################################################# -### By file attributes - -# Orphaned symlinks (blinking white on red) -# Blink may or may not work (works on iTerm dark or light, and Putty dark) -ORPHAN 05;37;41 -# ... and the files that orphaned symlinks point to (blinking white on red) -MISSING 05;37;41 - -# files with execute permission -EXEC 01;31 # Unix -.cmd 01;31 # Win -.exe 01;31 # Win -.com 01;31 # Win -.bat 01;31 # Win -.reg 01;31 # Win -.app 01;31 # OSX - -############################################################################# -### By extension - -# List any file extensions like '.gz' or '.tar' that you would like ls -# to colorize below. Put the extension, a space, and the color init string. -# (and any comments you want to add after a '#') - -### Text formats - -# Text that we can edit with a regular editor -.txt 32 -.org 32 -.md 32 -.mkd 32 - -# Source text -.h 32 -.c 32 -.C 32 -.cc 32 -.cxx 32 -.objc 32 -.sh 32 -.csh 32 -.zsh 32 -.el 32 -.vim 32 -.java 32 -.pl 32 -.pm 32 -.py 32 -.rb 32 -.hs 32 -.php 32 -.htm 32 -.html 32 -.shtml 32 -.xml 32 -.rdf 32 -.css 32 -.js 32 -.man 32 -.0 32 -.1 32 -.2 32 -.3 32 -.4 32 -.5 32 -.6 32 -.7 32 -.8 32 -.9 32 -.l 32 -.n 32 -.p 32 -.pod 32 -.tex 32 - -### Multimedia formats - -# Image -.bmp 33 -.cgm 33 -.dl 33 -.dvi 33 -.emf 33 -.eps 33 -.gif 33 -.jpeg 33 -.jpg 33 -.JPG 33 -.mng 33 -.pbm 33 -.pcx 33 -.pdf 33 -.pgm 33 -.png 33 -.ppm 33 -.pps 33 -.ppsx 33 -.ps 33 -.svg 33 -.svgz 33 -.tga 33 -.tif 33 -.tiff 33 -.xbm 33 -.xcf 33 -.xpm 33 -.xwd 33 -.xwd 33 -.yuv 33 - -# Audio -.aac 33 -.au 33 -.flac 33 -.mid 33 -.midi 33 -.mka 33 -.mp3 33 -.mpa 33 -.mpeg 33 -.mpg 33 -.ogg 33 -.ra 33 -.wav 33 - -# Video -.anx 33 -.asf 33 -.avi 33 -.axv 33 -.flc 33 -.fli 33 -.flv 33 -.gl 33 -.m2v 33 -.m4v 33 -.mkv 33 -.mov 33 -.mp4 33 -.mp4v 33 -.mpeg 33 -.mpg 33 -.nuv 33 -.ogm 33 -.ogv 33 -.ogx 33 -.qt 33 -.rm 33 -.rmvb 33 -.swf 33 -.vob 33 -.wmv 33 - -### Misc - -# Binary document formats and multimedia source -.doc 31 -.docx 31 -.rtf 31 -.dot 31 -.dotx 31 -.xls 31 -.xlsx 31 -.ppt 31 -.pptx 31 -.fla 31 -.psd 31 - -# Archives, compressed -.7z 1;35 -.apk 1;35 -.arj 1;35 -.bin 1;35 -.bz 1;35 -.bz2 1;35 -.cab 1;35 # Win -.deb 1;35 -.dmg 1;35 # OSX -.gem 1;35 -.gz 1;35 -.iso 1;35 -.jar 1;35 -.msi 1;35 # Win -.rar 1;35 -.rpm 1;35 -.tar 1;35 -.tbz 1;35 -.tbz2 1;35 -.tgz 1;35 -.tx 1;35 -.war 1;35 -.xpi 1;35 -.xz 1;35 -.z 1;35 -.Z 1;35 -.zip 1;35 - -# For testing -.ANSI-30-black 30 -.ANSI-01;30-brblack 01;30 -.ANSI-31-red 31 -.ANSI-01;31-brred 01;31 -.ANSI-32-green 32 -.ANSI-01;32-brgreen 01;32 -.ANSI-33-yellow 33 -.ANSI-01;33-bryellow 01;33 -.ANSI-34-blue 34 -.ANSI-01;34-brblue 01;34 -.ANSI-35-magenta 35 -.ANSI-01;35-brmagenta 01;35 -.ANSI-36-cyan 36 -.ANSI-01;36-brcyan 01;36 -.ANSI-37-white 37 -.ANSI-01;37-brwhite 01;37 - -############################################################################# -# Your customizations - -# Unimportant text files -# For universal scheme, use brightgreen 01;32 -# For optimal on light bg (but too prominent on dark bg), use white 01;34 -.log 01;32 -*~ 01;32 -*# 01;32 -#.log 01;34 -#*~ 01;34 -#*# 01;34 - -# Unimportant non-text files -# For universal scheme, use brightcyan 01;36 -# For optimal on dark bg (but too prominent on light bg), change to 01;33 -#.bak 01;36 -#.BAK 01;36 -#.old 01;36 -#.OLD 01;36 -#.org_archive 01;36 -#.off 01;36 -#.OFF 01;36 -#.dist 01;36 -#.DIST 01;36 -#.orig 01;36 -#.ORIG 01;36 -#.swp 01;36 -#.swo 01;36 -#*,v 01;36 -.bak 01;33 -.BAK 01;33 -.old 01;33 -.OLD 01;33 -.org_archive 01;33 -.off 01;33 -.OFF 01;33 -.dist 01;33 -.DIST 01;33 -.orig 01;33 -.ORIG 01;33 -.swp 01;33 -.swo 01;33 -*,v 01;33 - -# The brightmagenta (Solarized: purple) color is free for you to use for your -# custom file type -.gpg 34 -.gpg 34 -.pgp 34 -.asc 34 -.3des 34 -.aes 34 -.enc 34 +LS_COLORS='no=00;38;5;244:rs=0:di=00;38;5;33:ln=00;38;5;37:mh=00:pi=48;5;230;38;5;136;01:so=48;5;230;38;5;136;01:do=48;5;230;38;5;136;01:bd=48;5;230;38;5;244;01:cd=48;5;230;38;5;244;01:or=48;5;235;38;5;160:su=48;5;160;38;5;230:sg=48;5;136;38;5;230:ca=30;41:tw=48;5;64;38;5;230:ow=48;5;235;38;5;33:st=48;5;33;38;5;230:ex=00;38;5;64:*.tar=00;38;5;61:*.tgz=00;38;5;61:*.arj=00;38;5;61:*.taz=00;38;5;61:*.lzh=00;38;5;61:*.lzma=00;38;5;61:*.tlz=00;38;5;61:*.txz=00;38;5;61:*.zip=00;38;5;61:*.z=00;38;5;61:*.Z=00;38;5;61:*.dz=00;38;5;61:*.gz=00;38;5;61:*.lz=00;38;5;61:*.xz=00;38;5;61:*.bz2=00;38;5;61:*.bz=00;38;5;61:*.tbz=00;38;5;61:*.tbz2=00;38;5;61:*.tz=00;38;5;61:*.deb=00;38;5;61:*.rpm=00;38;5;61:*.jar=00;38;5;61:*.rar=00;38;5;61:*.ace=00;38;5;61:*.zoo=00;38;5;61:*.cpio=00;38;5;61:*.7z=00;38;5;61:*.rz=00;38;5;61:*.apk=00;38;5;61:*.gem=00;38;5;61:*.jpg=00;38;5;136:*.JPG=00;38;5;136:*.jpeg=00;38;5;136:*.gif=00;38;5;136:*.bmp=00;38;5;136:*.pbm=00;38;5;136:*.pgm=00;38;5;136:*.ppm=00;38;5;136:*.tga=00;38;5;136:*.xbm=00;38;5;136:*.xpm=00;38;5;136:*.tif=00;38;5;136:*.tiff=00;38;5;136:*.png=00;38;5;136:*.PNG=00;38;5;136:*.svg=00;38;5;136:*.svgz=00;38;5;136:*.mng=00;38;5;136:*.pcx=00;38;5;136:*.dl=00;38;5;136:*.xcf=00;38;5;136:*.xwd=00;38;5;136:*.yuv=00;38;5;136:*.cgm=00;38;5;136:*.emf=00;38;5;136:*.eps=00;38;5;136:*.CR2=00;38;5;136:*.ico=00;38;5;136:*.tex=00;38;5;245:*.rdf=00;38;5;245:*.owl=00;38;5;245:*.n3=00;38;5;245:*.ttl=00;38;5;245:*.nt=00;38;5;245:*.torrent=00;38;5;245:*.xml=00;38;5;245:*Makefile=00;38;5;245:*Rakefile=00;38;5;245:*build.xml=00;38;5;245:*rc=00;38;5;245:*1=00;38;5;245:*.nfo=00;38;5;245:*README=00;38;5;245:*README.txt=00;38;5;245:*readme.txt=00;38;5;245:*.md=00;38;5;245:*README.markdown=00;38;5;245:*.ini=00;38;5;245:*.yml=00;38;5;245:*.cfg=00;38;5;245:*.conf=00;38;5;245:*.c=00;38;5;245:*.cpp=00;38;5;245:*.cc=00;38;5;245:*.sqlite=00;38;5;245:*.log=00;38;5;240:*.bak=00;38;5;240:*.aux=00;38;5;240:*.lof=00;38;5;240:*.lol=00;38;5;240:*.lot=00;38;5;240:*.out=00;38;5;240:*.toc=00;38;5;240:*.bbl=00;38;5;240:*.blg=00;38;5;240:*~=00;38;5;240:*#=00;38;5;240:*.part=00;38;5;240:*.incomplete=00;38;5;240:*.swp=00;38;5;240:*.tmp=00;38;5;240:*.temp=00;38;5;240:*.o=00;38;5;240:*.pyc=00;38;5;240:*.class=00;38;5;240:*.cache=00;38;5;240:*.aac=00;38;5;166:*.au=00;38;5;166:*.flac=00;38;5;166:*.mid=00;38;5;166:*.midi=00;38;5;166:*.mka=00;38;5;166:*.mp3=00;38;5;166:*.mpc=00;38;5;166:*.ogg=00;38;5;166:*.ra=00;38;5;166:*.wav=00;38;5;166:*.m4a=00;38;5;166:*.axa=00;38;5;166:*.oga=00;38;5;166:*.spx=00;38;5;166:*.xspf=00;38;5;166:*.mov=00;38;5;166:*.mpg=00;38;5;166:*.mpeg=00;38;5;166:*.m2v=00;38;5;166:*.mkv=00;38;5;166:*.ogm=00;38;5;166:*.mp4=00;38;5;166:*.m4v=00;38;5;166:*.mp4v=00;38;5;166:*.vob=00;38;5;166:*.qt=00;38;5;166:*.nuv=00;38;5;166:*.wmv=00;38;5;166:*.asf=00;38;5;166:*.rm=00;38;5;166:*.rmvb=00;38;5;166:*.flc=00;38;5;166:*.avi=00;38;5;166:*.fli=00;38;5;166:*.flv=00;38;5;166:*.gl=00;38;5;166:*.m2ts=00;38;5;166:*.divx=00;38;5;166:*.webm=00;38;5;166:*.axv=00;38;5;166:*.anx=00;38;5;166:*.ogv=00;38;5;166:*.ogx=00;38;5;166:'; +export LS_COLORS diff --git a/vimrc b/vimrc index 010a996..b766f8f 100644 --- a/vimrc +++ b/vimrc @@ -14,239 +14,263 @@ Plugin 'gmarik/Vundle.vim' Plugin 'L9' Plugin 'unimpaired.vim' +Plugin 'mhinz/vim-startify' + Plugin 'scrooloose/nerdtree' Plugin 'kien/ctrlp.vim' -Plugin 'maxbrunsfeld/vim-yankstack', {'name': 'yankstack'} +Plugin 'maxbrunsfeld/vim-yankstack', {'name': 'yankstack'} Plugin 'surround.vim' +Plugin 'SirVer/ultisnips' +Plugin 'honza/vim-snippets' + Plugin 'editorconfig/editorconfig-vim' -Plugin 'pangloss/vim-javascript' -Plugin 'scrooloose/syntastic.git' +Plugin 'sheerun/vim-polyglot' -Plugin 'mileszs/ack.vim' +Plugin 'nathanaelkane/vim-indent-guides' Plugin 'tpope/vim-fugitive' Plugin 'airblade/vim-gitgutter' +Plugin 'mileszs/ack.vim' + Plugin 'vim-airline', {'name': 'airline'} -Plugin 'flazz/vim-colorschemes' +Plugin 'altercation/vim-colors-solarized' -Plugin 'snipMate' +Plugin 'scrooloose/syntastic.git' +Plugin 'Townk/vim-autoclose' +Plugin 'pangloss/vim-javascript' Plugin 'mustache/vim-mustache-handlebars' +Plugin 'gorodinskiy/vim-coloresque' -Plugin 'mhinz/vim-startify' +Plugin 'inside/vim-search-pulse' " All of your Plugins must be added before the following line call vundle#end() " required filetype plugin indent on " required -" enable 256 color !!1! -set t_Co=256 +"" Encoding +set encoding=utf-8 +set fileencoding=utf-8 +set fileencodings=utf-8 +"" Unleash all VIM power +set nocompatible -" CONFIGURATION MAPPING -set autoread " set to auto read when a file is changed from the outside -"set mouse=a " allow for full mouse support -set autowrite -set showcmd " show typed commands +"" Fix backspace indent +set backspace=indent,eol,start -set wildmenu " turn on WiLd menu -set wildmode=list:longest,list:full " activate TAB auto-completion for file paths -set wildignore+=*.o,*.class,*.pyc,.git,.svn,node_modules +"" allow plugins by file type +filetype on +filetype plugin on +filetype indent on -set ruler " always show current position -set backspace=indent,eol,start " set backspace config, backspace as normal -set nomodeline " security -set encoding=utf8 - -set hlsearch " highlight search things -set incsearch " go to search results as typing -set smartcase " but case-sensitive if expression contains a capital letter. -set ignorecase " ignore case when searching -set gdefault " assume global when searching or substituting -set magic " set magic on, for regular expressions -set showmatch " show matching brackets when text indicator is over them - -set lazyredraw " don't redraw screen during macros -set ttyfast " improves redrawing for newer computers -set fileformats=unix,mac,dos - -set nobackup " prevent backups of files, since using versioning mostly and undofile -set nowritebackup -set noswapfile -set directory=~/.vim/.swp,/tmp " swap directory -set shiftwidth=4 " set tab width -set softtabstop=4 +"" Tabs. May be overriten by autocmd rules set tabstop=4 -set smarttab +set softtabstop=0 +set shiftwidth=4 set expandtab -set autoindent " set automatic code indentation + +"" Enable hidden buffers set hidden -set wrap " wrap lines -set linebreak " this will not break whole words while wrap is enabled -set showbreak=… -set cursorline " highlight current line -set list listchars=tab:\ \ ,trail:· " show · for trailing space, \ \ for trailing tab -set spelllang=en,de " set spell check language -set noeb vb t_vb= " disable audio and visual bells -au GUIEnter * set vb t_vb= +"" Searching +set hlsearch +set incsearch +set ignorecase +set smartcase -syntax enable " enable syntax highlighting +"" Encoding +set bomb +set ttyfast +set binary -if has('statusline') - set laststatus=2 +"" Directories for swp files +set nobackup +set noswapfile + +set fileformats=unix,mac,dos +set showcmd + +"" Mouse +set mouse=a + +" +" Visual Settings +" + +if has("gui_running") + "disable menu, toolsbar, scrollbar + set guioptions -=m + set guioptions -=T + set guioptions -=r endif +set ruler +set number -" VIM 7.3 FEATURES -if v:version >= 703 - set undofile - set undodir=$HOME/.vim/.undo - set undolevels=1000 - set undoreload=10000 -endif +set t_Co=256 +set cursorline -" COLOR SCHEME +syntax enable set background=dark -let g:solarized_contrast = "high" colorscheme solarized -" FOLDING -set foldenable " enable folding -set foldmethod=marker " detect triple-{ style fold markers -set foldlevel=99 +set scrolloff=3 +"" Status bar +set laststatus=2 + +"" Use modeline overrides +set modeline +set modelines=10 + +set title +set titleold="Terminal" +set titlestring=%F + +"" disable visual bell +set visualbell +set t_vb= + +"" enable spelling +set spelllang=en,de + +"" long lines +let &showbreak='↪ ' + +" " KEY MAPPINGS +" -" MAP LEADER +"" MAP LEADER noremap , \ let mapleader = "," -" fast saving +"" fast saving nmap w :update -" fast escaping +"" fast escaping imap jj -" prevent accidental striking of F1 key +"" prevent accidental striking of F1 key map imap -" clear highlight +"" clear highlight nnoremap :noh -" map Y to match C and D behavior +"" map Y to match C and D behavior nnoremap Y y$ -" yank entire file (global yank) +"" yank entire file (global yank) nmap gy ggVGy -" ignore lines when going up or down +"" ignore lines when going up or down nnoremap j gj nnoremap k gk -" auto complete {} indent and position the cursor in the middle line -"inoremap { {}O -"inoremap ( ()O -"inoremap [ []O -" fast window switching + +"" fast window switching map , w -" cycle between buffers +"" cycle between buffers map . :b# -" change directory to current buffer + +"" change directory to current buffer map cd :cd %:p:h -" swap implementations of ` and ' jump to prefer row and column jumping -" nnoremap ' ` -" nnoremap ` ' -" indent visual selected code without unselecting and going back to normal mode +"" indent visual selected code without unselecting and going back to normal mode vmap > >gv vmap < r :%s#\<=expand("")\># -" strip all trailing whitespace in the current file + +"" strip all trailing whitespace in the current file nnoremap W :%s/\s\+$//e:let @/='' -" insert path of current file into a command + +"" insert path of current file into a command cmap =expand("%:p:h") . "/" -" fast editing of the .vimrc + +"" fast editing of the .vimrc nmap ev :e $MYVIMRC nmap sv :so $MYVIMRC -" allow saving when you forgot sudo + +"" allow saving when you forgot sudo cmap w!! w !sudo tee % >/dev/null -" turn on spell checking + +"" turn on spell checking map spl :setlocal spell! -" spell checking shortcuts +"" spell checking shortcuts map sn ]s map sp [s map sa zg map s? z= +"" toggle states nmap hh :set invhlsearch nmap ll :set invlist -nmap nn :set invnumber nmap pp :set invpaste + +nmap nn :set invnumber nmap ii :set invrelativenumber -" remap [] to <> for german keyboard -nmap < [ -nmap > ] -omap < [ -omap > ] -xmap < [ -xmap > ] - -" accomondate with german keyboard - -"nnoremap ß -"nnoremap Ä } -"nnoremap Ö { -"nnoremap ä ] -"nnoremap ö [ - if exists('+relativenumber') set relativenumber endif -"" ADDITIONAL AUTOCOMMANDS +" +" Plugin Configuration +" -" saving when focus lost (after tabbing away or switching buffers) -"au FocusLost,BufLeave,WinLeave,TabLeave * silent! up -" open in last edit place -"au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g'\"" | endif -"au QuickFixCmdPost *grep* cwindow +"" ariline +let g:airline_theme = 'solarized' +let g:airline_enable_syntastic = 1 +let g:airline#extensions#tabline#enabled = 1 -"" PLUGIN SETTINGS - -" NERDTree +"" NERDTree configuration nmap n :NERDTreeToggle -let g:NERDChristmasTree=1 -let g:NERDTreeDirArrows=1 -let g:NERDTreeQuitOnOpen=1 -let g:NERDTreeShowHidden=1 +let NERDTreeChDirMode=2 +let NERDTreeIgnore=['\.rbc$', '\~$', '\.pyc$', '\.db$', '\.sqlite$', '__pycache__'] +let NERDTreeSortOrder=['^__\.py$', '\/$', '*', '\.swp$', '\.bak$', '\~$'] +let NERDTreeShowBookmarks=1 +let g:nerdtree_tabs_focus_on_files=1 +let g:NERDTreeMapOpenInTabSilent = '' +let g:NERDTreeWinSize = 20 +set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.pyc,*.db,*.sqlite -" Unimpaired -" bubble single lines +"" Unimpaired +"" bubble single lines nmap k [e nmap j ]e -" bubble multiple lines +"" bubble multiple lines vmap k [egv vmap j ]egv -" yankstack +"" yankstack nmap p yankstack_substitute_older_paste nmap P yankstack_substitute_newer_paste -" FILETYPE SPECIFIC +" +" Autocmd Rules +" -" MAIL HUMAN TEX +"" do syntax highlight syncing from start +autocmd BufEnter * :syntax sync fromstart + +"" Remember cursor position +autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif + +set autoread + +"" txt, mail, human, tex au BufNewFile,BufRead *.txt set filetype=human -au FileType human,mail,tex set expandtab textwidth=78 nocindent +au FileType human,mail,tex set wrap wm=2 textwidth=78 nocindent -" Python +"" Python au FileType python set noexpandtab -" JavaScript +"" Json au BufRead,BufNewFile *.json set ft=json -" Mustache +"" Mustache au BufRead,BufNewFile *.template set filetype=html syntax=mustache diff --git a/zshrc b/zshrc index 7d29381..d565d8b 100644 --- a/zshrc +++ b/zshrc @@ -109,9 +109,6 @@ bindkey '^H' backward-delete-char # Source Things ################# -# Source Node Version Manager, if installed. -source ~/.nvm/nvm.sh - # https://github.com/clvv/fasd if command -v fasd >/dev/null 2>&1 ; then eval "$(fasd --init auto)" @@ -120,6 +117,9 @@ if command -v fasd >/dev/null 2>&1 ; then alias o='a -e xdg-open' # quick opening files with xdg-open fi +# solarized dircolors +source ~/.dircolors - -export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting +# nvm +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm