Merge branch 'main' of git.clustercockpit.org:moebiusband/dotfiles

.chezmoiignore

@@ -1,4 +1,5 @@
 README.md
+.config/nvim/README.md
 LICENSE
 {{ if eq .chezmoi.os "darwin" }}
 .muttrc

dot_config/nvim/after/plugin/hop.lua

@@ -1,14 +0,0 @@
-local ok, hop = pcall(require, 'hop')
-if not ok then
-    return
-end
-
-hop.setup {
-     quit_key = '<SPC>',
-     uppercase_labels = true
-}
-
-local map = vim.keymap.set
-map('n', 'f', function() hop.hint_char1({current_line_only = true }) end, {remap=true})
-map('n', '<leader>s', function() hop.hint_char2() end, {remap=true})
-

dot_config/nvim/init.lua.tmpl

@@ -42,7 +42,7 @@ require "paq" {
     "kylechui/nvim-surround";
     "windwp/nvim-autopairs";
     "numToStr/Comment.nvim";
-    { "phaazon/hop.nvim", branch = "v2" };
+    "ggandor/leap.nvim";
 
     -- Fuzzy search
     { "nvim-telescope/telescope-fzf-native.nvim", run = "gmake" };
@@ -74,6 +74,8 @@ require('nvim-autopairs').setup({
     fast_wrap = {},
 })
 
+require('leap').add_default_mappings()
+
 require 'colorizer'.setup {
     filetypes = {
         'css',
@@ -93,11 +95,11 @@ require('lualine').setup {
 }
 
 require('indent_blankline').setup({
-  char = '▏',
-  show_trailing_blankline_indent = false,
-  show_first_indent_level = false,
-  use_treesitter = true,
-  show_current_context = false
+    char = '▏',
+    show_trailing_blankline_indent = false,
+    show_first_indent_level = false,
+    use_treesitter = true,
+    show_current_context = false
 })
 
 require('toggleterm').setup({
@@ -288,3 +290,5 @@ map('n', '<leader>xx', '<cmd>TroubleToggle<cr>', { noremap = true, silent = true
 map('n', '<leader>xd', '<cmd>TroubleToggle document_diagnostics<cr>', { noremap = true, silent = true })
 map('n', '<leader>xl', '<cmd>TroubleToggle loclist<cr>', { noremap = true, silent = true })
 map('n', '<leader>xq', '<cmd>TroubleToggle quickfix<cr>', { noremap = true, silent = true })
+
+map('n', '<leader>g', '<cmd>vertical rightbelow Git<cr>', { noremap = true, silent = true })