From 71495f2986e3e3d14a23f674c515f315d6103556 Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 7 Oct 2009 17:08:36 +0200 Subject: Moved some things out of the box --- .vim/vimrc | 107 ------------------------------------------------------------ .vimrc | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ .zsh/zshenv | 10 ------ .zshenv | 10 ++++++ 4 files changed, 117 insertions(+), 117 deletions(-) delete mode 100644 .vim/vimrc create mode 100644 .vimrc delete mode 100644 .zsh/zshenv create mode 100644 .zshenv diff --git a/.vim/vimrc b/.vim/vimrc deleted file mode 100644 index 789fb4e..0000000 --- a/.vim/vimrc +++ /dev/null @@ -1,107 +0,0 @@ -" ======================================================= -" GENERAL -" ======================================================= - -" Colorscheme -colorscheme desert - -" Filetype -filetype indent on -filetype plugin on - -" More general stuff -set nu -set fenc=utf-8 -set modeline -set ts=4 -set sw=4 -set sts=4 -set expandtab -set guifont=Monospace\ 12 -set spelllang=de_20 - -if has("gui") " nice cursorline in the gui - set cursorline -endif - -let mapleader = "," -let &guicursor = &guicursor . ",a:blinkon0" - -" statusline -set laststatus=2 " always show line -set statusline=%-3.3n\ %f\ %r%w[%{strlen(&ft)?&ft:'none'},%{strlen(&fenc)?&fenc:&enc.'\ (G)'},%{&fileformat}]%m%=%-14.(%l,%c%V%)%<%P - -" ======================================================= -" COMPLETION -" ======================================================= - -" Omnicomplete -autocmd FileType python set omnifunc=pythoncomplete#Complete -" nothing set for C/C++ -- done by the autoload feature -set completeopt=longest,menu,preview -set tags+=~/.vim/tags - -for tag in split(glob("~/.vim/tags.d/*"), "\n") - let &tags .= "," . tag -endfor - -" Allow Return to select a match -inoremap pumvisible() ? "\" : "\u\" - -" pydiction -let g:pydiction_location = '~/.vim/pydiction/complete-dict' - -" ======================================================= -" CUSTOM MAPPINGS -" ======================================================= - -" Some maps -map :!ctags -R --c++-kinds=+p --fields=+iaS --extra=+q . -nmap :Tlist -nmap :TlistUpdate -nmap :ls:buf -map gt -map gT - -" Remap the 'file-toggle' cmd, as it does not work on my keyboard -map -imap - -" ======================================================= -" PLUGINS AND LANGUAGES -" ======================================================= - -" Stuff for the TagList-Plugin -let Tlist_Sort_Type = "name" -let Tlist_File_Fold_Auto_Close = 1 -let Tlist_Exit_OnlyWindow = 1 - -" Stuff for the NERD Tree Plugin -let NERDTreeWinPos = 0 "have it on the right site - -" Stuff for the cvs plugin -let VCSCommitOnWrite = 0 - -" Autotag -- correct C++ handling -let g:autotagCtagsCmd="ctags --c++-kinds=+p --fields=+iaS --extra=+q" - -" stuff for gentoo syntax -let g:ebuild_error_on_trailing_whitespace=1 " show trailing whitespaces -let g:bugsummary_browser="firefox %s" - -" for toggling in python -let g:toggle_words_dict = {'python': [['if', 'elif', 'else'], ['True','False']]} -let python_highlight_numbers = 1 -let python_highlight_space_errors = 1 - -" default to latex for .tex files -let g:tex_flavor = "latex" - -" ======================================================= -" FINAL -" ======================================================= - -" turn of any existing search -if has("autocmd") - au VimEnter * nohls -endif diff --git a/.vimrc b/.vimrc new file mode 100644 index 0000000..789fb4e --- /dev/null +++ b/.vimrc @@ -0,0 +1,107 @@ +" ======================================================= +" GENERAL +" ======================================================= + +" Colorscheme +colorscheme desert + +" Filetype +filetype indent on +filetype plugin on + +" More general stuff +set nu +set fenc=utf-8 +set modeline +set ts=4 +set sw=4 +set sts=4 +set expandtab +set guifont=Monospace\ 12 +set spelllang=de_20 + +if has("gui") " nice cursorline in the gui + set cursorline +endif + +let mapleader = "," +let &guicursor = &guicursor . ",a:blinkon0" + +" statusline +set laststatus=2 " always show line +set statusline=%-3.3n\ %f\ %r%w[%{strlen(&ft)?&ft:'none'},%{strlen(&fenc)?&fenc:&enc.'\ (G)'},%{&fileformat}]%m%=%-14.(%l,%c%V%)%<%P + +" ======================================================= +" COMPLETION +" ======================================================= + +" Omnicomplete +autocmd FileType python set omnifunc=pythoncomplete#Complete +" nothing set for C/C++ -- done by the autoload feature +set completeopt=longest,menu,preview +set tags+=~/.vim/tags + +for tag in split(glob("~/.vim/tags.d/*"), "\n") + let &tags .= "," . tag +endfor + +" Allow Return to select a match +inoremap pumvisible() ? "\" : "\u\" + +" pydiction +let g:pydiction_location = '~/.vim/pydiction/complete-dict' + +" ======================================================= +" CUSTOM MAPPINGS +" ======================================================= + +" Some maps +map :!ctags -R --c++-kinds=+p --fields=+iaS --extra=+q . +nmap :Tlist +nmap :TlistUpdate +nmap :ls:buf +map gt +map gT + +" Remap the 'file-toggle' cmd, as it does not work on my keyboard +map +imap + +" ======================================================= +" PLUGINS AND LANGUAGES +" ======================================================= + +" Stuff for the TagList-Plugin +let Tlist_Sort_Type = "name" +let Tlist_File_Fold_Auto_Close = 1 +let Tlist_Exit_OnlyWindow = 1 + +" Stuff for the NERD Tree Plugin +let NERDTreeWinPos = 0 "have it on the right site + +" Stuff for the cvs plugin +let VCSCommitOnWrite = 0 + +" Autotag -- correct C++ handling +let g:autotagCtagsCmd="ctags --c++-kinds=+p --fields=+iaS --extra=+q" + +" stuff for gentoo syntax +let g:ebuild_error_on_trailing_whitespace=1 " show trailing whitespaces +let g:bugsummary_browser="firefox %s" + +" for toggling in python +let g:toggle_words_dict = {'python': [['if', 'elif', 'else'], ['True','False']]} +let python_highlight_numbers = 1 +let python_highlight_space_errors = 1 + +" default to latex for .tex files +let g:tex_flavor = "latex" + +" ======================================================= +" FINAL +" ======================================================= + +" turn of any existing search +if has("autocmd") + au VimEnter * nohls +endif diff --git a/.zsh/zshenv b/.zsh/zshenv deleted file mode 100644 index 4a4c063..0000000 --- a/.zsh/zshenv +++ /dev/null @@ -1,10 +0,0 @@ -typeset -U path fpath - -export ECHANGELOG_USER="René Neumann (Necoro) " - -fpath=(~/.zsh/functions $fpath) - -# load all things in there -autoload ${fpath[1]}/*(:t) - -[[ -d ~/bin ]] && path=(~/bin $path) diff --git a/.zshenv b/.zshenv new file mode 100644 index 0000000..4a4c063 --- /dev/null +++ b/.zshenv @@ -0,0 +1,10 @@ +typeset -U path fpath + +export ECHANGELOG_USER="René Neumann (Necoro) " + +fpath=(~/.zsh/functions $fpath) + +# load all things in there +autoload ${fpath[1]}/*(:t) + +[[ -d ~/bin ]] && path=(~/bin $path) -- cgit v1.2.3-54-g00ecf