diff --git a/README.md b/README.md index 1068321..e209a5d 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ $ podman run --rm -it localhost/dotfiles /bin/ash ## 🖊️ TODO -- [ ] [wayout](https://git.sr.ht/~proycon/wayout) +- [ ] ~~[wayout](https://git.sr.ht/~proycon/wayout)~~ - [ ] Theme bootstraping - [ ] Use Wireplumber lua API for 'volumncontrol' script instead of [pulsemixer](https://github.com/GeorgeFilipkin/pulsemixer) diff --git a/roles/fish/templates/env.j2 b/roles/fish/templates/env.j2 index c797a13..868aa21 100644 --- a/roles/fish/templates/env.j2 +++ b/roles/fish/templates/env.j2 @@ -47,8 +47,8 @@ set -gx PYENV_ROOT $XDG_DATA_HOME/pyenv # common envs set -gx VISUAL nvim set -gx EDITOR $VISUAL -set -gx MANPAGER "nvim +Man!" set -gx PAGER "less -R" +set -gx MANPAGER "nvim +Man!" # make man work for fish's built-in functions set -gx MANPATH :$__fish_data_dir/man:$XDG_DATA_HOME/man diff --git a/roles/nvim/files/nvim/lua/autocmd.lua b/roles/nvim/files/nvim/lua/autocmd.lua index 8a5b19c..2fc8cc5 100644 --- a/roles/nvim/files/nvim/lua/autocmd.lua +++ b/roles/nvim/files/nvim/lua/autocmd.lua @@ -54,7 +54,8 @@ local augroups = { {'BufReadPre', '*', 'lua require("keymap").whichkeyLocal()'}, {'FileType', 'org', 'lua require("keymap").whichkeyOrg()'}, {'FileType', 'html,css', 'lua require("keymap").whichkeyHtml()'}, - {'FileType', 'markdown', 'lua require("keymap").whichkeyMarkdown()'} + {'FileType', 'markdown', 'lua require("keymap").whichkeyMarkdown()'}, + {'FileType', 'man,help', 'lua require("keymap").man_help_disable_keymaps()'} }, plugins = { -- Autohide tabline on dashboard diff --git a/roles/nvim/files/nvim/lua/keymap/init.lua b/roles/nvim/files/nvim/lua/keymap/init.lua index 7a1fc8a..d0094e8 100644 --- a/roles/nvim/files/nvim/lua/keymap/init.lua +++ b/roles/nvim/files/nvim/lua/keymap/init.lua @@ -19,6 +19,14 @@ function M.whichkeyOrg() wk.register(map.org_map, {buffer = vim.api.nvim_get_current_buf()}) end +function M.man_help_disable_keymaps() + vim.api.nvim_command('setlocal nomodifiable') + local keys = {'i', 'I', 'a', 'A', 'o', 'O', 's', 'J'} + for _, key in ipairs(keys) do + vim.api.nvim_buf_set_keymap(0, 'n', key, '', {noremap = true}) + end +end + -- Other mappings -- function M.setup() map.undefined_map()