Normalize comment style a bit

This commit is contained in:
Kevin MacMartin 2018-03-14 11:38:51 -04:00
parent 8861aa289f
commit 34835caf48
5 changed files with 28 additions and 32 deletions

View file

@ -9,10 +9,7 @@
" "
"============================================================"
"
" Note:
" *The default <Leader> 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)
" <Ctrl-ScrollUp> | (A) -> scroll right
" <Alt-ScrollUp> | (A) -> scroll right
@ -248,7 +245,7 @@
" <Ctrl-u> | (I) -> undo-able equivalent
" <Ctrl-w> | (I) -> undo-able equivalent
"
" Filetype Specific Mappings:
"Filetype Specific Mappings:
" (extradite)
" <Ctrl-F4> | (A) -> close the dialog
" <Alt-F4> | (A) -> close the dialog
@ -302,7 +299,6 @@
" <Left> | (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

View file

@ -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

View file

@ -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! {

View file

@ -9,7 +9,7 @@
" "
"============================================================"
" Undo unwanted less.vim keymappings
"Undo Unwanted Keymappings:
map v <Nop>
noremap w <S-Right>
noremap <PageDown> <C-F>
@ -17,7 +17,7 @@ noremap <kPageDown> <C-F>
noremap <PageUp> <C-B>
noremap <kPageUp> <C-B>
" 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 <C-ScrollWheelUp> <Nop>
map <C-ScrollWheelDown> <Nop>
map <A-ScrollWheelUp> <Nop>
@ -43,7 +43,7 @@ noremap <C-ScrollWheelDown> 4zh
noremap <A-ScrollWheelUp> zl
noremap <A-ScrollWheelDown> zh
" Movement
"movement
noremap <Home> 0
noremap <kHome> <Home>
noremap <End> $
@ -63,7 +63,7 @@ noremap <S-Down> G$
noremap <S-Right> $
noremap <S-Left> ^
" Copy/Paste
"copy/paste
nnoremap y vy<Esc>
vnoremap y y
nnoremap <C-c> y
@ -71,19 +71,19 @@ vnoremap <C-c> y
nnoremap T vg_y
vnoremap T g_y
" Search
"search
map / <Plug>(incsearch-forward)
map ? <Plug>(incsearch-backward)
map g/ <Plug>(incsearch-stay)
nnoremap <silent><expr> // '<Esc>:noh<CR>'
" Selection
"selection
nnoremap <C-a> gg0vG$
xnoremap <C-a> <Esc>gg0vG$
nnoremap <Leader>a gg0vG$
xnoremap <Leader>a <Esc>gg0vG$
" Toggles
"toggles
nnoremap <silent><expr> <F1> ':set wrap!<CR>:echo "line wrapping toggled"<CR>'
xnoremap <silent><expr> <F1> '<Esc>:set wrap!<CR>gv'
nnoremap <silent><expr> <F2> ':set spell!<CR>:echo "spell checking toggled"<CR>'

18
vimrc
View file

@ -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: