diff options
| -rw-r--r-- | .gitmodules | 21 | ||||
| m--------- | .vim/pack/editing/start/Vimacs | 0 | ||||
| m--------- | .vim/pack/set-and-forget/start/vim-sleuth | 0 | ||||
| m--------- | .vim/pack/theming/start/molokai | 0 | ||||
| m--------- | .vim/pack/tooling/start/eslint | 0 | ||||
| m--------- | .vim/pack/ui/start/ctrlp | 0 | ||||
| m--------- | .vim/pack/ui/start/vim-airline | 0 | ||||
| m--------- | .vim/pack/ui/start/vim-airline-themes | 0 | ||||
| -rw-r--r-- | .vim/plugin/vimacs-0.93.vim | 888 | ||||
| -rwxr-xr-x | .vimrc | 14 |
10 files changed, 25 insertions, 898 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..0597e3b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,21 @@ +[submodule ".vim/pack/plugins/start/ctrlp"] + path = .vim/pack/ui/start/ctrlp + url = git@github.com:ctrlpvim/ctrlp.vim.git +[submodule ".vim/pack/plugins/start/vim-airline"] + path = .vim/pack/ui/start/vim-airline + url = git@github.com:vim-airline/vim-airline.git +[submodule ".vim/pack/plugins/start/vim-airline-themes"] + path = .vim/pack/ui/start/vim-airline-themes + url = git@github.com:vim-airline/vim-airline-themes.git +[submodule ".vim/pack/plugins/start/vim-sleuth"] + path = .vim/pack/set-and-forget/start/vim-sleuth + url = git@github.com:tpope/vim-sleuth.git +[submodule ".vim/pack/plugins/start/eslint"] + path = .vim/pack/tooling/start/eslint + url = git@github.com:eslint/eslint.git +[submodule ".vim/pack/theming/molokai"] + path = .vim/pack/theming/start/molokai + url = git@github.com:tomasr/molokai.git +[submodule ".vim/pack/editing/start/Vimacs"] + path = .vim/pack/editing/start/Vimacs + url = git@github.com:vim-scripts/Vimacs.git diff --git a/.vim/pack/editing/start/Vimacs b/.vim/pack/editing/start/Vimacs new file mode 160000 +Subproject f1972e54f22d51aa646277bd9bbbb00a3c3e37e diff --git a/.vim/pack/set-and-forget/start/vim-sleuth b/.vim/pack/set-and-forget/start/vim-sleuth new file mode 160000 +Subproject 1cc4557420f215d02c4d2645a748a816c220e99 diff --git a/.vim/pack/theming/start/molokai b/.vim/pack/theming/start/molokai new file mode 160000 +Subproject c67bdfcdb31415aa0ade7f8c003261700a88547 diff --git a/.vim/pack/tooling/start/eslint b/.vim/pack/tooling/start/eslint new file mode 160000 +Subproject 5c28d9a367e1608e097c491f40b8afd0730a8b9 diff --git a/.vim/pack/ui/start/ctrlp b/.vim/pack/ui/start/ctrlp new file mode 160000 +Subproject 7c972cb19c8544c681ca345c64ec39e04f4651c diff --git a/.vim/pack/ui/start/vim-airline b/.vim/pack/ui/start/vim-airline new file mode 160000 +Subproject ff0f9a45a5d81d2c8aa67601c264b18c4fe26b1 diff --git a/.vim/pack/ui/start/vim-airline-themes b/.vim/pack/ui/start/vim-airline-themes new file mode 160000 +Subproject a9aa25ce323b2dd04a52706f4d1b044f4feb761 diff --git a/.vim/plugin/vimacs-0.93.vim b/.vim/plugin/vimacs-0.93.vim deleted file mode 100644 index 92dfcb1..0000000 --- a/.vim/plugin/vimacs-0.93.vim +++ /dev/null @@ -1,888 +0,0 @@ -""" -"" Vimacs (0.93) -" -" Vim-Improved eMACS -" -" (Oh dear, what have I got myself into?) -" - -" -" Copyright (C) 2002 Andre Pang <ozone@vimacs.cx> -" -" Please see the documentation (vimacs.txt) for the README, installation -" notes, and the ChangeLog. -" - -" -" This program is free software; you can redistribute it and/or modify -" it under the terms of the GNU General Public License as published by -" the Free Software Foundation; either version 2 of the License, or -" (at your option) any later version. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program; if not, write to the Free Software -" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -" -" This General Public License does not permit incorporating your program into -" proprietary programs. If your program is a subroutine library, you may -" consider it more useful to permit linking proprietary applications with the -" library. If this is what you want to do, use the GNU Library General -" Public License instead of this License. -" - -" TODO: :h map-script -" :h cpoptions -" :h mapleader -" :h map-<SID> <SID> -" :h <Plug> -" :h undo? -" :h write-plugin - -" Have <unique> for all maps? - - -" Never load Vimacs if user wants true Vi! (We're not _that_ evil 8) -if v:progname =~ '^vi$' - finish -endif - -if version < 600 - " We require Vim 6 to work :( - echoerr 'Vimacs requires Vim 6 to run :(' - finish -endif - -" We want to be able to remap <> key codes and do line continuation -let s:saved_cpoptions = &cpoptions -set cpoptions-=<,C - - -" Set a default value for a variable only if it doesn't exist -" (like "$foo |= 'bar'" in Perl) -" -" Thanks to Piet Delport for this solution, and Benji Fisher for -" additional comments :) -" - -function! <SID>LetDefault(var_name, value) - if !exists(a:var_name) - execute 'let ' . a:var_name . '=' . a:value - endif -endfunction - -command! -nargs=+ LetDefault call s:LetDefault(<f-args>) - -" Load Vimacs by default -LetDefault g:VM_Enabled 1 - -" Developers may want to turn this on, to always load the file -LetDefault g:VM_Dev 0 - -if g:VM_Enabled == 0 || (exists("loaded_vimacs") && g:VM_Dev == 0) || &cp - finish -endif - - -" -" Function to mark a cursor position and restore it afterward -- used in a few -" functions, like FillParagraph(). Blatantly stolen from foo.vim by Benji -" Fisher :) -" - -function! <SID>Mark(...) - if a:0 == 0 - let mark = line(".") . "G" . virtcol(".") . "|" - normal! H - let mark = "normal!" . line(".") . "Gzt" . mark - execute mark - return mark - elseif a:0 == 1 - return "normal!" . a:1 . "G1|" - else - return "normal!" . a:1 . "G" . a:2 . "|" - endif -endfun - - -" -" It's a good idea to have a command height of at least 2 if showmode is on, -" because many important messages will be overwritten by the mode display. -" e.g. <C-x><C-s>, which saves the file, will display that the file has been -" saved, but the notice will be immediately overwritten by the modeline when -" this happens. -" - -" Don't fork around with cmdheight? -LetDefault g:VM_CmdHeightAdj 1 - -if &cmdheight == 1 && &showmode == 1 && g:VM_CmdHeightAdj - set cmdheight=2 -endif - - -" -" Vim options essential for emulating Emacs-ish behaviour -" - -" Turn off <Alt>/<Meta> pulling down GUI menu -set winaltkeys=no -" Emacs normally wraps everything -set whichwrap=b,s,<,>,h,l,[,],~ -" Emacs always has 'hidden buffers' -set hidden -" Backspace in Emacs normally backspaces anything :) -set backspace=indent,eol,start -" Want to be able to use <Tab> within our mappings -" (This has got to be the coolest option name ever, btw) -set wildcharm=<Tab> -" Recognise key sequences that start with <Esc> in Insert Mode -set esckeys - - -" -" For the UNIX console -- make <Esc>x == <M-x> -" - -" Pressing <M-x> sends <Esc>x? (As Unix terminals often do) -LetDefault g:VM_UnixConsoleMetaSendsEsc 1 - -" One or two <Esc>s required to go back to Normal mode? -LetDefault g:VM_SingleEscToNormal 1 - -if has("unix") && !has("gui_running") && g:VM_UnixConsoleMetaSendsEsc - " <Esc>x maps to <M-x> - set <M-1>=1 - set <M-2>=2 - set <M-3>=3 - set <M-4>=4 - set <M-5>=5 - set <M-6>=6 - set <M-7>=7 - set <M-8>=8 - set <M-9>=9 - set <M-0>=0 - set <M-a>=a - set <M-b>=b - set <M-c>=c - set <M-d>=d - set <M-e>=e - set <M-f>=f - set <M-g>=g - set <M-h>=h - set <M-i>=i - set <M-j>=j - set <M-k>=k - set <M-l>=l - set <M-m>=m - set <M-n>=n - set <M-o>=o - set <M-p>=p - set <M-q>=q - set <M-r>=r - set <M-s>=s - set <M-t>=t - set <M-u>=u - set <M-v>=v - set <M-w>=w - set <M-x>=x - set <M-y>=y - set <M-z>=z - set <M->= - set <M-/>=/ - " Doing "set <M->>=^[>" throws up an error, so we be dodgey and use Char-190 - " instead, which is ASCII 62 ('>' + 128). - set <Char-190>=> - set <M-<>=< - set <M-0>=0 - set <M-%>=% - set <M-*>=* - set <M-.>=. - set <M-^>=^ - " Can't set <M-Space> right now :( - set <M-Space>=^[<Space> - -endif - - -" -" One or two <Esc>s to get back to Normal mode? -" - -" -" Insert mode <-> Normal mode <-> Command mode -" - -inoremap <M-x> <C-o>: -inoremap <M-:> <C-o>: -inoremap <F1> <C-l> -inoremap <F2> <C-o> -inoremap <M-`> <C-o> -inoremap <silent> <C-z> <C-l>:echo "Returning to Normal mode; press <C-z> again to suspend Vimacs"<CR> -nnoremap <C-z> :call <SID>Suspend()<CR> -" M-` isn't defined in Emacs - -inoremap <M-1> <C-o>1 -inoremap <M-2> <C-o>2 -inoremap <M-3> <C-o>3 -inoremap <M-4> <C-o>4 -inoremap <M-5> <C-o>5 -inoremap <M-6> <C-o>6 -inoremap <M-7> <C-o>7 -inoremap <M-8> <C-o>8 -inoremap <M-9> <C-o>9 - -LetDefault g:VM_NormalMetaXRemap 1 - -if g:VM_NormalMetaXRemap == 1 - nnoremap <M-x> : -endif - -function! <SID>Suspend() - suspend! - if &insertmode - startinsert - endif -endfunction - - -" -" Leaving Vim -" - -inoremap <C-x><C-c> <C-o>:confirm qall<CR> - - -" -" Files & Buffers -" - -inoremap <C-x><C-f> <C-o>:hide edit<Space> -inoremap <C-x><C-s> <C-o>:update<CR> -inoremap <C-x>s <C-o>:wall<CR> -inoremap <C-x>i <C-o>:read<Space> -"what does C-x C-v do? -inoremap <C-x><C-w> <C-o>:write<Space> -inoremap <C-x><C-q> <C-o>:set invreadonly<CR> -inoremap <C-x><C-r> <C-o>:hide view<Space> - - -" -" Help Sistemmii (hi Finns) -" -"inoremap <C-h> <C-o>:help - - -" -" Error Recovery -" - -inoremap <C-_> <C-o>u -inoremap <C-x><C-u> <C-o>u -"lots of other stuff :( - - -" -" Incremental Searching and Query Replace -" - -inoremap <C-f> <C-o>:call <SID>StartSearch('/')<CR><C-o>/ -inoremap <C-r> <C-o>:call <SID>StartSearch('?')<CR><C-o>? -inoremap <M-n> <C-o>:cnext<CR> -" <M-n> not in Emacs: next in QuickFix -inoremap <M-p> <C-o>:cprevious<CR> -" <M-p> not in Emacs: previous in QuickFix -inoremap <C-M-f> <C-o>:call <SID>StartSearch('/')<CR><C-o>/ -inoremap <C-M-r> <C-o>:call <SID>StartSearch('?')<CR><C-o>? -inoremap <M-s> <C-o>:set invhls<CR> -inoremap <M-%> <C-o>:call <SID>QueryReplace()()<CR> -inoremap <C-M-%> <C-o>:call <SID>QueryReplace()_regexp()<CR> -cnoremap <C-r> <CR><C-o>?<Up> - -command! QueryReplace :call <SID>QueryReplace()() -command! QueryReplaceRegexp :call <SID>QueryReplace()_regexp() - -" Searching is a bit tricky because we have to emulate Emacs's behaviour of -" searching again when <C-s> or <C-r> is pressed _inside_ the search -" commandline. Vim has no equivalent to this, so we must use a bit of -" on-the-fly remap trickery (popular in Quake-style games) to provide -" different functionality for <C-s>, depending on whether you're in 'search -" mode' or not. -" -" We must map <C-g> and <CR> because we have to undo the map trickery that we -" set up when we abort/finish the search. All in all, it's not too complex -" when you actually look at what the code does. -" -" Note that <C-c> in Emacs is functionally the same as <CR>. - -LetDefault g:VM_SearchRepeatHighlight 0 - -function! <SID>StartSearch(search_dir) - let s:incsearch_status = &incsearch - let s:lazyredraw_status = &lazyredraw - set incsearch - cmap <C-c> <CR> - cnoremap <C-s> <CR><C-o>:call <SID>SearchAgain()<CR><C-o>/<Up> - cnoremap <C-r> <CR><C-o>:call <SID>SearchAgain()<CR><C-o>?<Up> - cnoremap <silent> <CR> <CR><C-o>:call <SID>StopSearch()<CR> - cnoremap <silent> <C-g> <C-c><C-o>:call <SID>AbortSearch()<CR> - cnoremap <silent> <Esc> <C-c><C-o>:call <SID>AbortSearch()<CR> - if a:search_dir == '/' - cnoremap <M-s> <CR><C-o>:set invhls<CR><Left><C-o>/<Up> - else - cnoremap <M-s> <CR><C-o>:set invhls<CR><Left><C-o>?<Up> - endif - let s:before_search_mark = <SID>Mark() -endfunction - -function! <SID>StopSearch() - cunmap <C-c> - cunmap <C-s> - cunmap <C-r> - cunmap <CR> - cunmap <C-g> - cnoremap <C-g> <C-c> - if exists("s:incsearch_status") - let &incsearch = s:incsearch_status - unlet s:incsearch_status - endif - if g:VM_SearchRepeatHighlight == 1 - if exists("s:hls_status") - let &hls = s:hls_status - unlet s:hls_status - endif - endif -endfunction - -function! <SID>AbortSearch() - call <SID>StopSearch() - if exists("s:before_search_mark") - execute s:before_search_mark - unlet s:before_search_mark - endif -endfunction - -function! <SID>SearchAgain() - if g:VM_SearchRepeatHighlight == 1 - if !exists("s:hls_status") - let s:hls_status = &hls - endif - set hls - endif -endfunction - -" Emacs' `query-replace' functions - -function! <SID>QueryReplace() - let magic_status = &magic - set nomagic - let searchtext = input("Query replace: ") - if searchtext == "" - echo "(no text entered): exiting to Insert mode" - return - endif - let replacetext = input("Query replace " . searchtext . " with: ") - let searchtext_esc = escape(searchtext,'/\^$') - let replacetext_esc = escape(replacetext,'/\') - execute ".,$s/" . searchtext_esc . "/" . replacetext_esc . "/cg" - let &magic = magic_status -endfunction - -function! <SID>QueryReplaceRegexp() - let searchtext = input("Query replace regexp: ") - if searchtext == "" - echo "(no text entered): exiting to Insert mode" - return - endif - let replacetext = input("Query replace regexp " . searchtext . " with: ") - let searchtext_esc = escape(searchtext,'/') - let replacetext_esc = escape(replacetext,'/') - execute ".,$s/" . searchtext_esc . "/" . replacetext_esc . "/cg" -endfunction - - -" -" Command line editing -" - -" Navigation -cmap <C-a> <Home> -cmap <C-e> <End> - -" Editing -cmap <M-p> <Up> -cmap <M-n> <Down> -cmap <C-d> <Del> -cnoremap <C-y> <C-r><C-o>" -cnoremap <M-w> <C-y> -" cnoremap <M-BS> <C-w> -cnoremap <C-k> <C-f>d$<C-c><End> -"Should really use &cedit, not just <C-f> -- but how? - - -" -" Navigation -" - -" Insert/Visual/Operator mode maps -imap <C-a> <Home> -vmap <C-a> <Home> -omap <C-a> <Home> -nmap <C-a> <Home> -imap <C-e> <End> -vmap <C-e> <End> -omap <C-e> <End> -nmap <C-e> <End> -inoremap <M-a> <C-o>( -vnoremap <M-a> ( -onoremap <M-a> ( -inoremap <M-e> <C-o>) -vnoremap <M-e> ) -onoremap <M-e> ) -inoremap <C-d> <Del> -vnoremap <C-d> <Del> -onoremap <C-d> <Del> -inoremap <M-<> <C-o>1G<C-o>0 -vnoremap <M-<> 1G0 -onoremap <M-<> 1G0 -inoremap <M->> <C-o>G<C-o>$ -vnoremap <M->> G$ -onoremap <M->> G$ -inoremap <C-v> <PageDown> -vnoremap <C-v> <PageDown> -onoremap <C-v> <PageDown> -inoremap <M-v> <PageUp> -vnoremap <M-v> <PageUp> -onoremap <M-v> <PageUp> -inoremap <M-m> <C-o>^ -vnoremap <M-m> ^ -onoremap <M-m> ^ -inoremap <C-x>= <C-g> -vnoremap <C-x>= <C-g> -onoremap <C-x>= <C-g> -inoremap <silent> <M-g> <C-o>:call <SID>GotoLine()<CR> -vnoremap <silent> <M-g> :<C-u>call <SID>GotoLine()<CR> -onoremap <silent> <M-g> :call <SID>GotoLine()<CR> -" Phear, <M-g> works properly even in Visual/Operator-Pending -" modes :) (It's rather dangerous with the latter, though ...) -inoremap <M-Left> <S-Left> -vnoremap <M-Left> <S-Left> -onoremap <M-Left> <S-Left> -inoremap <M-Right> <S-Right> -vnoremap <M-Right> <S-Right> -onoremap <M-Right> <S-Right> -inoremap <C-Up> <C-o>{ -vnoremap <C-Up> { -onoremap <C-Up> { -inoremap <C-Down> <C-o>} -vnoremap <C-Down> } -onoremap <C-Down> } - -command! GotoLine :call <SID>GotoLine() - -function! <SID>GotoLine() - let targetline = input("Goto line: ") - if targetline =~ "^\\d\\+$" - execute "normal! " . targetline . "G0" - elseif targetline =~ "^\\d\\+%$" - execute "normal! " . targetline . "%" - elseif targetline == "" - echo "(cancelled)" - else - echo " <- Not a Number" - endif -endfunction - -command! GotoLine :call <SID>GotoLine() - - -" -" General Editing -" - -inoremap <C-c> <Space><Left> -inoremap <C-u> <C-o>d0 -inoremap <C-q> <C-v> -inoremap <C-^> <C-y> -inoremap <M-r> <C-r>= - -"" Aborting -cnoremap <C-g> <C-c> -onoremap <C-g> <C-c> - - -" -" Killing and Deleting -" - -inoremap <C-d> <Del> -inoremap <silent> <M-d> <C-r>=<SID>KillWord()<CR> -inoremap <M-> <C-w> -inoremap <M-BS> <C-w> -inoremap <C-BS> <C-w> -inoremap <silent> <C-k> <C-r>=<SID>KillLine()<CR> -" Thanks to Benji Fisher for helping me with getting <C-k> to work! -inoremap <M-0><C-k> <C-o>d0 -inoremap <M-k> <C-o>d) -inoremap <C-x><BS> <C-o>d( -inoremap <M-z> <C-o>dt -inoremap <M-\> <Esc>beldwi - -function! <SID>KillWord() - if col('.') > strlen(getline('.')) - return "\<Del>\<C-o>dw" - else - return "\<C-o>dw" - endif -endfunction - -function! <SID>KillLine() - if col('.') > strlen(getline('.')) - " At EOL; join with next line - return "\<Del>" - else - " Not at EOL; kill until end of line - return "\<C-o>d$" - endif -endfunction - - -" -" Abbreviations -" - -inoremap <M-/> <C-p> -inoremap <C-M-/> <C-x> -inoremap <C-M-x> <C-x> -inoremap <C-]> <C-x> - - -" -" Visual stuff (aka 'marking' aka 'region' aka 'block' etc etc) -" - -set sel=exclusive -" Visual mode -inoremap <silent> <C-Space> <C-r>=<SID>StartVisualMode()<CR> -" Unix terminals produce <C-@>, not <C-Space> -imap <C-@> <C-Space> -vnoremap <C-x><C-Space> <Esc> -vnoremap <C-g> <Esc> -vnoremap <C-x><C-@> <Esc> -vnoremap <M-w> "1y -"May have to change to "1d and paste ... - -" Marking blocks -inoremap <M-Space> <C-o>:call <SID>StartMarkSel()<CR><C-o>viw -inoremap <M-h> <C-o>:call <SID>StartMarkSel()<CR><C-o>vap -inoremap <C-<> <C-o>:call <SID>StartMarkSel()<CR><C-o>v1G0o -inoremap <C->> <C-o>:call <SID>StartMarkSel()<CR><C-o>vG$o -inoremap <C-x>h <C-o>:call <SID>StartMarkSel()<CR><Esc>1G0vGo - -" Block operations -vnoremap <C-w> "1d -vnoremap <S-Del> "_d -vnoremap <C-x><C-x> o -vnoremap <C-x><C-u> U -vnoremap <M-x> : - -" Pasting -inoremap <silent> <C-y> <C-o>:call <SID>ResetKillRing()<CR><C-r><C-o>" -inoremap <S-Ins> <C-r><C-o>* -"inoremap <M-y> <C-o>:echoerr "Sorry, yank-pop is not yet implemented!"<CR> -inoremap <M-y> <C-o>:call <SID>YankPop()<CR> - -function! <SID>YankPop() - undo - if !exists("s:kill_ring_position") - call <SID>ResetKillRing() - endif - execute "normal! i\<C-r>\<C-o>" . s:kill_ring_position . "\<Esc>" - call <SID>IncrKillRing() -endfunction - -function! <SID>ResetKillRing() - let s:kill_ring_position = 3 -endfunction - -function! <SID>IncrKillRing() - if s:kill_ring_position >= 9 - let s:kill_ring_position = 2 - else - let s:kill_ring_position = s:kill_ring_position + 1 - endif -endfunction - -function! <SID>StartMarkSel() - if &selectmode =~ 'key' - set keymodel-=stopsel - endif -endfunction - -function! <SID>StartVisualMode() - call <SID>StartMarkSel() - if col('.') > strlen(getline('.')) - " At EOL - return "\<Right>\<C-o>v\<Left>" - else - return "\<C-o>v" - endif -endfunction - - -" -" Use <Shift> to select text, ala Windows. -" (XEmacs supports this) -" - -" We need to make sure that the 'keymodel' option has stopsel before we -" start the actual marking, so that the user can cancel it with any -" navigational key as she normally would. This is in contrast to the -" <C-Space> style of marking, where navigational keys do _not_ cancel -" marking. -" -" Note that this doesn't work properly if the user remaps - -inoremap <silent> <S-Up> <C-o>:call <SID>StartShiftSel()<CR><S-Up> -inoremap <silent> <S-Down> <C-o>:call <SID>StartShiftSel()<CR><S-Down> -inoremap <silent> <S-Left> <C-o>:call <SID>StartShiftSel()<CR><S-Left> -inoremap <silent> <S-Right> <C-o>:call <SID>StartShiftSel()<CR><S-Right> -inoremap <silent> <S-End> <C-o>:call <SID>StartShiftSel()<CR><S-End> -inoremap <silent> <S-Home> <C-o>:call <SID>StartShiftSel()<CR><S-Home> -inoremap <silent> <S-PageUp> <C-o>:call <SID>StartShiftSel()<CR><S-PageUp> -inoremap <silent> <S-PageDown> <C-o>:call <SID>StartShiftSel()<CR><S-PageDown> - -function! <SID>StartShiftSel() - if &selectmode =~ "key" - set keymodel+=stopsel - endif -endfunction - - -" -" Window Operations -" - -inoremap <C-x>2 <C-o><C-w>s -inoremap <C-x>3 <C-o><C-w>v -inoremap <C-x>0 <C-o><C-w>c -inoremap <C-x>1 <C-o><C-w>o -inoremap <C-x>o <C-o><C-w>w -" <C-x>O is not defined in Emacs ... -inoremap <C-x>O <C-o><C-w>W -inoremap <C-Tab> <C-o><C-w>w -inoremap <C-S-Tab> <C-o><C-w>W -inoremap <C-x>+ <C-o><C-w>= -inoremap <silent> <C-M-v> <C-o>:ScrollOtherWindow<CR> - -inoremap <C-x>4<C-f> <C-o>:FindFileOtherWindow<Space> -inoremap <C-x>4f <C-o>:FindFileOtherWindow<Space> - -function! <SID>number_of_windows() - let i = 1 - while winbufnr(i) != -1 - let i = i + 1 - endwhile - return i - 1 -endfunction - -function! <SID>FindFileOtherWindow(filename) - let num_windows = <SID>number_of_windows() - if num_windows <= 1 - wincmd s - endif - wincmd w - execute "edit " . a:filename - wincmd W -endfunction - -command! -nargs=1 -complete=file FindFileOtherWindow :call <SID>FindFileOtherWindow(<f-args>) - -command! ScrollOtherWindow silent! execute "normal! \<C-w>w\<PageDown>\<C-w>W" - - -" -" Formatting -" - -inoremap <silent> <M-q> <C-o>:call <SID>FillParagraph()<CR> -inoremap <script> <C-o> <CR><Left> -inoremap <C-M-o> <C-o>:echoerr "<C-M-o> not supported yet; sorry!"<CR> -inoremap <C-x><C-o> <C-o>:call <SID>DeleteBlankLines()<CR> -" Try GoZ<Esc>:g/^$/.,/./-j<CR>Gdd -inoremap <M-^> <Up><End><C-o>J -vnoremap <C-M-\> = -vnoremap <C-x><Tab> = - -command! FillParagraph :call <SID>FillParagraph() - -function! <SID>FillParagraph() - let old_cursor_pos = <SID>Mark() - normal! gqip - execute old_cursor_pos -endfunction - -function! <SID>DeleteBlankLines() - if getline(".") == "" || getline(". + 1") == "" || getline(". - 1") == "" - ?^.\+$?+1,/^.\+$/-2d"_" - endif - normal j -endfunction - - - -" -" Case Change -" - -inoremap <M-l> <C-o>gul<C-o>w -inoremap <M-u> <C-o>gUe<C-o>w -inoremap <M-c> <C-o>gUl<C-o>w - - -" -" Buffers -" - -inoremap <C-x>b <C-r>=<SID>BufExplorerOrBufferList()<CR> -inoremap <C-x><C-b> <C-o>:buffers<CR> -inoremap <C-x>k <C-o>:bdelete<Space> - -"" Integration with the BufExplorer plugin. Phear :) (I so love <C-r>=) -function! <SID>BufExplorerOrBufferList() - if exists(":BufExplorer") - if !exists("g:bufExplorerSortBy") - " If user hasn't specified a sort order, default to MRU because that's - " the default in Emacs, and also select the last viewed file. - let g:bufExplorerSortBy = "mru" - endif -" echo bufexplorer_initial_keys - return "\<C-o>:BufExplorer\<CR>" - else - return "\<C-o>:buffer \<Tab>" - endif -endfunction - - -" -" Marks (a.k.a. "Registers" in Emacs) -" - -inoremap <C-x>/ <C-o>:call <SID>PointToRegister()<CR> -inoremap <C-x>r<Space> <C-o>:call <SID>PointToRegister()<CR> -inoremap <C-x>r<C-Space> <C-o>:call <SID>PointToRegister()<CR> -inoremap <C-x>r<C-@> <C-o>:call <SID>PointToRegister()<CR> - -inoremap <C-x>rj <C-o>:call <SID>JumpToRegister()<CR> -inoremap <C-x>p <C-o><C-o> -" <C-x>p not in Emacs -- goes to Previous entry in jump list - -command! PointToRegister :call PointToRegister() -command! JumpToRegister :call JumpToRegister() - -function! <SID>PointToRegister() - echo "Point to mark: " - let c = nr2char(getchar()) - execute "normal! m" . c -endfunction - -function! <SID>JumpToRegister() - echo "Jump to mark: " - let c = nr2char(getchar()) - execute "normal! `" . c -endfunction - - - -" -" Transposing -" - -"" for testing -- foo bar baz quux - -inoremap <C-t> <Left><C-o>x<C-o>p -" M-t behaviour is not exactly the same as Emacs; live with it or send me -" a patch :) (Personally, I find Emacs's M-t behaviour not very -" Do-What-I-Mean'ish anyway) -inoremap <M-t> <Esc>dawbhpi -inoremap <C-x><C-t> <Up><C-o>dd<End><C-o>p<Down> -inoremap <C-M-t> <C-o>:echoerr "C-M-t is not implemented yet; sorry!"<CR> - - -" -" Tags -" - -inoremap <M-.> <C-o><C-]> -inoremap <M-*> <C-o><C-t> -inoremap <C-x>4. <C-o><C-w>} - - -" -" Shells -" - -vnoremap <M-!> ! -inoremap <M-!> <C-o>:! - - -" -" Rectangles -" - -vnoremap <C-x>r <C-v> - - -" -" Abbreviations? -" - - -" -" GNU Info Reader? -" - - -" -" Keyboard Macros -" - - -" -" Redraw -" - -inoremap <C-l> <C-o>zz<C-o><C-l> - - -" -" Enable menus in the console (like GNU Emacs) -" Thanks to Piet Delport for this great idea! -" - -LetDefault g:VM_F10Menu 1 - -if g:VM_F10Menu == 1 - runtime menu.vim - inoremap <F10> <C-o>:emenu <Tab> -endif - - -" -" We're done :) -" - -delcommand LetDefault -delfunction s:LetDefault - -" Restore cpoptions -let &cpoptions = s:saved_cpoptions - -let loaded_vimacs = 1 - -" vim:sw=2 - diff --git a/.vimrc b/.vimrc index fd195a9..4838ee2 100755 --- a/.vimrc +++ b/.vimrc @@ -12,16 +12,10 @@ set nocompatible set encoding=utf-8 -" plugin management -execute pathogen#infect() -set rtp+=~/.vim/bundle/Vundle.vim -call vundle#begin() -Plugin 'VundleVim/Vundle.vim' -Plugin 'vim-airline/vim-airline' -Plugin 'vim-airline/vim-airline-themes' -Plugin 'tpope/vim-sleuth' -Plugin 'eslint/eslint' -call vundle#end() +" plugins should be installed as native vim 8+ packages +" +" git submodule update --init +" ln -s ~/.dotfiles/.vim/pack ~/.vim/pack " <VIM> vim settings ----------------------------- |