From fc4586d657ada7e183811b8b9edecb737f56b624 Mon Sep 17 00:00:00 2001 From: James Dixon Date: Mon, 26 Apr 2021 23:12:27 -0400 Subject: [PATCH] add headings to vim files --- files/vim/.vim/autocmds.vim | 4 +++ files/vim/.vim/commands.vim | 7 +++-- files/vim/.vim/functions.vim | 4 +++ files/vim/.vim/keybinds.vim | 25 ++++++++------- files/vim/.vim/plugins.vim | 6 ++-- files/vim/.vim/settings.vim | 60 ++++++++++++++++++------------------ 6 files changed, 59 insertions(+), 47 deletions(-) diff --git a/files/vim/.vim/autocmds.vim b/files/vim/.vim/autocmds.vim index 5c3c5d1..53c8b23 100644 --- a/files/vim/.vim/autocmds.vim +++ b/files/vim/.vim/autocmds.vim @@ -1,3 +1,7 @@ +"============ +"Autocommands +"============ + if has("autocmd") "global autocmds "----------------- diff --git a/files/vim/.vim/commands.vim b/files/vim/.vim/commands.vim index 14364bf..35147cb 100644 --- a/files/vim/.vim/commands.vim +++ b/files/vim/.vim/commands.vim @@ -1,5 +1,7 @@ -"custom commands -"--------------- +"======== +"Commands +"======== + "common typos and abbreviations cnoremap w!! w !sudo tee % > /dev/null command! W w !sudo tee % > /dev/null @@ -7,4 +9,5 @@ command! Q q command! WQ wq command! Q1 q! +"useful shortcut commands command! Trim %s/\s\+$// diff --git a/files/vim/.vim/functions.vim b/files/vim/.vim/functions.vim index adeb171..8a19cf0 100644 --- a/files/vim/.vim/functions.vim +++ b/files/vim/.vim/functions.vim @@ -1,3 +1,7 @@ +"========= +"Functions +"========= + "toggle functions "---------------- function! ToggleColorColumn() diff --git a/files/vim/.vim/keybinds.vim b/files/vim/.vim/keybinds.vim index 995037b..69c75a3 100644 --- a/files/vim/.vim/keybinds.vim +++ b/files/vim/.vim/keybinds.vim @@ -1,8 +1,14 @@ +"======== +"Keybinds +"======== + "leader key let mapleader=' ' -"normal mode keybinds -"--------------- +"---------------- +"regular keybinds +"---------------- + "paste and search nnoremap :noh :let @/ = "" nnoremap i :set invpaste @@ -18,30 +24,23 @@ nnoremap dt :r !date "rc files nnoremap rc :vsplit $MYVIMRC -nnoremap rcs :vsplit ~/.vim/settings.vim -nnoremap rcf :vsplit ~/.vim/functions.vim -nnoremap rcc :vsplit ~/.vim/commands.vim -nnoremap rck :vsplit ~/.vim/keybinds.vim -nnoremap rcp :vsplit ~/.vim/plugins.vim -nnoremap rca :vsplit ~/.vim/autocmds.vim -nnoremap rcft :vsplit $HOME/.vim/after/ftplugin/ -nnoremap rcl :vsplit ~/.config/vimrc nnoremap so :source $MYVIMRC +nnoremap rcl :vsplit ~/.config/vimrc +nnoremap rcft :vsplit $HOME/.vim/after/ftplugin/ "windows nnoremap cl :close "formatting tools nnoremap =j :%!python -m json.tool -"}}} -"insert mode keybinds -"-------------------- "abbrevations inoreabbrev #!! "#!/usr/bin/env" +"--------------- "plugin keybinds "--------------- + "netrw nnoremap e :call ToggleNetrw() diff --git a/files/vim/.vim/plugins.vim b/files/vim/.vim/plugins.vim index 8a66ed4..81b107a 100644 --- a/files/vim/.vim/plugins.vim +++ b/files/vim/.vim/plugins.vim @@ -1,5 +1,7 @@ -"plugins (vim-plug) -"------------------ +"================== +"Plugins (vim-plug) +"================== + "vim-plug paths let plugDir = expand("$HOME/.vim/autoload/plug.vim") let pluginDir = expand("$HOME/.vim/plugged") diff --git a/files/vim/.vim/settings.vim b/files/vim/.vim/settings.vim index f0bf09e..3b41a92 100644 --- a/files/vim/.vim/settings.vim +++ b/files/vim/.vim/settings.vim @@ -1,34 +1,17 @@ +"================ +"general settings +"================ + "source system defaults -"---------------------- if filereadable(expand('$VIMRUNTIME/defaults.vim')) unlet! g:skip_defaults_vim source $VIMRUNTIME/defaults.vim endif -"general settings -"---------------- "encoding/format set encoding=utf-8 set fileformats=unix,dos,mac -"file/buffer -set autoread -set autowrite -set confirm - -"display -set background=dark -set number -set wrap -set foldmethod=marker -set listchars=tab:→\ ,extends:›,precedes:‹,nbsp:·,space:·,trail:·,eol:¬ -" set list - -"drawing -set lazyredraw -set regexpengine=1 -set redrawtime=10000 - "tab/indent set tabstop=4 set softtabstop=4 @@ -48,20 +31,43 @@ set hlsearch set ignorecase set smartcase +"file/buffer +set autoread +set autowrite +set confirm + "cursor behaviour set virtualedit=block set backspace=indent,eol,start set scrolloff=2 set sidescrolloff=4 +"window behaviour (ltr) +set splitbelow +set splitright + "input/timeout set esckeys set timeoutlen=1000 "for mappings set ttimeoutlen=20 "for keycodes -"window behaviour (ltr) -set splitbelow -set splitright +"drawing +set lazyredraw +set regexpengine=1 +set redrawtime=10000 + +"display +set background=dark +set number +set wrap +set foldmethod=marker +set listchars=tab:→\ ,extends:›,precedes:‹,nbsp:·,space:·,trail:·,eol:¬ +" set list + +"syntax/filetype/matchit +syntax on +filetype plugin indent on +runtime macros/matchit.vim "os/gui settings "--------------- @@ -87,12 +93,6 @@ if has("gui_running") endif endif -"syntax/filetype/matchit -"----------------------- -syntax on -filetype plugin indent on -runtime macros/matchit.vim - "file cleanup "------------ "swap