From ed8d7d31d9e426fb57e9dd21501de30f6aa9e7a1 Mon Sep 17 00:00:00 2001 From: "chawley@hq.overdrive.com (chawley-vm)" Date: Fri, 5 Feb 2021 16:38:28 -0500 Subject: [PATCH 1/4] Added root fuction to shell script template --- .vim/templates/sh | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/.vim/templates/sh b/.vim/templates/sh index ff9a762..861e200 100644 --- a/.vim/templates/sh +++ b/.vim/templates/sh @@ -16,7 +16,15 @@ set -o nounset # Treat unset variables as an error -# Check for empty argument +# set variables +declare -r TRUE=0 +declare -r FALSE=1 + +################################################################## +# Purpose: Check for empty argument +# Arguments: at least one +# Return: Either error message or exit with an error code 1 +################################################################## if [ -z "${1:-}" ]; then arg="undefined" echo "Required Argument Missing" @@ -25,9 +33,11 @@ else arg=$1 fi -# Log Echo: send output to screen and specified file +################################################################## +# Purpose: Send output to screen and specified file +# Requires: define to `logfile` variable to send out put to logfile # Usage: logecho "Log Message" -# define logfile and path to enable logging to file +################################################################## logfile= logecho() { echo "${1}" @@ -35,3 +45,15 @@ logecho() { echo "${1}" >> "${logfile}" fi } + +################################################################## +# Purpose: Return true if script is executed by the root user +# Arguments: none +# Return: True or False +# Usage: is_root && echo "root" || echo "not root" +################################################################## +function is_root() +{ + [ $(id -u) -eq 0 ] && return $TRUE || return $FALSE +} + From 35d965acb1f0b1c8a97bd02668cd4c2b8e87c6b0 Mon Sep 17 00:00:00 2001 From: "phansible (ph-awx)" Date: Wed, 17 Feb 2021 14:11:52 -0500 Subject: [PATCH 2/4] Some new .vimrc fixes --- .vimrc | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/.vimrc b/.vimrc index 547765c..44fe43f 100644 --- a/.vimrc +++ b/.vimrc @@ -35,7 +35,7 @@ filetype plugin on " ==> From Vim Zero: https://www.oliversherouse.com/2017/08/21/vim_zero.html " General -let mapleader = ',' +let mapleader = '\' set hidden " Allow background buffers without saving set splitright " Split to right by default @@ -70,7 +70,6 @@ endif " ...one step above 'nocompatible' mode: a universal set of defaults that (hopefully) everyone can agree on. Plug 'tpope/vim-sensible' - " Syntax highlights for markdown Plug 'tpope/vim-markdown' @@ -84,6 +83,9 @@ Plug 'junegunn/fzf.vim' " fugitive.vim for git Plug 'tpope/vim-fugitive' +" vim.vinegar +Plug 'tpope/vim-vinegar' + " Linter Plug 'dense-analysis/ale' @@ -99,10 +101,10 @@ call plug#end() " ==> Colors " "set termguicolors -"colorscheme slate +colorscheme slate "colorscheme marklar "colorscheme automation -colorscheme advantage +"colorscheme advantage highlight colorcolumn ctermbg=darkgray guibg=darkgray highlight VertSplit ctermbg=black guibg=black ctermfg=darkgray guifg=darkgray @@ -112,7 +114,7 @@ highlight visual cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=wh " In split windows - active buffer status bar is yellow, inactive is black hi statuslinenc ctermbg=gray ctermfg=black -hi statusline ctermbg=black ctermfg=green +hi statusline ctermbg=yellow ctermfg=green " --------------------------------------------------------------------------------------------------------------------- " => Statusline @@ -140,16 +142,22 @@ nnoremap :nohls nnoremap c :set cursorline! cursorcolumn! " --------------------------------------------------------------------------------------------------------------------- -" ==> Keymaps: Buffers +" ==> Keymaps: Buffers & Panes -" -H to move to previous buffer +" -H to move to previous BUFFER nnoremap :bp -" -L to move to next buffer +" -L to move to next BUFFER nnoremap :bn -" comma-w to save buffer -nnoremap w :w -" comma-q to quit buffer -nnoremap q :bd +" -J to move to lower PANE +nnoremap +" -K to move to upper PANE +nnoremap + +" -s to save buffer +nnoremap s :w +" -c to close buffer +nnoremap c :bd + " bring up the copy buffer noremap x "+ " to refresh buffer @@ -197,7 +205,7 @@ imap =strftime("%H:%M") nnoremap :setlocal spell! spelllang=en_us set spell spelllang=en_us " Save custom dictionary in nextcloud so it's available on all machines -set spellfile=/home/chawley/nextcloud-overlook/notes/system/en.utf-8.add +" set spellfile=/home/chawley/nextcloud-overlook/notes/system/en.utf-8.add hi clear SpellBad hi clear SpellCap hi clear SpellErrors @@ -272,6 +280,10 @@ let g:netrw_browse_split = 4 let g:netrw_altv = 1 let g:netrw_winsize = 25 +" NetrwTreeListing readonly fix. (https://vi.stackexchange.com/a/13012) +" Per default, netrw leaves unmodified buffers open. This autocommand +" deletes netrw's buffer once it's hidden (using ':q', for example) +autocmd FileType netrw setl bufhidden=delete " --------------------------------------------------------------------------------------------------------------------- " ==> yaml stuff (https://lornajane.net/posts/2018/vim-settings-for-working-with-yaml) From c0dfe1f06b3023feac475b5a021d91b76eb0e7c1 Mon Sep 17 00:00:00 2001 From: "chawley (ph-awx)" Date: Tue, 23 Feb 2021 16:02:54 -0500 Subject: [PATCH 3/4] Turned off set formatoptions-=ro --- .vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.vimrc b/.vimrc index cecb4db..2a6d6a9 100644 --- a/.vimrc +++ b/.vimrc @@ -38,6 +38,7 @@ filetype plugin on let mapleader = '\' set hidden " Allow background buffers without saving set splitright " Split to right by default +set formatoptions-=ro " Turn off autoinsert of comment char on newline " Text Wrapping set textwidth=120 From c8c097f13c1951e3b4d487c20314c60d051ace74 Mon Sep 17 00:00:00 2001 From: "chawley (ph-bigbrother)" Date: Tue, 23 Feb 2021 17:17:09 -0500 Subject: [PATCH 4/4] Updates templates --- .vim/templates/banner | 2 +- .vim/templates/begend | 4 ++-- .vimrc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.vim/templates/banner b/.vim/templates/banner index 0850daf..a324e41 100644 --- a/.vim/templates/banner +++ b/.vim/templates/banner @@ -1,3 +1,3 @@ # --------------------------------------------------------------------------------------------------------------------- # ==> -# +# diff --git a/.vim/templates/begend b/.vim/templates/begend index beadd3c..3de1835 100644 --- a/.vim/templates/begend +++ b/.vim/templates/begend @@ -1,3 +1,3 @@ -#---- Begin +# Begin -#---- End +# End diff --git a/.vimrc b/.vimrc index 2a6d6a9..ee6fac1 100644 --- a/.vimrc +++ b/.vimrc @@ -226,8 +226,8 @@ autocmd BufRead,BufNewFile *.* setlocal nospell autocmd BufRead,BufNewFile *.md setlocal spell " turn on for text files autocmd BufRead,BufNewFile *.txt setlocal spell - " --------------------------------------------------------------------------------------------------------------------- + " ==> Snippets " Pasting pre-made things