Merge branch 'dev' into gentoo

nvim:
        move require("<plugin>") to plugins.lua

.config/nvim/init.lua

@@ -11,12 +11,3 @@ require("maps")         -- ./lua/maps.lua
 require("statusline")   -- ./lua/statusline.lua
 
 require("polyjuice")    -- ~/.local/src/polyjuice/lua/polyjuice.lua
-
--- auto complete
-require("plugin.cmp")   -- ./lua/plugin/cmp.lua
-
--- treesitter
-require("plugin.treesitter")    -- ./lua/plugin/treesitter.lua
-
--- commenting, done right
-require("plugin.comment")       -- ./lua/plugin/comment.lua

.config/nvim/lua/plugin/comment.lua

@@ -20,27 +20,30 @@ require("Comment").setup {
         ---operator-pending mapping
         ---Includes `gcc`, `gcb`, `gc[count]{motion}` and `gb[count]{motion}`
         basic = true,
+        ---extra mapping
+        ---Includes `gco`, `gcO`, `gcA`
+        extra = true,
         ---extended mapping
         ---Includes `g>`, `g<`, `g>[count]{motion}` and `g<[count]{motion}`
-        extra = false,
+        extended = false,
     },
 
     ---LHS of line and block comment toggle mapping in NORMAL/VISUAL mode
     ---@type table
     toggler = {
         ---line-comment toggle
-        line = 'gcc',
+        line = "<leader><Space>",
         ---block-comment toggle
-        block = 'gbc',
+        block = "<leader>bb",
     },
 
     ---LHS of line and block comment operator-mode mapping in NORMAL/VISUAL mode
     ---@type table
     opleader = {
         ---line-comment opfunc mapping
-        line = 'gc',
+        line = "<leader>c",
         ---block-comment opfunc mapping
-        block = 'gb',
+        block = "<leader>b",
     },
 
     ---Pre-hook, called before commenting the line

.config/nvim/lua/plugins.lua

@@ -27,7 +27,8 @@ return require("packer").startup(function()
         -- tree-sitter
         use {
                 "nvim-treesitter/nvim-treesitter",
-                run = ":TSUpdate"
+                run = ":TSUpdate",
+                config = function() require("plugin.treesitter") end
         }
 
         -- fuzzy finder
@@ -75,11 +76,15 @@ return require("packer").startup(function()
                         "hrsh7th/cmp-calc",
                         "ray-x/cmp-treesitter",
                         "f3fora/cmp-spell"
-                }
+                },
+                config = function() require("plugin.cmp") end
         }
 
         -- commenting, simplified
-        use "numToStr/Comment.nvim"
+        use {
+                "numToStr/Comment.nvim",
+                config = function() require("plugin.comment") end
+        }
 
         -- display colors directly in editor
         use {