Change sudo to doas

init.vim

@@ -7,6 +7,8 @@ if ! filereadable(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autolo
 	autocmd VimEnter * PlugInstall
 endif
 
+let g:polyglot_disabled = ['markdown']
+
 call plug#begin(stdpath('data') . '/plugged')
 Plug 'rafi/awesome-vim-colorschemes'
 Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
@@ -18,7 +20,9 @@ Plug 'jiangmiao/auto-pairs'
 Plug 'pangloss/vim-javascript'
 Plug 'mattn/emmet-vim'
 Plug 'dylanaraps/wal.vim'
-"Plug 'sheerun/vim-polyglot'
+Plug 'godlygeek/tabular'
+Plug 'plasticboy/vim-markdown'
+Plug 'sheerun/vim-polyglot'
 
 "Plug 'phpactor/phpactor', { 'do': 'composer install', 'for': 'php' }
 "Plug 'ncm2/ncm2'
@@ -51,6 +55,7 @@ set undodir=/tmp// "Store undo history in the /tmp directory
 set undofile "Store the undo history
 "set spell "Enable spell checking
 set autowriteall "Save the file when switching buffers
+set colorcolumn=80,120
 "}}}
 
 " Visuals ---- {{{
@@ -76,8 +81,6 @@ set splitbelow
 set splitright
 
 "We'll set simpler mappings to switch between splits
-nnoremap <C-J> <C-W><C-J>
-nnoremap <C-K> <C-W><C-K>
 nnoremap <C-H> <C-W><C-H>
 nnoremap <C-L> <C-W><C-L>
 " }}}
@@ -130,8 +133,8 @@ nnoremap <Leader>} mzF[`a<cr><Esc>``%i<cr><Esc>`zvi[:s/,\s*/,\r/g<cr>vi[=<Esc>`z
 "A command to properly indent json code
 command! FormatJSON %!python -m json.tool
 
-" Allow saving of files as sudo
-command! W execute 'silent! w !sudo /usr/bin/tee % >/dev/nuull' <Bar> edit!
+" Allow saving of files as doas
+command! W execute 'silent! w !doas /usr/bin/tee % >/dev/null' <Bar> edit!
 
 " }}}
 
@@ -153,6 +156,10 @@ function ToggleEmmet()
     endif
 endfunction
 nnoremap <Leader>em :call ToggleEmmet()<cr>
+
+" Conceal markdown text
+set conceallevel=3
+
 " }}}
 
 " Moving around --- {{{
@@ -161,8 +168,8 @@ nnoremap H ^
 nnoremap L $
 
 "Move a line up or down
-nnoremap <C-j> ddp
-nnoremap <C-k> ddkP
+nnoremap <C-J> ddp
+nnoremap <C-K> ddkP
 " }}}
 
 " Operator mappings --- {{{
@@ -214,9 +221,9 @@ augroup END
 
 "Recompile suckless software when updating config
 augroup suckless
-    autocmd BufWritePost ~/.local/src/dwmblocks/config.h !cd ~/.local/src/dwmblocks/; sudo make install && { killall -q dwmblocks;setsid -f dwmblocks }
-    autocmd BufWritePost ~/.local/src/dwm/config.h !cd ~/.local/src/dwm/; sudo make clean install
-    autocmd BufWritePost ~/.local/src/st/config.h !cd ~/.local/st/dwm/; sudo make clean install
+    autocmd BufWritePost ~/.local/src/dwmblocks/config.h !cd ~/.local/src/dwmblocks/; doas make install && { killall -q dwmblocks;setsid -f dwmblocks }
+    autocmd BufWritePost ~/.local/src/dwm/config.h !cd ~/.local/src/dwm/; doas make clean install
+    autocmd BufWritePost ~/.local/src/st/config.h !cd ~/.local/st/dwm/; doas make clean install
 
 " }}}