Merge remote-tracking branch 'origin/main'

nvim/ftplugin/rst.lua

@@ -1,4 +1,4 @@
 -- header shortcuts
-local mapx = require("mapx")
-mapx.nnoremap("<leader>=", "yypv$r=", "silent")
-mapx.nnoremap("<leader>-", "yypv$r-", "silent")
+vim.keymap.set("n", "<leader>=", "yypv$r=", { silent = true })
+vim.keymap.set("n", "<leader>-", "yypv$r-", { silent = true })
+vim.keymap.set("n", "<leader>+", "yypv$r+", { silent = true })

nvim/ftplugin/tmux.lua

@@ -1,6 +1,5 @@
--- local mapx = require("mapx")
---
--- mapx.nnoremap("<leader>s", "<Plug>(tmux_source_file)", { silent = true })
--- mapx.nnoremap("K", "<Plug>(tmux_show_man_floatwin)", { silent = true })
--- mapx.nnoremap("g!!", "<Plug>(tmux_execute_cursorline)", { silent = true })
--- mapx.vnoremap("g!", "<Plug>(tmux_execute_selection)", { silent = true })
+vim.keymap.set("n", "<leader>s", "<Plug>(tmux_source_file)", { silent = true, noremap = true })
+vim.keymap.set("n", "K", "<Plug>(tmux_show_man_floatwin)", { silent = true, noremap = true })
+vim.keymap.set("n", "g!!", "<Plug>(tmux_execute_cursorline)", { silent = true, noremap = true })
+vim.keymap.set("n", "g!", "<Plug>(tmux_execute_selection)", { silent = true, noremap = true })
+

nvim/lua/mappings.lua

@@ -1,5 +1,3 @@
--- local mapx = require("mapx")
-
 -- https://vim.fandom.com/wiki/Map_semicolon_to_colon
 vim.keymap.set("", ";", ":")
 vim.keymap.set("", ";;", ":") -- TODO fix?

zsh_config.sh

@@ -146,7 +146,11 @@ export PS2="> "
 
 # bat
 export BAT_THEME="tokyonight-storm"
-
+export MANPAGER="sh -c 'col -bx | bat -l man -p'"  # use for MAN
+alias bathelp='bat --plain --language=help'
+help() {
+    "$@" --help 2>&1 | bathelp
+}
 ################################################################################
 # Commands and settings
 ################################################################################