diff --git a/.bashrc b/.bashrc index da27def..d791683 100644 --- a/.bashrc +++ b/.bashrc @@ -230,6 +230,9 @@ export EDITOR=vim unset MANPATH # delete if you already modified MANPATH elsewhere in your config export MANPATH="$NPM_PACKAGES/share/man:$(manpath)" +export LDFLAGS="-L/usr/local/opt/libffi/lib" +export PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig" + # *ENV STUFF if [ -x /usr/local/bin/anyenv ] diff --git a/.ssh/config.d/propeller b/.ssh/config.d/propeller index 94757e9..b6f205c 100644 --- a/.ssh/config.d/propeller +++ b/.ssh/config.d/propeller @@ -25,7 +25,7 @@ Host gitlab.propeller.de IdentityFile /Users/mochmann/.ssh/propeller_rsa ForwardAgent yes -Host anubis atum hapi min aton thot geb ptah bastet propeller.technology crommelin +Host anubis atum hapi min aton thot geb ptah bastet propeller.technology crommelin ra User mochmann IdentityFile /Users/mochmann/.ssh/propeller_rsa ForwardAgent yes @@ -48,6 +48,8 @@ Host ptah HostName ptah.propeller.de Host bastet HostName bastet.propeller.de +Host ra + HostName ra.propeller.de # OLD HOSTS Host ark ichigo manticore zerotwo nexus mars diff --git a/.vimrc b/.vimrc index f30c0ef..3a55f1a 100644 --- a/.vimrc +++ b/.vimrc @@ -7,7 +7,7 @@ " ● ○ ○ ○ ● " " " " My configuration for the `vim` editor " -" Version 1,0,0 " +" Version 1,1,0 " " " """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -19,6 +19,7 @@ autocmd FileType php set omnifunc=phpcomplete#CompletePHP call vundle#begin() Plugin 'VundleVim/Vundle.vim' +Plugin 'tpope/vim-fugitive' Plugin 'preservim/nerdtree' Plugin 'kalafut/vim-taskjuggler' Plugin 'octol/vim-cpp-enhanced-highlight' @@ -31,16 +32,39 @@ call vundle#end() " required filetype plugin indent on " required set relativenumber +set number +set nowrap +set colorcolumn=80 execute pathogen#infect() syntax on filetype plugin indent on +hi Normal guibg=NONE ctermbg=NONE colorscheme monokai -set tabstop=4 +" STATUSLINE set laststatus=2 + +set statusline= +set statusline+=%#SpellLocal# +set statusline+=\ %{FugitiveHead()}\ +set statusline+=%#String# +set statusline+=\ \ +set statusline+=%{getcwd()}/%f +set statusline+=%m +set statusline+=%= +set statusline+=%#Folded# +set statusline+=\ [%{&fileencoding?&fileencoding:&encoding}] +set statusline+=\ %p%% +set statusline+=%#Character# +set statusline+=\ [%l:%c] + +" SETUP +set tabstop=4 set ruler +set signcolumn=yes + let NERDTreeShowHidden=1 map :NERDTreeToggle