Fixed vim-session plugin path and default vim-notes directories -…

… updated README.md

Makefile

@@ -12,7 +12,7 @@ help:
 
 
 install:
-	mkdir -p "$(XDG_CACHE_HOME)/vim/"{backup,session,swap,tags,undo,view}; \
+	mkdir -p "$(XDG_CACHE_HOME)/vim/"{backup,session,swap,tags,undo,view,notes}; \
 	$(vim) --cmd 'let g:vim_installing = 1' +NeoBundleInstall +q
 
 update:

README.md

@@ -1,31 +1,15 @@
 # vim-startup
 
-![vim startup script](http://dl.dropbox.com/u/185133/vim-startup/screenshot.jpg)
-
-## What is this?
-
-VIM distribution bundled with plugins managed by *neobundle* for programming in:
-
- * python
- * php
-
-also with:
- * useful dashboard / start screen with sessions handling
- * presentation mode in vim
- * notes handling
-
+Configurable VIM distribution bundled with plugins managed by **NeoBundle** manager also with:
+ * configurable by `~/.vimrc.local` and `~/.vimrc.bundles.local`
+ * useful dashboard with bookmarks and sessions handling ([vim-startify][vim-startify])
+ * presentation mode in vim ([vim-presenting][vim-presenting])
+ * notes handling ([vim-notes][vim-notes])
 
-To fully work you need to install:
-
- * vim or vim-gtk
- * exuberant-ctags - for code navigation
-
-To work with python:
- * pip install flake8 pep8 pylint pyflakes jedi  # for static code checking
-
-To work with php:
- * php code sniffer  # for static code checking
+Final layout inspired by https://github.com/rafi/vim-config
 
+## Screenshot
+![vim startup script](http://dl.dropbox.com/u/185133/vim-startup/screenshot.jpg)
 
 ## Install
 1. Clone `git clone git://github.com/onjin/vim-startup.git ~/.vim`
@@ -34,6 +18,9 @@ To work with php:
 4. Run `make install`
 5. Start `vim` or `gvim`, or `nvim`
 
+### Python editing
+For python editing install also:
+ * pip install flake8 jedi
 
 ## Upgrade
 
@@ -43,97 +30,224 @@ Run `make update`
  * ~/.vimrc.bundles.local - to put your additional plugins
  * ~/.vimrc.local - loaded after all plugins; used to configure / reconfigure plugins and local settings
 
-
-## Plugins (bundles) included
-
 If you want to install additional plugins, add them to **~/.vimrc.bundles.local** file.
 
-- 'airblade/vim-gitgutter'
-- 'beloglazov/vim-online-thesaurus'
-- 'benekastah/neomake'
-- 'bogado/file-line'
-- 'cespare/vim-toml'
-- 'chase/vim-ansible-yaml'
-- 'chrisbra/csv.vim'
-- 'chriskempson/base16-shell'
-- 'christoomey/vim-tmux-navigator'
-- 'davidhalter/jedi-vim'
-- 'ekalinin/Dockerfile.vim'
-- 'elzr/vim-json'
-- 'fatih/vim-go'
-- 'groenewege/vim-less'
-- 'guns/xterm-color-table.vim'
-- 'hail2u/vim-css3-syntax'
-- 'haya14busa/incsearch.vim'
-- 'haya14busa/vim-asterisk'
-- 'hynek/vim-python-pep8-indent'
-- 'itchyny/dictionary.vim'
-- 'itchyny/vim-cursorword'
-- 'itchyny/vim-gitbranch'
-- 'jelera/vim-javascript-syntax'
-- 'jiangmiao/simple-javascript-indenter'
-- 'joker1007/unite-pull-request'
-- 'junegunn/goyo.vim'
-- 'kana/vim-niceblock'
-- 'Konfekt/FastFold'
-- 'kshenoy/vim-signature'
-- 'lambdalisue/vim-findent'
-- 'lambdalisue/vim-gista'
-- 'lambdalisue/vim-gita'
-- 'matchit.zip'
-- 'mbbill/undotree'
-- 'mitsuhiko/vim-jinja'
-- 'mustache/vim-mustache-handlebars'
-- 'nathanaelkane/vim-indent-guides'
-- 'osyo-manga/unite-filetype'
-- 'osyo-manga/unite-quickfix'
-- 'othree/html5.vim'
-- 'rafi/awesome-vim-colorschemes'
-- 'rafi/vim-phpspec'
-- 'rafi/vim-tagabana'
-- 'rafi/vim-tinycomment'
-- 'rafi/vim-tinyline'
-- 'rafi/vim-unite-issue'
-- 'Raimondi/delimitMate'
-- 'rayburgemeestre/phpfolding.vim'
-- 'rcmdnk/vim-markdown'
-- 'rhysd/accelerated-jk'
-- 'rhysd/clever-f.vim'
-- 'scrooloose/nerdtree'
-- 'shawncplus/phpcomplete.vim'
-- 'Shougo/deoplete.nvim'
-- 'Shougo/echodoc.vim'
-- 'Shougo/junkfile.vim'
-- 'Shougo/neco-syntax'
-- 'Shougo/neco-vim'
-- 'Shougo/neocomplete'
-- 'Shougo/neoinclude.vim'
-- 'Shougo/neomru.vim'
-- 'Shougo/neopairs.vim'
-- 'Shougo/neosnippet.vim'
-- 'Shougo/neossh.vim'
-- 'Shougo/unite-build'
-- 'Shougo/unite-outline'
-- 'Shougo/unite.vim'
-- 'Shougo/vimfiler.vim'
-- 'Shougo/vimproc.vim'
-- 'Shougo/vinarise.vim'
-- 'sotte/presenting.vim'
-- 'StanAngeloff/php.vim'
-- 't9md/vim-choosewin'
-- 'tacroe/unite-mark'
-- 'Tagbar'
-- 'ternjs/tern_for_vim'
-- 'terryma/vim-expand-region'
-- 'thinca/vim-guicolorscheme'
-- 'thinca/vim-localrc'
-- 'thinca/vim-prettyprint'
-- 'thinca/vim-quickrun'
-- 'thinca/vim-unite-history'
-- 'tsukkee/unite-tag'
-- 'tyru/caw.vim'
-- 'ujihisa/unite-colorscheme'
-- 'vim-ruby/vim-ruby'
-- 'vimwiki/vimwiki'
-- 'xolox/vim-misc'
-- 'xolox/vim-notes'
+## Included plugins
+
+### Non Lazy-Loaded Plugins
+Name              | Description
+----------------- | -----------------------
+[neobundle] | Package manager
+[vimproc] | Interactive command execution
+[cursorword] | Underlines rod under cursor
+[gitbranch] | Lightweight git branch detection
+[gitgutter] | Shows git diffs in the gutter
+[signature] | Place, toggle and display marks
+[indent-guides] | Visually displaying indent levels
+[session] | Handle vim sessions
+[vim-startify] | Start screen with bookmarks
+[nerdtree] | Tree file browser
+[vim-notes] | Notes handling
+[colorschemes] | Awesome color-schemes
+[file-line] | Allow opening a file in a given line
+[neomru] | MRU source for Unite
+[tinyline] | Tiny great looking statusline
+[tagabana] | Central location for all tags
+[bookmarks] | Bookmarks, works independently from vim marks
+[tmux-navigator] | Seamless navigation between tmux panes and vim splits
+[localrc] | Enable configuration file of each directory
+[tagbar] | Display tags of the current file
+
+
+### Lazy-Loaded plugins
+
+#### Languages
+Name           | Description
+-------------- | ----------------------
+[html5] | HTML5 omnicomplete and syntax
+[mustache] | Mustache and handlebars syntax
+[markdown] | Markdown syntax highlighting
+[ansible-yaml] | Additional support for Ansible
+[jinja] | Jinja support in vim
+[less] | Syntax for LESS
+[css3-syntax] | CSS3 syntax support to vim's built-in `syntax/css.vim`
+[csv] | Handling column separated data
+[pep8-indent] | Nicer Python indentation
+[logstash] | Highlights logstash configuration files
+[tmux] | vim plugin for tmux.conf
+[json] | Better JSON support
+[toml] | Syntax for TOML
+[i3] | i3 window manager config syntax
+[Dockerfile] | syntax and snippets for Dockerfile
+[go] | Go development
+[jedi-vim] | Python jedi autocompletion library
+[ruby] | Ruby configuration files
+[portfile] | Macports portfile configuration files
+[javascript] | Enhanced Javascript syntax
+[javascript-indent] | Javascript indent script
+[tern] | Provides Tern-based JavaScript editing support
+[php] | Up-to-date PHP syntax file
+[phpfold] | PHP folding
+[phpcomplete] | Improved PHP omnicompletion
+[phpindent] | PHP official indenting
+[phpspec] | PhpSpec integration
+
+#### Commands
+Name           | Description
+-------------- | ----------------------
+[vimfiler] | Powerful file explorer
+[tinycomment] | Robust but light-weight commenting
+[vinarise] | Hex editor
+[syntastic] | Syntax checking hacks
+[gita] | An awesome git handling plugin
+[gista] | Manipulate gists in Vim
+[undotree] | Ultimate undo history visualizer
+[incsearch] | Improved incremental searching
+[expand-region] | Visually select increasingly larger regions of text
+[open-browser] | Open URI with your favorite browser
+[prettyprint] | Pretty-print vim variables
+[quickrun] | Run commands quickly
+[ref] | Integrated reference viewer
+[dictionary] | Dictionary.app interface
+[vimwiki] | Personal Wiki for Vim
+[thesaurus] | Look up words in an online thesaurus
+[goyo] | Distraction-free writing
+[limelight] | Hyperfocus-writing
+[matchit] | Intelligent pair matching
+[indentline] | Display vertical indention lines
+[choosewin] | Choose window to use, like tmux's 'display-pane'
+[session] | Extended session management
+
+#### Completion
+Name           | Description
+-------------- | ----------------------
+[delimitmate] | Insert mode auto-completion for quotes, parens, brackets
+[echodoc] | Print objects' documentation in echo area
+[deoplete] | Neovim: Dark powered asynchronous completion framework
+[neocomplete] | Next generation completion framework
+[neosnippet] | Contains neocomplete snippets source
+
+#### Unite
+Name           | Description
+-------------- | ----------------------
+[unite] | Unite and create user interfaces
+[unite-colorscheme] | Browse colorschemes
+[unite-filetype] | Select file type
+[unite-history] | Browse history of command/search
+[unite-build] | Build with Unite interface
+[unite-outline] | File "outline" source for unite
+[unite-tag] | Tags source for Unite
+[unite-quickfix] | Quickfix source for Unite
+[neossh] | SSH interface for plugins
+[unite-pull-request] | GitHub pull-request source for Unite
+[junkfile] | Create temporary files for memo and testing
+[unite-issue] | Issue manager for JIRA and GitHub
+
+#### Operators & Text Objects
+Name           | Description
+-------------- | ----------------------
+[operator-user] | Define your own operator easily
+[operator-replace] | Operator to replace text with register content
+[operator-surround] | Operator to enclose text objects
+[textobj-user] | Create your own text objects
+[textobj-multiblock] | Handle multiple brackets objects
+
+[vim-notes]: https://github.com/xolox/vim-notes/
+[vim-presenting]: https://github.com/sotte/presenting.vim/
+[vim-startify]: https://github.com/mhinz/vim-startify/
+[signature]: https://github.com/kshenoy/vim-signature
+[neobundle]: https://github.com/Shougo/neobundle.vim
+[vimproc]: https://github.com/Shougo/vimproc.vim
+[colorschemes]: https://github.com/rafi/awesome-vim-colorschemes
+[file-line]: https://github.com/bogado/file-line
+[neomru]: https://github.com/Shougo/neomru.vim
+[cursorword]: https://github.com/itchyny/vim-cursorword
+[gitbranch]: https://github.com/itchyny/vim-gitbranch
+[gitgutter]: https://github.com/airblade/vim-gitgutter
+[bookmarks]: https://github.com/MattesGroeger/vim-bookmarks
+[tmux-navigator]: https://github.com/christoomey/vim-tmux-navigator
+[tinyline]: https://github.com/rafi/vim-tinyline
+[tagabana]: https://github.com/rafi/vim-tagabana
+
+[html5]: https://github.com/othree/html5.vim
+[mustache]: https://github.com/mustache/vim-mustache-handlebars
+[markdown]: https://github.com/rcmdnk/vim-markdown
+[ansible-yaml]: https://github.com/chase/vim-ansible-yaml
+[jinja]: https://github.com/mitsuhiko/vim-jinja
+[less]: https://github.com/groenewege/vim-less
+[css3-syntax]: https://github.com/hail2u/vim-css3-syntax
+[csv]: https://github.com/chrisbra/csv.vim
+[pep8-indent]: https://github.com/hynek/vim-python-pep8-indent
+[logstash]: https://github.com/robbles/logstash.vim
+[tmux]: https://github.com/tmux-plugins/vim-tmux
+[json]: https://github.com/elzr/vim-json
+[toml]: https://github.com/cespare/vim-toml
+[i3]: https://github.com/PotatoesMaster/i3-vim-syntax
+[Dockerfile]: https://github.com/ekalinin/Dockerfile.vim
+[go]: https://github.com/fatih/vim-go
+[jedi-vim]: https://github.com/davidhalter/jedi-vim
+[ruby]: https://github.com/vim-ruby/vim-ruby
+[portfile]: https://github.com/jstrater/mpvim
+
+[javascript]: https://github.com/jelera/vim-javascript-syntax
+[javascript-indent]: https://github.com/jiangmiao/simple-javascript-indenter
+[tern]: https://github.com/marijnh/tern_for_vim
+
+[php]: https://github.com/StanAngeloff/php.vim
+[phpfold]: https://github.com/rayburgemeestre/phpfolding.vim
+[phpcomplete]: https://github.com/shawncplus/phpcomplete.vim
+[phpindent]: https://github.com/2072/PHP-Indenting-for-VIm
+[phpspec]: https://github.com/rafi/vim-phpspec
+
+[vimfiler]: https://github.com/Shougo/vimfiler.vim
+[tinycomment]: https://github.com/rafi/vim-tinycomment
+[vinarise]: https://github.com/Shougo/vinarise.vim
+[syntastic]: https://github.com/scrooloose/syntastic
+[gita]: https://github.com/lambdalisue/vim-gita
+[gista]: https://github.com/lambdalisue/vim-gista
+[undotree]: https://github.com/mbbill/undotree
+[incsearch]: https://github.com/haya14busa/incsearch.vim
+[expand-region]: https://github.com/terryma/vim-expand-region
+[open-browser]: https://github.com/tyru/open-browser.vim
+[prettyprint]: https://github.com/thinca/vim-prettyprint
+[quickrun]: https://github.com/thinca/vim-quickrun
+[ref]: https://github.com/thinca/vim-ref
+[dictionary]: https://github.com/itchyny/dictionary.vim
+[vimwiki]: https://github.com/vimwiki/vimwiki
+[thesaurus]: https://github.com/beloglazov/vim-online-thesaurus
+
+[goyo]: https://github.com/junegunn/goyo.vim
+[limelight]: https://github.com/junegunn/limelight.vim
+[matchit]: http://www.vim.org/scripts/script.php?script_id=39
+[indentline]: https://github.com/Yggdroot/indentLine
+[choosewin]: https://github.com/t9md/vim-choosewin
+[session]: https://github.com/xolox/vim-session
+
+[delimitmate]: https://github.com/Raimondi/delimitMate
+[echodoc]: https://github.com/Shougo/echodoc.vim
+[deoplete]: https://github.com/Shougo/deoplete.nvim
+[neocomplete]: https://github.com/Shougo/neocomplete.vim
+[neosnippet]: https://github.com/Shougo/neosnippet.vim
+
+[unite]: https://github.com/Shougo/unite.vim
+[unite-colorscheme]: https://github.com/ujihisa/unite-colorscheme
+[unite-filetype]: https://github.com/osyo-manga/unite-filetype
+[unite-history]: https://github.com/thinca/vim-unite-history
+[unite-build]: https://github.com/Shougo/unite-build
+[unite-outline]: https://github.com/h1mesuke/unite-outline
+[unite-tag]: https://github.com/tsukkee/unite-tag
+[unite-quickfix]: https://github.com/osyo-manga/unite-quickfix
+[neossh]: https://github.com/Shougo/neossh.vim
+[unite-pull-request]: https://github.com/joker1007/unite-pull-request
+[junkfile]: https://github.com/Shougo/junkfile.vim
+[unite-issue]: https://github.com/rafi/vim-unite-issue
+
+[operator-user]: https://github.com/kana/vim-operator-user
+[operator-replace]: https://github.com/kana/vim-operator-replace
+[operator-surround]: https://github.com/rhysd/vim-operator-surround
+[textobj-user]: https://github.com/kana/vim-textobj-user
+[textobj-multiblock]: https://github.com/osyo-manga/vim-textobj-multiblock
+[indent-guides]: https://github.com/nathanaelkane/vim-indent-guides
+[nerdtree]: https://github.com/scrooloose/nerdtree
+[localrc]: https://github.com/thinca/vim-localrc
+[tagbar]: https://github.com/vim-scripts/Tagbar

config/neobundle.vim

@@ -20,7 +20,7 @@ NeoBundle 'xolox/vim-misc'  " required by 'xolox/vim-notes'
 NeoBundle 'xolox/vim-notes'
 NeoBundle 'Tagbar'
 NeoBundle 'scrooloose/nerdtree'
-NeoBundle 'xolo/vim-session'
+NeoBundle 'xolox/vim-session'
 NeoBundle 'mhinz/vim-startify'
 
 

config/plugins.vim

@@ -676,7 +676,7 @@ endif
 "}}}
 
 if neobundle#tap('vim-notes') "{{{
-	let g:notes_directories = ['~/Dropbox/Notes', '~/Dropbox/Shared.Notes']
+	let g:notes_directories = ['~/.cache/vim/notes']
 	call neobundle#untap()
 endif "}}}