From 5bd55a186b8860c3d9e2e9e0af534e81f03159ae Mon Sep 17 00:00:00 2001
From: Marc Vertes <mvertes@free.fr>
Date: Mon, 11 May 2020 11:45:47 +0200
Subject: update

---
 .bashrc |  7 +++----
 .vimrc  | 20 +++++++++++++++-----
 bin/wup |  6 +++---
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.bashrc b/.bashrc
index 07ae13d..1ff58cd 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,6 +1,4 @@
-#
 # ~/.bashrc
-#
 
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
@@ -40,8 +38,8 @@ alias timer='echo "Timer started. Stop with Ctrl-D." && date && time cat && date
 export TERMINAL=xt
 
 alias cl='cf xft:Mono:size=12'
-alias ls='ls --color=auto'
-alias ll='ls -AlFh'
+alias ls='ls --color=auto -v'
+alias ll='ls -AlFhv'
 #alias op='xdg-open'
 alias git='hub'
 #alias go='go1.14.1'
@@ -58,6 +56,7 @@ alias gtb='go test -cpuprofile cpu.out -memprofile mem.out -benchmem -bench'
 alias rvi='sudo vim'
 alias rxt='sudo xt'
 alias rxvi='sudo xvi'
+alias ww='vi ~/Wiki/HomePage'
 
 alias uc='systemctl --user'
 alias wpa='sudo wpa_gui -i wlo1'
diff --git a/.vimrc b/.vimrc
index 7e62657..da3cb13 100644
--- a/.vimrc
+++ b/.vimrc
@@ -3,13 +3,17 @@ set nocp
 filetype plugin on
 
 call plug#begin()
-Plug 'bilalq/lite-dfm'
+"Plug 'bilalq/lite-dfm'
+Plug 'mvertes/vimki'
 Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' }
 call plug#end()
 
 filetype on
 autocmd filetype javascript,html,json,yaml set ts=2 sts=2 sw=2 et
 
+" keep status line
+set laststatus=2
+
 set autowrite
 let mapleader = ","
 let g:go_def_mode = "gopls"
@@ -17,8 +21,12 @@ let g:go_info_mode = "gopls"
 let g:go_list_type = "quickfix"
 let g:go_fmt_command = "goimports"
 let g:go_metalinter_command = "golangci-lint"
-let g:netrw_browsex_viewer = "xdg-open"
-let g:potwiki_autowrite = 1
+
+let g:netrw_browsex_viewer = "open"
+let g:netrw_gx = "<cWORD>"
+let g:netrw_banner = 0
+
+let g:vimki_lower = "a-zàçéèêếëîïñôöùûü"
 
 nnoremap <leader>a :cclose<CR>
 autocmd FileType go nmap <leader>b <Plug>(go-build)
@@ -30,10 +38,11 @@ autocmd FileType go nmap <leader>v <Plug>(go-referrers)
 autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
 
 " :set wm=2 linebreak
-:set term=ansi
+" :set term=ansi
 :set modeline
 :set modelines=5
 set autoindent
+set breakindent
 " :set ts=2 sw=2 sts=2 et
 :set wrap
 :set linebreak
@@ -60,10 +69,11 @@ hi clear SpellBad
 hi SpellBad cterm=underline
 hi SpellBad gui=undercurl
 
+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>
 
-let g:netrw_banner = 0
 "let g:netrw_browsex_viewer = "open"
 "let g:netrw_liststyle = 3
 "let g:netrw_browse_split = 4
diff --git a/bin/wup b/bin/wup
index eec3e85..e10eef4 100755
--- a/bin/wup
+++ b/bin/wup
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/sh -e
 
 # Wiki update
 
-cd ~/Wiki || exit 1
-[ "$(git status --porcelain)" ] && { git add .;  git commit -m update; }
+cd ~/Wiki
+[ "$(git status --porcelain)" ] && git add . && git commit -m update
 git pull
 git push
-- 
cgit v1.2.3