From 34835caf4899c1c73ccf88285626f3212e4c5f27 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Wed, 14 Mar 2018 11:38:51 -0400 Subject: [PATCH] Normalize comment style a bit --- vim/config/keyboard.vim | 10 +++------- vim/config/plugins/lightline.vim | 4 ++-- vim/config/plugins/tabular.vim | 8 ++++---- vim/config/vimpager.vim | 20 ++++++++++---------- vimrc | 18 +++++++++--------- 5 files changed, 28 insertions(+), 32 deletions(-) diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim index 55dac2a..8dd5c35 100644 --- a/vim/config/keyboard.vim +++ b/vim/config/keyboard.vim @@ -9,10 +9,7 @@ " " "============================================================" " -" Note: -" *The default key is: \ -" -" Aliases: +"Aliases: " :GitLog & :gitlog | (C) -> show a navigatable log of commit history " :GitDiff & :gitdiff | (C) -> current file and last commit in vimdiff " :GitStatus & :gitstatus | (C) -> shows the output of git status @@ -31,7 +28,7 @@ " :ik | (C) -> add following character to keywords " :iK | (C) -> remove following character from keywords " -" Mappings: +"Mappings: " (mouse) " | (A) -> scroll right " | (A) -> scroll right @@ -248,7 +245,7 @@ " | (I) -> undo-able equivalent " | (I) -> undo-able equivalent " -" Filetype Specific Mappings: +"Filetype Specific Mappings: " (extradite) " | (A) -> close the dialog " | (A) -> close the dialog @@ -302,7 +299,6 @@ " | (A) -> map to h, which goes up one directory " ' | (A) -> edit the selected file " n | (A) -> start editing a new file -" "DISABLED DEFAULT MAPPING: UNSET SHORTCUTS {{{ "-unmapping tabbing from < and > for use with diff diff --git a/vim/config/plugins/lightline.vim b/vim/config/plugins/lightline.vim index a5a1445..53d8ab8 100644 --- a/vim/config/plugins/lightline.vim +++ b/vim/config/plugins/lightline.vim @@ -27,7 +27,7 @@ endfunction function! LLFugitive() try if expand('%:t') !~? 'Tagbar\|Gundo' && &ft !~? 'vimfiler' && exists('*fugitive#head') - let mark = '' " edit here for cool mark + let mark = '' "edit here for cool mark let _ = fugitive#head() return strlen(_) ? mark._ : '' endif @@ -62,7 +62,7 @@ endfunction let g:tagbar_status_func = 'TagbarStatusFunc' function! TagbarStatusFunc(current, sort, fname, ...) abort - let g:lightline.fname = 'tags' "a:fname + let g:lightline.fname = 'tags' return lightline#statusline(0) endfunction diff --git a/vim/config/plugins/tabular.vim b/vim/config/plugins/tabular.vim index bda2082..98a2a56 100644 --- a/vim/config/plugins/tabular.vim +++ b/vim/config/plugins/tabular.vim @@ -1,7 +1,7 @@ -" This Tabular TableFormat() function is taken from the -" vim-markdown project by plasticboy, which can be found -" at https://github.com/plasticboy/vim-markdown and is -" licensed with the MIT license. +"This Tabular TableFormat() function is taken from the +"vim-markdown project by plasticboy, which can be found +"at https://github.com/plasticboy/vim-markdown and is +"licensed with the MIT license. function! s:TableFormat() let l:pos = getpos('.') normal! { diff --git a/vim/config/vimpager.vim b/vim/config/vimpager.vim index 280bd4d..720109b 100644 --- a/vim/config/vimpager.vim +++ b/vim/config/vimpager.vim @@ -9,7 +9,7 @@ " " "============================================================" -" Undo unwanted less.vim keymappings +"Undo Unwanted Keymappings: map v noremap w noremap @@ -17,7 +17,7 @@ noremap noremap noremap -" Main Settings: +"Main Settings: set nocursorline nocursorcolumn "disable cursor column/line highlighting set nofoldenable "disable the fold column set noru laststatus=0 noshowmode "remove statusline @@ -29,11 +29,11 @@ autocmd CursorHold * checktime "use CursorHold events to trigger checktime set conceallevel=2 "enable the conceal feature to hide unnecessary elements set concealcursor=n "conceal text in the cursor line while in normal mode -" Override Filetypes: +"Override Filetypes: runtime bundle.pager/vim-markdown-concealed/ftdetect/mkdc.vim -" Mappings: -" Mouse +"Mappings: +"mouse map map map @@ -43,7 +43,7 @@ noremap 4zh noremap zl noremap zh -" Movement +"movement noremap 0 noremap noremap $ @@ -63,7 +63,7 @@ noremap G$ noremap $ noremap ^ -" Copy/Paste +"copy/paste nnoremap y vy vnoremap y y nnoremap y @@ -71,19 +71,19 @@ vnoremap y nnoremap T vg_y vnoremap T g_y -" Search +"search map / (incsearch-forward) map ? (incsearch-backward) map g/ (incsearch-stay) nnoremap // ':noh' -" Selection +"selection nnoremap gg0vG$ xnoremap gg0vG$ nnoremap a gg0vG$ xnoremap a gg0vG$ -" Toggles +"toggles nnoremap ':set wrap!:echo "line wrapping toggled"' xnoremap ':set wrap!gv' nnoremap ':set spell!:echo "spell checking toggled"' diff --git a/vimrc b/vimrc index 37a659f..288eb23 100644 --- a/vimrc +++ b/vimrc @@ -10,12 +10,12 @@ "============================================================" "darkcloud vim config folder path: {{{ - " if you want to use darkcloud-vimconfig as a package without symlinking - " the vim folder or placing it @ /etc/darkcloud-vimconfig, create a file - " @ ~/.vim/darkcloud-path.vim and in it place the following, except with - " the path pointing to the cloned repo: + "if you want to use darkcloud-vimconfig as a package without symlinking + "the vim folder or placing it @ /etc/darkcloud-vimconfig, create a file + "@ ~/.vim/darkcloud-path.vim and in it place the following, except with + "the path pointing to the cloned repo: " - " let g:darkcloudpath = "/etc/darkcloud-vimconfig" + "let g:darkcloudpath = "/etc/darkcloud-vimconfig" if filereadable(glob("~/.vim/darkcloud-path.vim")) source ~/.vim/darkcloud-path.vim @@ -29,7 +29,7 @@ let &runtimepath = printf('%s,%s/vim,%s/vim/after',&runtimepath,g:darkcloudpath,g:darkcloudpath) "Load Colour Scheme: - colorscheme default " hack to fix vimrc colorschemes in some versions of vim + colorscheme default "hack to fix vimrc colorschemes in some versions of vim colorscheme darkcloud "Load Settings: @@ -38,7 +38,7 @@ "Initialize Plugins: let pathogen_disabled = [] - " configure pythonx and the python_neovim variable to determine whether deoplete should be loaded + "configure pythonx and the python_neovim variable to determine whether deoplete should be loaded if has('python3') set pyxversion=3 @@ -55,7 +55,7 @@ let g:python_neovim = 0 endif - " disable incompatible/unnecessary plugins + "disable incompatible/unnecessary plugins if has('nvim') call add(pathogen_disabled, 'vim-fixkey') endif @@ -75,7 +75,7 @@ call add(pathogen_disabled, 'vim-hug-neovim-rpc') endif - " use pathogen to load plugins that haven't been disabled + "use pathogen to load plugins that haven't been disabled runtime bundle/vim-pathogen/autoload/pathogen.vim "Load Keymappings: