commit 73d9b09e86d7487124e95c9da1e5dd1146ae7e98
parent 90db04a0509d692195afd71f3be215ad0f8e31fd
Author: Riaz <riaz@riazj.com>
Date: Fri, 18 Jul 2025 18:54:37 -0700
Switch from nvim to vis
Diffstat:
4 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
@@ -1,24 +0,0 @@
-set noshowmode noshowcmd nowrap noruler laststatus=0 shortmess+=I
-set clipboard=unnamedplus textwidth=79 wildmode=longest,list,full
-set lazyredraw ignorecase smartcase number relativenumber
-
-imap <C-g> <C-x><C-p>
-imap jk <Esc>
-nmap ; :
-nmap Z :silent! %s/\s\+$//e <bar> x<CR>
-nmap S :%s///g<Left><Left><Left>
-nmap s :setlocal spell! spelllang=en_us<CR>
-nmap ,w :setlocal wrap linebreak textwidth=0 columns=80<CR>
-nmap ,a :0r ~/.local/share/snippets/article.html<CR>4jf>a
-xmap ,p :!sed 's/</\</g; s/>/\>/g'<CR>
-nnoremap c "_c
-
-autocmd InsertEnter * let @/ = "" | normal zz
-autocmd TextChanged,InsertLeave * silent! update
-
-autocmd FileType html imap ;; <Esc>/++<CR>c2l
-autocmd FileType html imap ;t <Esc>lyT>i;;<Esc>pi;;
-autocmd FileType html imap ;p <Esc>o<p></p><Esc>cit
-autocmd FileType html imap ;h2 <Esc>o<h2></h2><CR><p>++</p><Esc>kcit
-autocmd FileType html imap ;a <a href="">++</a>++<Esc>F"i
-autocmd FileType html imap ;l <li></li><Esc>cit
diff --git a/.config/vis/visrc.lua b/.config/vis/visrc.lua
@@ -0,0 +1,31 @@
+require('vis')
+
+vis.events.subscribe(vis.events.INIT, function()
+ vis:map(vis.modes.INSERT, ';;', '<Escape>/\\+\\+<Enter>"_2s')
+ vis:map(vis.modes.INSERT, ';t', '<Escape>lyT>i;;<Escape>pi;;')
+ vis:map(vis.modes.INSERT, ';p', '<Escape>o<p></p><Escape>F<i')
+ vis:map(vis.modes.INSERT, ';r', '<Escape>o<pre></pre><Escape>F<i')
+ vis:map(vis.modes.INSERT, ';h2', '<Escape>o<h2></h2><Escape>F<i')
+
+ vis:map(vis.modes.INSERT, ';l', '<li></li><Escape>F<i')
+ vis:map(vis.modes.INSERT, ';c', '<code></code>++<Escape>F<i')
+ vis:map(vis.modes.INSERT, ';a', '<a href="">++</a>++<Escape>F"i')
+
+ vis:map(vis.modes.NORMAL, ',a', ':0r ~/.local/share/snippets/article.html<Enter>i;;')
+ vis:command('set ignorecase')
+end)
+
+vis.events.subscribe(vis.events.WIN_OPEN, function(win) -- luacheck: no unused args
+ vis:command('set relativenumber')
+ vis:command('set showeof no')
+ vis:command('set breakat " !;:,.?"')
+end)
+
+vis.events.subscribe(vis.events.FILE_SAVE_PRE, function(file, _)
+ local lines = file.lines
+ for i=1, #lines do
+ local trimmed = lines[i]:match('^(.-)%s+$')
+ if trimmed then lines[i] = trimmed end
+ end
+ return true
+end)
diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
@@ -16,4 +16,4 @@ export HISTSIZE=500
export SAVEHIST=500
export LESSHISTFILE=-
export LESS="-iRF"
-export EDITOR="nvim"
+export EDITOR="vis"
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
@@ -2,9 +2,7 @@ setopt hist_ignore_dups
setopt autocd
setopt vi
-bindkey -M viins 'jk' vi-cmd-mode
-
-alias vi="nvim"
+alias vi="vis"
alias grep="grep --color -iI"
alias diff="diff --color=always"
alias copy="xclip -selection clipboard"