From 6258df971a00f175cd434e7874c6ba5616b50e60 Mon Sep 17 00:00:00 2001
From: Marc Vertes <mvertes@free.fr>
Date: Sat, 18 Dec 2021 11:37:10 +0100
Subject: update

---
 .backupignore    |  3 +++
 .vimrc           | 36 +++++++++++++++++-------------------
 bin/backup       |  3 +--
 bin/backup-clean | 11 ++++++++---
 4 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/.backupignore b/.backupignore
index ade7961..0a92520 100644
--- a/.backupignore
+++ b/.backupignore
@@ -3,3 +3,6 @@
 CacheStorage/
 go/pkg/
 gopath/pkg/
+sigfox/vm/
+nvlib/
+dvlib/
diff --git a/.vimrc b/.vimrc
index 1380fe8..8972385 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,14 +1,14 @@
+" General vim defaults
 " set background=
-"set t_te= t_ti= laststatus=2
 set t_te= t_ti= ls=1 ruler
-
+set ai ts=4 sw=4 noet
 syntax off
 filetype on
 filetype plugin on
 filetype plugin indent on
 let mapleader = ","
 
-" set rtp+=/opt/homebrew/opt/fzf
+"set rtp+=/opt/homebrew/opt/fzf
 let g:fzf_preview = 'cat {}'
 
 " vimki plugin
@@ -18,14 +18,17 @@ autocmd filetype vimki set autowrite
 autocmd filetype vimki nmap <leader>z :FZF ~/Wiki<CR>
 
 " vim-go plugin
-let g:go_def_mode = "gopls"
-let g:go_info_mode = "gopls"
-let g:go_list_type = "quickfix"
-" let g:go_fmt_command = "goimports"
-let g:go_fmt_command = "gopls"
-let g:go_gopls_gofumpt = 1
+"let g:go_def_mode = "gopls"
+"let g:go_info_mode = "gopls"
+"let g:go_list_type = "quickfix"
+"let g:go_fmt_command = "gopls"
+"let g:go_gopls_gofumpt = 1
+
+let g:go_gopls_enabled = 0
+let g:go_def_mode = "godef"
+let g:go_fmt_command = "goimports"
 let g:go_metalinter_command = "golangci-lint"
-autocmd FileType go syntax on
+"autocmd FileType go syntax on
 autocmd FileType go nmap <leader>b <Plug>(go-build)
 autocmd FileType go nmap <leader>i <Plug>(go-info)
 autocmd FileType go nmap <leader>r <Plug>(go-run)
@@ -35,21 +38,15 @@ autocmd FileType go nmap <leader>v <Plug>(go-referrers)
 autocmd FileType go nmap <leader>n :cnext<CR>
 autocmd FileType go nmap <leader>p :cprevious<CR>
 autocmd FileType go nmap <leader>a :cclose<CR>
-autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
+" autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
 
 let g:netrw_browsex_viewer = "open"
 let g:netrw_gx = "<cWORD>"
 let g:netrw_banner = 0
 
-autocmd filetype javascript,html,json,yaml set ts=2 sts=2 sw=2 et
+" python and yaml formatting:
+autocmd filetype python,yaml set ts=2 sts=2 sw=2 et
 
-" :set wm=2 linebreak
-" :set term=ansi
-":set modeline
-":set modelines=5
-set autoindent
-"set breakindent
-" :set ts=2 sw=2 sts=2 et
 :set wrap
 :set linebreak
 :set nolist
@@ -79,3 +76,4 @@ noremap <leader>n :bn<cr>
 noremap <leader><leader> :bd<cr>
 noremap <leader>o :!open <cWORD>&<cr><cr>
 noremap  <C-g> :tag <c-r><c-w><cr>
+noremap <C-p> :Files<cr>
diff --git a/bin/backup b/bin/backup
index 3964927..d682849 100755
--- a/bin/backup
+++ b/bin/backup
@@ -42,6 +42,5 @@ esac
 
 date=$(date +%Y-%m-%d-%H%M%S)
 
-[ "$optv" ] && echo "# Backup $volumes to $BACKUP/$date"
-
+echo "# Backup $volumes to $BACKUP/$date"
 exec rsync -HSxa$optv $ignore $opt_link $volumes "$BACKUP/$date"
diff --git a/bin/backup-clean b/bin/backup-clean
index 1c752d9..34e6d97 100755
--- a/bin/backup-clean
+++ b/bin/backup-clean
@@ -33,7 +33,7 @@ host=${BACKUP%:*} dir=${BACKUP#*:}
 ls='ls -r' rm="xargs -r $optv $optn rm -rf"
 [ "$host" = "$dir" ] || ls="ssh $host $ls" rm="ssh $host $rm"
 
-[ "$optv" ] && echo "# Cleaning backups on $BACKUP"
+echo "# Cleaning backups on $BACKUP"
 
 $ls "$dir" |
 awk -v now=$(date +%Y-%m-%d) -v dir="$dir" '
@@ -48,11 +48,16 @@ BEGIN {
 	db = substr($0, 9, 2)  # Day backup
 	$0 = dir "/" $0
 
-	if (yb != yn) {
+	dy = yn - yb
+	dm = dy * 12 + mn - mb
+	# if (yb != yn) {
+	if (dm > 12) {
 		if (yb in yearly) print; else yearly[yb] = 1
 		next
 	}
-	if (mb != mn) {
+	# if (mb != mn) {
+	dd = dm * 30 + dn - db
+	if (dd > 30) {
 		if (mb in monthly) print; else monthly[mb] = 1
 		next
 	}
-- 
cgit v1.2.3