From 793554b5b3cf6be1cd98ce76bebc9c86b3f35033 Mon Sep 17 00:00:00 2001 From: Kyle West Date: Wed, 25 Jan 2012 13:35:34 -0500 Subject: [PATCH 1/6] added function for wrapping text. --- README.md | 4 ++++ vim/plugin/settings/yadr-wrapping.vim | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 vim/plugin/settings/yadr-wrapping.vim diff --git a/README.md b/README.md index 4e46ffc0..3d22e71b 100644 --- a/README.md +++ b/README.md @@ -368,6 +368,10 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke * Cmd-/ - toggle comments (usually gcc from tComment) * gcp (comment a paragraph) + **Wrapping** + + * :Wrap - wrap long lines (e.g. when editing markdown files). + * Cmd-[j, k, $, 0, ^] - navigate display lines. ### Included vim plugins diff --git a/vim/plugin/settings/yadr-wrapping.vim b/vim/plugin/settings/yadr-wrapping.vim new file mode 100644 index 00000000..d1ade1ef --- /dev/null +++ b/vim/plugin/settings/yadr-wrapping.vim @@ -0,0 +1,19 @@ +" http://vimcasts.org/episodes/soft-wrapping-text/ +function! SetupWrapping() + set wrap linebreak nolist + set showbreak=… +endfunction + +command! -nargs=* Wrap :call SetupWrapping() + +vmap gj +vmap gk +vmap g$ +vmap g^ +vmap g^ +nmap gj +nmap gk +nmap g$ +nmap g^ +nmap g^ + From 482006d8b5a9048a9a0909ebe8f9ecedf586bb2b Mon Sep 17 00:00:00 2001 From: Kyle West Date: Wed, 25 Jan 2012 13:37:09 -0500 Subject: [PATCH 2/6] added TODO to have certain file types automatically wrapped. --- vim/plugin/settings/yadr-wrapping.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/vim/plugin/settings/yadr-wrapping.vim b/vim/plugin/settings/yadr-wrapping.vim index d1ade1ef..ac6052e6 100644 --- a/vim/plugin/settings/yadr-wrapping.vim +++ b/vim/plugin/settings/yadr-wrapping.vim @@ -4,6 +4,7 @@ function! SetupWrapping() set showbreak=… endfunction +" TODO: this should happen automatically for certain file types (e.g. markdown) command! -nargs=* Wrap :call SetupWrapping() vmap gj From 4c4938f76985ffd6fa5118f7a505c78c398417a5 Mon Sep 17 00:00:00 2001 From: Kyle West Date: Wed, 25 Jan 2012 13:47:44 -0500 Subject: [PATCH 3/6] organized config files and suggested new naming convention (see settings/README). --- vim/plugin/settings/README.md | 9 +++++++-- .../{skwp-appearance.vim => yadr-appearance.vim} | 0 .../settings/{guioptions.vim => yadr-guioptions.vim} | 0 vim/plugin/settings/{skwp-keymap.vim => yadr-keymap.vim} | 0 .../settings/{statusline.vim => yadr-statusline.vim} | 0 .../settings/{sudo-write.vim => yadr-sudo-write.vim} | 0 ...{whitespace-killer.vim => yadr-whitespace-killer.vim} | 0 .../{window-killer.vim => yadr-window-killer.vim} | 0 8 files changed, 7 insertions(+), 2 deletions(-) rename vim/plugin/settings/{skwp-appearance.vim => yadr-appearance.vim} (100%) rename vim/plugin/settings/{guioptions.vim => yadr-guioptions.vim} (100%) rename vim/plugin/settings/{skwp-keymap.vim => yadr-keymap.vim} (100%) rename vim/plugin/settings/{statusline.vim => yadr-statusline.vim} (100%) rename vim/plugin/settings/{sudo-write.vim => yadr-sudo-write.vim} (100%) rename vim/plugin/settings/{whitespace-killer.vim => yadr-whitespace-killer.vim} (100%) rename vim/plugin/settings/{window-killer.vim => yadr-window-killer.vim} (100%) diff --git a/vim/plugin/settings/README.md b/vim/plugin/settings/README.md index 875d5027..961db938 100644 --- a/vim/plugin/settings/README.md +++ b/vim/plugin/settings/README.md @@ -1,4 +1,9 @@ This directory contains settings for various vim plugins and vim itself. -For cleanliness, each plugin's overrides/settings should be put into a -separate file. +## Plugin Settings + +Each plugin's overrides/settings should be put in a separate file named `{plugin-name}.vim`. + +## Vim Settings + +General vim overrides/settings should be put in a separate file named `yadr-{descriptive-name}.vim`. diff --git a/vim/plugin/settings/skwp-appearance.vim b/vim/plugin/settings/yadr-appearance.vim similarity index 100% rename from vim/plugin/settings/skwp-appearance.vim rename to vim/plugin/settings/yadr-appearance.vim diff --git a/vim/plugin/settings/guioptions.vim b/vim/plugin/settings/yadr-guioptions.vim similarity index 100% rename from vim/plugin/settings/guioptions.vim rename to vim/plugin/settings/yadr-guioptions.vim diff --git a/vim/plugin/settings/skwp-keymap.vim b/vim/plugin/settings/yadr-keymap.vim similarity index 100% rename from vim/plugin/settings/skwp-keymap.vim rename to vim/plugin/settings/yadr-keymap.vim diff --git a/vim/plugin/settings/statusline.vim b/vim/plugin/settings/yadr-statusline.vim similarity index 100% rename from vim/plugin/settings/statusline.vim rename to vim/plugin/settings/yadr-statusline.vim diff --git a/vim/plugin/settings/sudo-write.vim b/vim/plugin/settings/yadr-sudo-write.vim similarity index 100% rename from vim/plugin/settings/sudo-write.vim rename to vim/plugin/settings/yadr-sudo-write.vim diff --git a/vim/plugin/settings/whitespace-killer.vim b/vim/plugin/settings/yadr-whitespace-killer.vim similarity index 100% rename from vim/plugin/settings/whitespace-killer.vim rename to vim/plugin/settings/yadr-whitespace-killer.vim diff --git a/vim/plugin/settings/window-killer.vim b/vim/plugin/settings/yadr-window-killer.vim similarity index 100% rename from vim/plugin/settings/window-killer.vim rename to vim/plugin/settings/yadr-window-killer.vim From 5c06824e03f9b537986876c8126321d508ec2556 Mon Sep 17 00:00:00 2001 From: Kyle West Date: Wed, 25 Jan 2012 14:26:23 -0500 Subject: [PATCH 4/6] simple vimrc customizations. ~/.vimrc.before is loaded before everything. ~/.vimrc.after is loaded after all plugins load. --- README.md | 5 +++++ vim/after/plugin/vimrc_after.vim | 10 ++++++++++ vimrc | 7 +++++++ 3 files changed, 22 insertions(+) create mode 100644 vim/after/plugin/vimrc_after.vim diff --git a/README.md b/README.md index 3d22e71b..9d2e4a11 100644 --- a/README.md +++ b/README.md @@ -453,6 +453,11 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke * sass-status - decorates your status bar with full nesting of where you are in the sass file +### Overriding vim settings + +You may use `~/.vimrc.before` for settings like the __leader__ setting. You may `~/.vimrc.after` for any additional overrides/settings. + + ### Adding your own vim plugins YADR comes with a dead simple plugin manager that just uses git submodules, without any fancy config files. diff --git a/vim/after/plugin/vimrc_after.vim b/vim/after/plugin/vimrc_after.vim new file mode 100644 index 00000000..615d6e69 --- /dev/null +++ b/vim/after/plugin/vimrc_after.vim @@ -0,0 +1,10 @@ +" https://github.com/carlhuda/janus/blob/master/janus/vim/core/janus/after/plugin/vimrc_after.vim +" Customization +" +" This loads after the janus plugins so that janus-specific plugin mappings can +" be overwritten. + +if filereadable(expand("~/.vimrc.after")) + source ~/.vimrc.after +endif + diff --git a/vimrc b/vimrc index 60d2711b..d0f8d958 100644 --- a/vimrc +++ b/vimrc @@ -2,6 +2,12 @@ " This must be first, because it changes other options as a side effect. set nocompatible +" TODO: this may not be in the correct place. It is intended to allow overriding . +" source ~/.vimrc.before if it exists. +if filereadable(expand("~/.vimrc.before")) + source ~/.vimrc.before +endif + " =============== Pathogen Initialization =============== " This loads all the plugins in ~/.vim/bundle " Use tpope's pathogen plugin to manage all other plugins @@ -90,3 +96,4 @@ set wildignore+=*vim/backups* set scrolloff=8 "Start scrolling when we're 8 lines away from margins set sidescrolloff=15 set sidescroll=1 + From 57fb4d0d23c730fa4942428a6947293b9b660ca8 Mon Sep 17 00:00:00 2001 From: Kyle West Date: Wed, 25 Jan 2012 21:09:33 -0500 Subject: [PATCH 5/6] fixed wrapping keymaps so they don't conflict with tabs. --- vim/plugin/settings/yadr-wrapping.vim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim/plugin/settings/yadr-wrapping.vim b/vim/plugin/settings/yadr-wrapping.vim index ac6052e6..35d514c5 100644 --- a/vim/plugin/settings/yadr-wrapping.vim +++ b/vim/plugin/settings/yadr-wrapping.vim @@ -9,12 +9,12 @@ command! -nargs=* Wrap :call SetupWrapping() vmap gj vmap gk -vmap g$ -vmap g^ +vmap g$ +vmap g^ vmap g^ nmap gj nmap gk -nmap g$ -nmap g^ +nmap g$ +nmap g^ nmap g^ From 4dadf56b2eeb7732615d267d5edf2b91165412ca Mon Sep 17 00:00:00 2001 From: Kyle West Date: Wed, 25 Jan 2012 21:19:07 -0500 Subject: [PATCH 6/6] is it possible to have tab 0? I don't think so, so I removed the mapping. --- vim/plugin/settings/yadr-keymap.vim | 2 -- 1 file changed, 2 deletions(-) diff --git a/vim/plugin/settings/yadr-keymap.vim b/vim/plugin/settings/yadr-keymap.vim index fd5d97fd..d648ff41 100644 --- a/vim/plugin/settings/yadr-keymap.vim +++ b/vim/plugin/settings/yadr-keymap.vim @@ -129,7 +129,6 @@ map :tabn 6 map :tabn 7 map :tabn 8 map :tabn 9 -map :tabn 0 " Create window splits easier. The default " way is Ctrl-w,v and Ctrl-w,s. I remap @@ -137,7 +136,6 @@ map :tabn 0 nnoremap vv v nnoremap ss s - "open the taglist (method browser) using ,t nnoremap ,T :TlistToggle