From 9cb45314f8ee5781f8cb572b86c58f62e61e677b Mon Sep 17 00:00:00 2001
From: Zev Averbach <zev@averba.ch>
Date: Wed, 6 Oct 2021 11:26:32 +0200
Subject: [PATCH] quite a lot of changes

---
 vimrc | 63 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 49 insertions(+), 14 deletions(-)

diff --git a/vimrc b/vimrc
index 3eeadf8..ba86828 100644
--- a/vimrc
+++ b/vimrc
@@ -1,30 +1,65 @@
+" avoid 'X more file(s) to edit'
+filetype on
 set nocompatible
+set confirm
+
+" prevent the 'no write since last change' message when changing buffers
+set hidden
+
+" Reopen the last edited position in files
+au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
+
 set history
+" undo persists after quit
+set undofile
+set undodir=$HOME/.vim/undo
+
+" italicize comments
+highlight Comment cterm=italic gui=italic
 
 set relativenumber
 " four-space tabs
-filetype plugin indent on
+filetype indent plugin on
+set smartindent
+
 setlocal shiftwidth=2 softtabstop=2 expandtab
-au FileType python setl shiftwidth=4 tabstop=4
-
-" ctrl-s for save
-nnoremap <c-s> :w<cr>
-" save and close
-nnoremap <leader>w :w<cr>:bw<cr>
-
-" buffer nav
-nnoremap <c-h> :bp<cr>
-nnoremap <c-l> :bn<cr>
-
+au FileType python setl softtabstop=4 shiftwidth=4 tabstop=4
 
 let mapleader = "\<Space>"
+ 
+" toggle comment
+nnoremap <c-/> gc
+
+" save all and quit
+nnoremap <leader>q :wa<cr>ZQ
+" save
+nnoremap <c-s> :w<cr>
+" save and close buffer
+nnoremap <leader>w :w<cr>:bw<cr>
+nnoremap <c-h> :bp<cr>
+nnoremap <c-l> :bn<cr>
+" clear highlights
+nnoremap <c-e> :noh<cr>
+nnoremap <leader>p :PlugInstall<cr>
+
+nnoremap <buffer><silent> <leader>f <cmd>call Black()<cr>
+
+" show number of lines in buffer
+nnoremap <leader>l :echo line("$")<cr>
 
 " quickly source vimrc with <space> + s
 nnoremap <leader>s :source ~/.vimrc<cr>
 
-" prevent the 'no write since last change' message when changing buffers
-set hidden
+let g:python3_host_prog = $HOME . '/.local/venv/nvim/bin/python'
+let g:black#settings = {
+    \ 'fast': 1,
+    \ 'line_length': 100
+\}
+
 call plug#begin('~/.vim/plugged')
   Plug 'folke/tokyonight.nvim', { 'branch': 'main' }
+  Plug 'averms/black-nvim', {'do': ':UpdateRemotePlugins'}
+  Plug 'tpope/vim-commentary'
 call plug#end()
+
 colorscheme tokyonight