diff --git a/vim/vim.symlink/ftplugin/scala.vim b/vim/vim.symlink/ftplugin/scala.vim new file mode 100644 index 0000000..a421697 --- /dev/null +++ b/vim/vim.symlink/ftplugin/scala.vim @@ -0,0 +1 @@ +set tabstop=2 diff --git a/vim/vim.symlink/ftplugin/scala.vim b/vim/vim.symlink/ftplugin/scala.vim new file mode 100644 index 0000000..a421697 --- /dev/null +++ b/vim/vim.symlink/ftplugin/scala.vim @@ -0,0 +1 @@ +set tabstop=2 diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink index 4ba2d73..1bdc6e7 100644 --- a/vim/vimrc.symlink +++ b/vim/vimrc.symlink @@ -1,4 +1,4 @@ -" load plugins from vundle +" Load plugins from vundle source ~/.vim/plugins.vim " Load plugins set clipboard=unnamed " sets clipboard to os default @@ -23,7 +23,7 @@ " UI config set number " display line numbers set showcmd " show the input of an *incomplete* command -set wildmenu " show possible completions of command line commands, file names, and more. +set wildmenu wildmode=full " show possible completions of command line commands, file names, and more. set title " show file-name in title set ruler " display cursor position in status bar set laststatus=2 " show the status line all the time @@ -33,37 +33,41 @@ set ttyfast " faster redrawing set lazyredraw " redraw only when needed to set showmatch " highlight matching [{()}] +set cpoptions+=$ " show '$' at end of change " Searching set hlsearch " highlight all search-hits set incsearch " incremental searches -"Mappings -map :NERDTreeToggle -map :GundoToggle -map :ctrlp_map -map'CtrlP' :ctrlp_cmd -let mapleader="," " maps leader to comma (,) +" Mappings +let mapleader="," " maps leader to comma (,) +mapn :NERDTreeToggle +mapu :GundoToggle +mapp :ctrlp_cmd vnoremap . :normal . -"NERDtree stuff +" Buffers +set hidden " buffers can be hidden without first be written +nnoremap :buffers:buffer + +" NERDtree stuff autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif "Close NERDtree if it is the last window -"CtrlP stuff +" CtrlP stuff let g:ctrlp_working_path_mode = 'ra' set wildignore+=*/tmp/*,*.so,*.swp,*.zip let g:ctrlp_custom_ignore = '\v[\/]\.(git|hg|svn)$' -"DelimitMate stuff +" DelimitMate stuff let g:delimitMate_expand_cr = 2 -"indentLine stuff +" indentLine stuff let g:indentLine_color_term = 239 let g:indentLine_color_gui = '#09AA08' let g:indentLine_char = '│' " Backups -:set backup +set backup set backupdir=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp set backupskip=/tmp/*,/private/tmp/* set directory=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp diff --git a/vim/vim.symlink/ftplugin/scala.vim b/vim/vim.symlink/ftplugin/scala.vim new file mode 100644 index 0000000..a421697 --- /dev/null +++ b/vim/vim.symlink/ftplugin/scala.vim @@ -0,0 +1 @@ +set tabstop=2 diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink index 4ba2d73..1bdc6e7 100644 --- a/vim/vimrc.symlink +++ b/vim/vimrc.symlink @@ -1,4 +1,4 @@ -" load plugins from vundle +" Load plugins from vundle source ~/.vim/plugins.vim " Load plugins set clipboard=unnamed " sets clipboard to os default @@ -23,7 +23,7 @@ " UI config set number " display line numbers set showcmd " show the input of an *incomplete* command -set wildmenu " show possible completions of command line commands, file names, and more. +set wildmenu wildmode=full " show possible completions of command line commands, file names, and more. set title " show file-name in title set ruler " display cursor position in status bar set laststatus=2 " show the status line all the time @@ -33,37 +33,41 @@ set ttyfast " faster redrawing set lazyredraw " redraw only when needed to set showmatch " highlight matching [{()}] +set cpoptions+=$ " show '$' at end of change " Searching set hlsearch " highlight all search-hits set incsearch " incremental searches -"Mappings -map :NERDTreeToggle -map :GundoToggle -map :ctrlp_map -map'CtrlP' :ctrlp_cmd -let mapleader="," " maps leader to comma (,) +" Mappings +let mapleader="," " maps leader to comma (,) +mapn :NERDTreeToggle +mapu :GundoToggle +mapp :ctrlp_cmd vnoremap . :normal . -"NERDtree stuff +" Buffers +set hidden " buffers can be hidden without first be written +nnoremap :buffers:buffer + +" NERDtree stuff autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif "Close NERDtree if it is the last window -"CtrlP stuff +" CtrlP stuff let g:ctrlp_working_path_mode = 'ra' set wildignore+=*/tmp/*,*.so,*.swp,*.zip let g:ctrlp_custom_ignore = '\v[\/]\.(git|hg|svn)$' -"DelimitMate stuff +" DelimitMate stuff let g:delimitMate_expand_cr = 2 -"indentLine stuff +" indentLine stuff let g:indentLine_color_term = 239 let g:indentLine_color_gui = '#09AA08' let g:indentLine_char = '│' " Backups -:set backup +set backup set backupdir=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp set backupskip=/tmp/*,/private/tmp/* set directory=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index 76d3bcb..4c15d53 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -19,6 +19,7 @@ alias httpserver='python -m http.server' alias vi=vim +alias vimf='vim --remote-silent' alias pgrep='ps -eo "%p %c %U %C" | grep' alias nano='nano -m' diff --git a/vim/vim.symlink/ftplugin/scala.vim b/vim/vim.symlink/ftplugin/scala.vim new file mode 100644 index 0000000..a421697 --- /dev/null +++ b/vim/vim.symlink/ftplugin/scala.vim @@ -0,0 +1 @@ +set tabstop=2 diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink index 4ba2d73..1bdc6e7 100644 --- a/vim/vimrc.symlink +++ b/vim/vimrc.symlink @@ -1,4 +1,4 @@ -" load plugins from vundle +" Load plugins from vundle source ~/.vim/plugins.vim " Load plugins set clipboard=unnamed " sets clipboard to os default @@ -23,7 +23,7 @@ " UI config set number " display line numbers set showcmd " show the input of an *incomplete* command -set wildmenu " show possible completions of command line commands, file names, and more. +set wildmenu wildmode=full " show possible completions of command line commands, file names, and more. set title " show file-name in title set ruler " display cursor position in status bar set laststatus=2 " show the status line all the time @@ -33,37 +33,41 @@ set ttyfast " faster redrawing set lazyredraw " redraw only when needed to set showmatch " highlight matching [{()}] +set cpoptions+=$ " show '$' at end of change " Searching set hlsearch " highlight all search-hits set incsearch " incremental searches -"Mappings -map :NERDTreeToggle -map :GundoToggle -map :ctrlp_map -map'CtrlP' :ctrlp_cmd -let mapleader="," " maps leader to comma (,) +" Mappings +let mapleader="," " maps leader to comma (,) +mapn :NERDTreeToggle +mapu :GundoToggle +mapp :ctrlp_cmd vnoremap . :normal . -"NERDtree stuff +" Buffers +set hidden " buffers can be hidden without first be written +nnoremap :buffers:buffer + +" NERDtree stuff autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif "Close NERDtree if it is the last window -"CtrlP stuff +" CtrlP stuff let g:ctrlp_working_path_mode = 'ra' set wildignore+=*/tmp/*,*.so,*.swp,*.zip let g:ctrlp_custom_ignore = '\v[\/]\.(git|hg|svn)$' -"DelimitMate stuff +" DelimitMate stuff let g:delimitMate_expand_cr = 2 -"indentLine stuff +" indentLine stuff let g:indentLine_color_term = 239 let g:indentLine_color_gui = '#09AA08' let g:indentLine_char = '│' " Backups -:set backup +set backup set backupdir=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp set backupskip=/tmp/*,/private/tmp/* set directory=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index 76d3bcb..4c15d53 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -19,6 +19,7 @@ alias httpserver='python -m http.server' alias vi=vim +alias vimf='vim --remote-silent' alias pgrep='ps -eo "%p %c %U %C" | grep' alias nano='nano -m' diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index 9372f8f..1adbdc7 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -6,6 +6,8 @@ export DOTFILES=$HOME/.dotfiles export ZSH=$DOTFILES/zsh +# Source iTerm shell-integration +source ~/.iterm2_shell_integration.`basename $SHELL` # Source config-files for config ($ZSH/**/*.zsh) source $config