diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua
index 46a49d5..b33b0e6 100644
--- a/lua/core/mappings.lua
+++ b/lua/core/mappings.lua
@@ -9,7 +9,7 @@ end
 local M = {}
 
 M.general = { --{{{
-    i = {--{{{
+    i = { --{{{
 
         ["jk"] = { "<esc>", "escape" },
 
@@ -24,10 +24,10 @@ M.general = { --{{{
         -- luasnip change choice
         ["<C-l>"] = { "<Plug>luasnip-next-choice", "change luasnip choice" },
         -- ["<C-u>"] = { "<cmd>lua require('luasnip.extras.select_choice')()<CR>", "change luasnip choice" },
-    },--}}}
+    }, --}}}
 
-    n = {--{{{
-        ["<ESC>"] = { 
+    n = { --{{{
+        ["<ESC>"] = {
             function()
                 if vim.o.filetype == "qf" then
                     vim.cmd("q")
@@ -51,7 +51,7 @@ M.general = { --{{{
         ["<C-Up>"]    = { "<cmd>res +2 <CR>", "window height +" },
         ["<C-Down>"]  = { "<cmd>res -2 <CR>", "window height -" },
 
-        ["<leader>="] = { "<C-w>=", "adjust viewports "},
+        ["<leader>="] = { "<C-w>=", "adjust viewports " },
 
         -- quit dont save
         ["<leader>qq"] = { "<cmd> quitall! <cr>", "quit/close all windows, don't save" },
@@ -85,9 +85,9 @@ M.general = { --{{{
         -- option toggle cursor line
         ["<BS>l"] = { "<cmd> set cul!<CR>", "toggle line number" },
 
-        ["<BS>c"] = {"<cmd>cclose<CR><cmd>lclose<CR>", "close quickfix"},
+        ["<BS>c"] = { "<cmd>cclose<CR><cmd>lclose<CR>", "close quickfix" },
 
-        ["<BS>d"] = {"<cmd>DelayTrainToggle<CR>", "disable delay train"},
+        ["<BS>d"] = { "<cmd>DelayTrainToggle<CR>", "disable delay train" },
 
 
 
@@ -96,8 +96,8 @@ M.general = { --{{{
 
 
         -- lua source current file
-        ["<leader>."] = {"<cmd> :w | source %<CR>", "save and source script "},
-        ["<leader>rm"] = { function ()
+        ["<leader>."] = { "<cmd> :w | source %<CR>", "save and source script " },
+        ["<leader>rm"] = { function()
             local ok, core = pcall(require, "core")
             if not ok then
                 return
@@ -108,10 +108,10 @@ M.general = { --{{{
             require("plenary.reload").reload_module("core.mappings")
             require("core.utils").load_mappings()
             print("mappings reloaded !")
-        end, "config reload mappings"},
+        end, "config reload mappings" },
 
-        ["<leader>ss"] = { "<cmd> mks! <CR>", "save session"},
-        ["<leader>sl"] = { "<cmd> source Session.vim <CR>", "load session"},
+        ["<leader>ss"] = { "<cmd> mks! <CR>", "save session" },
+        ["<leader>sl"] = { "<cmd> source Session.vim <CR>", "load session" },
 
         ["<leader>tt"] = {
             function()
@@ -146,7 +146,7 @@ M.general = { --{{{
         ["<leader><Tab>"] = { "<cmd> tabe <CR>", "new tab" },
 
 
-        -- Fast tab NOTE:these are used for screen movements 
+        -- Fast tab NOTE:these are used for screen movements
         -- ["<S-H>"] = { "gT", "Previous tab" },
         -- ["<S-L>"] = { "gt", "Previous tab" },
 
@@ -159,8 +159,8 @@ M.general = { --{{{
         },
 
         -- quick close window
-        ["<C-x><C-x>"] = {"<C-w>c", "close window"},
-        
+        ["<C-x><C-x>"] = { "<C-w>c", "close window" },
+
         -- Increase number is with double <C-a> and decrease with simple C-x
 
 
@@ -171,133 +171,133 @@ M.general = { --{{{
 
         -- folding levels
         -- ["<leader>fd"] = { function()
-            --   vim.ui.select({"fold level 0", "1", "2", "3", "4", "5", "6", "7"},
-            --   {
-                --     prompt = "fold lvl: ",
-                --   },
-                --   function(item, idx)
-                    --     P(idx)
-                    --     -- local foldlevel = tonumber(item)
-                    --     -- if foldlevel == nil then P("need number for fold level !") end
-                    --     -- vim.o.foldlevel = foldlevel
-                    --   end)
-                    -- end,
-                    --
-                    -- "set fold level"},
-                    ["<leader>f0"] = { ":set foldlevel=0<CR>", "set fold level" },
-                    ["<leader>f1"] = { ":set foldlevel=1<CR>", "set fold level" },
-                    ["<leader>f2"] = { ":set foldlevel=2<CR>", "set fold level" },
-                    ["<leader>f3"] = { ":set foldlevel=3<CR>", "set fold level" },
-                    ["<leader>f4"] = { ":set foldlevel=4<CR>", "set fold level" },
-                    -- ["<leader>f5"] = { ":set foldlevel=5<CR>", "set fold level" },
-                    -- ["<leader>f6"] = { ":set foldlevel=6<CR>", "set fold level" },
-                    -- ["<leader>f7"] = { ":set foldlevel=7<CR>", "set fold level" },
-                    -- ["<leader>f8"] = { ":set foldlevel=8<CR>", "set fold level" },
-                    -- ["<leader>f9"] = { ":set foldlevel=9<CR>", "set fold level" },
-
-                    ["<leader>tf"] = { "<cmd> set foldmethod=expr<CR>|<cmd> set foldexpr=nvim_treesitter#foldexpr()<CR>",
-                    "enable Treesitter folding"},
-
-                    ["<leader>tp"]=  {
-                        function()
-                            vim.cmd("TSPlaygroundToggle")
-                        end,
-                        "Treesitter playground"
-                    },
-
-                    -- Moving lines around
-                    ["<M-Down>"] = {"<cmd>:m +1<CR>==", "move line up"},
-                    ["<M-Up>"] = {"<cmd>:m .-2<CR>==", "move line up"},
-
-                    -- syntax-tree-surfer
-                    -- visual selection from nomral mode
-                    ["vm"] = {"<cmd>STSSelectMasterNode<CR>", "select master node"},
-                    ["vn"] = {"<cmd>STSSelectCurrentNode<CR>", "select master node"},
-
-                    -- normal mode swapping
-                    -- swappint up/down
-
-                    ["vU"] = {function()
-                        vim.opt.opfunc = "v:lua.STSSwapUpNormal_Dot"
-                        return "g@l"
-                    end, "TS swap Up master node with sibling", opts = { expr = true}},
-                    ["<BS><Up>"] = {function()
-                        vim.opt.opfunc = "v:lua.STSSwapUpNormal_Dot"
-                        return "g@l"
-                    end, "TS swap Up master node with sibling", opts = { expr = true}},
-
-                    ["vD"] = {function()
-                        vim.opt.opfunc = "v:lua.STSSwapDownNormal_Dot"
-                        return "g@l"
-                    end, "TS swap Down master node with sibling", opts = { expr = true}},
-                    ["<BS><Down>"] = {function()
-                        vim.opt.opfunc = "v:lua.STSSwapDownNormal_Dot"
-                        return "g@l"
-                    end, "TS swap Down master node with sibling", opts = { expr = true}},
-                    
-
-                    -- swapping left/right sibling nodes
-                    ["<M-Right>"] = {function()
-                        vim.opt.opfunc = "v:lua.STSSwapCurrentNodeNextNormal_Dot"
-                        return "g@l"
-                    end, "TS swap right with sibling", opts = { expr = true}},
-
-                    ["<M-Left>"] = {function()
-                        vim.opt.opfunc = "v:lua.STSSwapCurrentNodePrevNormal_Dot"
-                        return "g@l"
-                    end, "TS swap left with sibling", opts = { expr = true}},
-
-                    ["]e"] = { "<cmd> cn <CR>", "quickfix next error"     },
-                    ["[e"] = { "<cmd> cp <CR>", "quickfix previous error" },
-
-
-                    -- Tabularize mappings
-                    ["<leader>a&"]     = { "<cmd> Tabularize /&<CR>"          },
-                    ["<leader>a="]     = { "<cmd> Tabularize /^[^=]*\zs=<CR>" },
-                    ["<leader>a:"]     = { "<cmd> Tabularize /:<CR>"          },
-                    ["<leader>a,"]     = { "<cmd> Tabularize /,<CR>"          },
-                    ["<leader>a<Bar>"] = { "<cmd> Tabularize /<Bar><CR>"      },
-
-
-                    ["g."] = { ":cwd<CR>", "change dir to current file", opts = { remap = true } },
-                    ["<leader>g."] = { ":Gcd<CR>", "change dir to git root" },
-
-                    -- Packer commands
-                    --
-                    -- PackerSnapshot
-                    ["<leader>pS"] = { function()
-                        local snapname = "snapshot_" .. os.date("%Y_%m_%d_%H%M")
-                        local packer = require 'packer'
-                        packer.snapshot(snapname)
-                    end
-                    , "packer snapshot"},
-                    ["<leader>pst"] = { "<cmd> PackerStatus<CR>", "packer status"},
-                    ["<leader>psc"] = { "<cmd> PackerSync<CR>", "packer sync"},
-                    ["<leader>pc"] = { "<cmd> PackerCompile<CR>", "packer compile"},
-
-                    ["<leader>pr"] = { function()
-
-                        -- require("plenary.reload").reload_module("plugins")
-                        -- require("plenary.reload").reload_module("custom.plugins")
-                        -- vim.cmd "LuaCacheClear"
-                        -- package.loaded["plugins"] = nil
-                        --
-                        -- package.loaded["custom.plugins"] = nil
-                        -- dofile(vim.fn.stdpath("config") .. '/lua/plugins/init.lua')
-                        -- dofile(vim.fn.stdpath("config") .. '/lua/custom/plugins/init.lua')
-                        --
-                        require("spike.utils").unload_lua_ns("plugins")
-                        require("spike.utils").unload_lua_ns("custom")
-                        require("plugins")
-                        -- require("spike.utils").unload_lua_ns("custom")
-                        vim.cmd "PackerCompile"
-                        print("reloaded plugin config !")
-                    end,
-                    "packer reload/compile"
-                },
+        --   vim.ui.select({"fold level 0", "1", "2", "3", "4", "5", "6", "7"},
+        --   {
+        --     prompt = "fold lvl: ",
+        --   },
+        --   function(item, idx)
+        --     P(idx)
+        --     -- local foldlevel = tonumber(item)
+        --     -- if foldlevel == nil then P("need number for fold level !") end
+        --     -- vim.o.foldlevel = foldlevel
+        --   end)
+        -- end,
+        --
+        -- "set fold level"},
+        ["<leader>f0"] = { ":set foldlevel=0<CR>", "set fold level" },
+        ["<leader>f1"] = { ":set foldlevel=1<CR>", "set fold level" },
+        ["<leader>f2"] = { ":set foldlevel=2<CR>", "set fold level" },
+        ["<leader>f3"] = { ":set foldlevel=3<CR>", "set fold level" },
+        ["<leader>f4"] = { ":set foldlevel=4<CR>", "set fold level" },
+        -- ["<leader>f5"] = { ":set foldlevel=5<CR>", "set fold level" },
+        -- ["<leader>f6"] = { ":set foldlevel=6<CR>", "set fold level" },
+        -- ["<leader>f7"] = { ":set foldlevel=7<CR>", "set fold level" },
+        -- ["<leader>f8"] = { ":set foldlevel=8<CR>", "set fold level" },
+        -- ["<leader>f9"] = { ":set foldlevel=9<CR>", "set fold level" },
+
+        ["<leader>tf"] = { "<cmd> set foldmethod=expr<CR>|<cmd> set foldexpr=nvim_treesitter#foldexpr()<CR>",
+            "enable Treesitter folding" },
+
+        ["<leader>tp"] = {
+            function()
+                vim.cmd("TSPlaygroundToggle")
+            end,
+            "Treesitter playground"
+        },
+
+        -- Moving lines around
+        ["<M-Down>"] = { "<cmd>:m +1<CR>==", "move line up" },
+        ["<M-Up>"] = { "<cmd>:m .-2<CR>==", "move line up" },
+
+        -- syntax-tree-surfer
+        -- visual selection from nomral mode
+        ["vm"] = { "<cmd>STSSelectMasterNode<CR>", "select master node" },
+        ["vn"] = { "<cmd>STSSelectCurrentNode<CR>", "select master node" },
+
+        -- normal mode swapping
+        -- swappint up/down
+
+        ["vU"] = { function()
+            vim.opt.opfunc = "v:lua.STSSwapUpNormal_Dot"
+            return "g@l"
+        end, "TS swap Up master node with sibling", opts = { expr = true } },
+        ["<BS><Up>"] = { function()
+            vim.opt.opfunc = "v:lua.STSSwapUpNormal_Dot"
+            return "g@l"
+        end, "TS swap Up master node with sibling", opts = { expr = true } },
+
+        ["vD"] = { function()
+            vim.opt.opfunc = "v:lua.STSSwapDownNormal_Dot"
+            return "g@l"
+        end, "TS swap Down master node with sibling", opts = { expr = true } },
+        ["<BS><Down>"] = { function()
+            vim.opt.opfunc = "v:lua.STSSwapDownNormal_Dot"
+            return "g@l"
+        end, "TS swap Down master node with sibling", opts = { expr = true } },
+
+
+        -- swapping left/right sibling nodes
+        ["<M-Right>"] = { function()
+            vim.opt.opfunc = "v:lua.STSSwapCurrentNodeNextNormal_Dot"
+            return "g@l"
+        end, "TS swap right with sibling", opts = { expr = true } },
+
+        ["<M-Left>"] = { function()
+            vim.opt.opfunc = "v:lua.STSSwapCurrentNodePrevNormal_Dot"
+            return "g@l"
+        end, "TS swap left with sibling", opts = { expr = true } },
+
+        ["]e"] = { "<cmd> cn <CR>", "quickfix next error" },
+        ["[e"] = { "<cmd> cp <CR>", "quickfix previous error" },
+
+
+        -- Tabularize mappings
+        ["<leader>a&"]     = { "<cmd> Tabularize /&<CR>" },
+        ["<leader>a="]     = { "<cmd> Tabularize /^[^=]*\zs=<CR>" },
+        ["<leader>a:"]     = { "<cmd> Tabularize /:<CR>" },
+        ["<leader>a,"]     = { "<cmd> Tabularize /,<CR>" },
+        ["<leader>a<Bar>"] = { "<cmd> Tabularize /<Bar><CR>" },
+
+
+        ["g."] = { ":cwd<CR>", "change dir to current file", opts = { remap = true } },
+        ["<leader>g."] = { ":Gcd<CR>", "change dir to git root" },
+
+        -- Packer commands
+        --
+        -- PackerSnapshot
+        ["<leader>pS"] = { function()
+            local snapname = "snapshot_" .. os.date("%Y_%m_%d_%H%M")
+            local packer = require 'packer'
+            packer.snapshot(snapname)
+        end
+            , "packer snapshot" },
+        ["<leader>pst"] = { "<cmd> PackerStatus<CR>", "packer status" },
+        ["<leader>psc"] = { "<cmd> PackerSync<CR>", "packer sync" },
+        ["<leader>pc"] = { "<cmd> PackerCompile<CR>", "packer compile" },
+
+        ["<leader>pr"] = { function()
+
+            -- require("plenary.reload").reload_module("plugins")
+            -- require("plenary.reload").reload_module("custom.plugins")
+            -- vim.cmd "LuaCacheClear"
+            -- package.loaded["plugins"] = nil
+            --
+            -- package.loaded["custom.plugins"] = nil
+            -- dofile(vim.fn.stdpath("config") .. '/lua/plugins/init.lua')
+            -- dofile(vim.fn.stdpath("config") .. '/lua/custom/plugins/init.lua')
+            --
+            require("spike.utils").unload_lua_ns("plugins")
+            require("spike.utils").unload_lua_ns("custom")
+            require("plugins")
+            -- require("spike.utils").unload_lua_ns("custom")
+            vim.cmd "PackerCompile"
+            print("reloaded plugin config !")
+        end,
+            "packer reload/compile"
+        },
 
-                -- Notify cmd watcher (see /scripts/utils/fifo_watch.sh)
-                --[[ ["<leader><down>"] = {
+        -- Notify cmd watcher (see /scripts/utils/fifo_watch.sh)
+        --[[ ["<leader><down>"] = {
                     function()
                         local fifo_patch = "/tmp/fifo_vimnotify"
                         os.execute("echo do >" .. fifo_patch)
@@ -306,603 +306,605 @@ M.general = { --{{{
                 }, ]]
 
 
-                -- TODO: move to lspconfig section
-                -- ["<leader>lsp"] = { "<cmd> lua require('custom.plugins.configs.navigator').enable()<CR>", "lsp enable"},
-                ["<leader>lsp"] = { "<cmd> LspStart<CR>", "lsp enable"},
-                ["<M-s><M-s>"] = { "<cmd> LspStart<CR>", "lsp enable"},
-                ["<M-t><M-t>"] = { "<cmd> LspStop<CR>", "lsp disable"},
-                ["<leader>lst"] = { "<cmd> LspStop<CR>", "lsp disable"},
+        -- TODO: move to lspconfig section
+        -- ["<leader>lsp"] = { "<cmd> lua require('custom.plugins.configs.navigator').enable()<CR>", "lsp enable"},
+        ["<leader>lsp"] = { "<cmd> LspStart<CR>", "lsp enable" },
+        ["<M-s><M-s>"] = { "<cmd> LspStart<CR>", "lsp enable" },
+        ["<M-t><M-t>"] = { "<cmd> LspStop<CR>", "lsp disable" },
+        ["<leader>lst"] = { "<cmd> LspStop<CR>", "lsp disable" },
 
 
 
-                ---------------
-                -- Programming languages specifics
-                ---------------
+        ---------------
+        -- Programming languages specifics
+        ---------------
 
-                -- config files
-                ["<leader>ev"] = {"<cmd> source ~/.config/nvim/Session.vim<CR>" , "edit vim config"},
-            },--}}}
+        -- config files
+        ["<leader>ev"] = { "<cmd> source ~/.config/nvim/Session.vim<CR>", "edit vim config" },
+    }, --}}}
 
-            t = { ["<C-x>"] = { termcodes "<C-\\><C-N>", "escape terminal mode" } },
+    t = { ["<C-x>"] = { termcodes "<C-\\><C-N>", "escape terminal mode" } },
 
-            v = {--{{{
-                -- ["j"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', opts = { expr = true } },
-                -- ["k"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', opts = { expr = true } },
-                ["j"] = { "gj" },
-                ["k"] = { "gk" },
+    v = { --{{{
 
 
-                -- yank from cursor to eol to system and primary clipboard
-                ["<leader>y"] = { '"*y gv"+y', "yank line to clipboards" },
+        -- yank from cursor to eol to system and primary clipboard
+        ["<leader>y"] = { '"*y gv"+y', "yank line to clipboards" },
 
-                -- visual shifting
-                ["<"] = { "<gv" },
-                [">"] = { ">gv" },
+        -- visual shifting
+        ["<"] = { "<gv" },
+        [">"] = { ">gv" },
 
-                -- Allow using the repeat operator with a visual selection (!)
-                -- http://stackoverflow.com/a/8064607/127816
-                ["."] = { ":normal .<CR>", opts = { silent = true } },
+        -- Allow using the repeat operator with a visual selection (!)
+        -- http://stackoverflow.com/a/8064607/127816
+        ["."] = { ":normal .<CR>", opts = { silent = true } },
 
-                -- Tabularize mappings
-                ["<leader>a&"]     = { "<cmd> Tabularize /&<CR>"          },
-                ["<leader>a="]     = { "<cmd> Tabularize /^[^=]*\zs=<CR>" },
-                ["<leader>a:"]     = { "<cmd> Tabularize /:<CR>"          },
-                ["<leader>a,"]     = { "<cmd> Tabularize /,<CR>"          },
-                ["<leader>a<Bar>"] = { "<cmd> Tabularize /<Bar><CR>"      },
+        -- Tabularize mappings
+        ["<leader>a&"]     = { "<cmd> Tabularize /&<CR>" },
+        ["<leader>a="]     = { "<cmd> Tabularize /^[^=]*\zs=<CR>" },
+        ["<leader>a:"]     = { "<cmd> Tabularize /:<CR>" },
+        ["<leader>a,"]     = { "<cmd> Tabularize /,<CR>" },
+        ["<leader>a<Bar>"] = { "<cmd> Tabularize /<Bar><CR>" },
 
-            },--}}}
+    }, --}}}
 
-            -- command line mappings
-            c = {--{{{
-                ["Tabe"] = { "tabe" },
+    -- command line mappings
+    c = { --{{{
+        ["Tabe"] = { "tabe" },
 
-                -- Change Working Directory to that of the current file
-                ["cwd"] = { "lcd %:p:h", "change dir to current file" },
-                ["cd."] = { "lcd %:p:h", "change dir to current file" },
-                ["w!!"] = { "w !doas tee %", "write file with root perms" },
-                ["%%"]  = { "<C-R>=fnameescape(expand('%:h')).'/'<cr>",
-                "alias to current working dir"},
-                ["Tab"] = { "Tabularize"},
+        -- Change Working Directory to that of the current file
+        ["cwd"] = { "lcd %:p:h", "change dir to current file" },
+        ["cd."] = { "lcd %:p:h", "change dir to current file" },
+        ["w!!"] = { "w !doas tee %", "write file with root perms" },
+        ["%%"]  = { "<C-R>=fnameescape(expand('%:h')).'/'<cr>",
+            "alias to current working dir" },
+        ["Tab"] = { "Tabularize" },
 
 
-                ["%c"] = { "~/.config/nvim/", "shortcut to nvim config dir"},
-                -- ["tsf"] = { "set foldmethod=expr | set foldexpr=nvim_treesitter#foldexpr()",
-                -- "enable Treesitter folding"}
-            },--}}}
+        ["%c"] = { "~/.config/nvim/", "shortcut to nvim config dir" },
+        -- ["tsf"] = { "set foldmethod=expr | set foldexpr=nvim_treesitter#foldexpr()",
+        -- "enable Treesitter folding"}
+    }, --}}}
 
-            -- visual exclusive mode (ignore select)
-            x = { -- {{{
+    -- visual exclusive mode (ignore select)
+    x = { -- {{{
 
-                -- Don't copy the replaced text after pasting in visual mode
-                -- https://vim.fandom.com/wiki/Replace_a_word_with_yanked_text#Alternative_mapping_for_paste
-                ["p"] = { 'p:let @+=@0<CR>:let @"=@0<CR>', opts = { silent = true } },
+        -- ["j"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', opts = { expr = true } },
+        -- ["k"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', opts = { expr = true } },
+        ["j"] = { "gj" },
+        ["k"] = { "gk" },
 
-                -- syntax-tree-surfer
-                ["J"] = {"<cmd>STSSelectNextSiblingNode<CR>", "select next sibling node"},
-                ["K"] = {"<cmd>STSSelectPrevSiblingNode<CR>", "select prev sibling node"},
-                ["H"] = {"<cmd>STSSelectParentNode<CR>", "select prev sibling node"},
-                ["L"] = {"<cmd>STSSelectChildNode<CR>", "select prev sibling node"},
+        -- Don't copy the replaced text after pasting in visual mode
+        -- https://vim.fandom.com/wiki/Replace_a_word_with_yanked_text#Alternative_mapping_for_paste
+        ["p"] = { 'p:let @+=@0<CR>:let @"=@0<CR>', opts = { silent = true } },
 
-                -- swap nodes tip: start first with master/child node selection then use these
-                ["<M-Up>"] = {"<cmd>STSSwapPrevVisual<CR>", "select prev sibling node"},
-                ["<M-Left>"] = {"<cmd>STSSwapPrevVisual<CR>", "select prev sibling node"},
-                ["<M-Down>"] = {"<cmd>STSSwapNextVisual<CR>", "select next sibling node"},
-                ["<M-Right>"] = {"<cmd>STSSwapNextVisual<CR>", "select next sibling node"},
+        -- syntax-tree-surfer
+        ["J"] = { "<cmd>STSSelectNextSiblingNode<CR>", "select next sibling node" },
+        ["K"] = { "<cmd>STSSelectPrevSiblingNode<CR>", "select prev sibling node" },
+        ["H"] = { "<cmd>STSSelectParentNode<CR>", "select prev sibling node" },
+        ["L"] = { "<cmd>STSSelectChildNode<CR>", "select prev sibling node" },
 
-            },-- }}}
-        } --}}}
+        -- swap nodes tip: start first with master/child node selection then use these
+        ["<M-Up>"] = { "<cmd>STSSwapPrevVisual<CR>", "select prev sibling node" },
+        ["<M-Left>"] = { "<cmd>STSSwapPrevVisual<CR>", "select prev sibling node" },
+        ["<M-Down>"] = { "<cmd>STSSwapNextVisual<CR>", "select next sibling node" },
+        ["<M-Right>"] = { "<cmd>STSSwapNextVisual<CR>", "select next sibling node" },
 
-        M.tabufline = { --{{{
-            plugin = true,
+    }, -- }}}
+} --}}}
 
-            n = {
-                -- cycle through buffers
-                ["<C-b>"] = {
-                    function()
-                        require("core.utils").tabuflineNext()
-                    end,
-                    "goto next buffer",
-                },
+M.tabufline = { --{{{
+    plugin = true,
 
-                ["<C-f>"] = {
-                    function()
-                        require("core.utils").tabuflinePrev()
-                    end,
-                    "goto prev buffer",
-                },
+    n = {
+        -- cycle through buffers
+        ["<C-b>"] = {
+            function()
+                require("core.utils").tabuflineNext()
+            end,
+            "goto next buffer",
+        },
 
-                -- pick buffers via numbers
-                ["<Bslash>"] = { "<cmd> TbufPick <CR>", "Pick buffer" },
-            },
-        } --}}}
+        ["<C-f>"] = {
+            function()
+                require("core.utils").tabuflinePrev()
+            end,
+            "goto prev buffer",
+        },
 
-        M.comment = { --{{{
-            plugin = true,
+        -- pick buffers via numbers
+        ["<Bslash>"] = { "<cmd> TbufPick <CR>", "Pick buffer" },
+    },
+} --}}}
 
-            -- toggle comment in both modes
-            n = {
-                ["<leader>/"] = {
-                    function()
-                        -- require("Comment.api").toggle.linewise.current()
-                        vim.notify("use gcc !")
-                    end,
-                    "toggle comment",
-                },
-            },
+M.comment = { --{{{
+    plugin = true,
 
-            v = {
-                ["<leader>/"] = {
-                    function()
-                        vim.notify("use gcc !")
-                    end,
-                    -- "<ESC><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>",
-                    "toggle comment",
-                },
-            },
-        } --}}}
+    -- toggle comment in both modes
+    n = {
+        ["<leader>/"] = {
+            function()
+                -- require("Comment.api").toggle.linewise.current()
+                vim.notify("use gcc !")
+            end,
+            "toggle comment",
+        },
+    },
 
-        M.lspconfig = { --{{{
-            plugin = true,
+    v = {
+        ["<leader>/"] = {
+            function()
+                vim.notify("use gcc !")
+            end,
+            -- "<ESC><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>",
+            "toggle comment",
+        },
+    },
+} --}}}
 
-            -- See `<cmd> :help vim.lsp.*` for documentation on any of the below functions
+M.lspconfig = { --{{{
+    plugin = true,
 
-            n = {
-                ["gD"] = {
-                    function()
-                        vim.lsp.buf.declaration()
-                    end,
-                    "lsp declaration",
-                },
+    -- See `<cmd> :help vim.lsp.*` for documentation on any of the below functions
 
-                ["gd"] = {
-                    function()
-                        vim.lsp.buf.definition()
-                    end,
-                    "lsp definition",
-                },
+    n = {
+        ["gD"] = {
+            function()
+                vim.lsp.buf.declaration()
+            end,
+            "lsp declaration",
+        },
 
-                ["K"] = {
-                    function()
-                        vim.lsp.buf.hover()
-                    end,
-                    "lsp hover",
-                },
+        ["gd"] = {
+            function()
+                vim.lsp.buf.definition()
+            end,
+            "lsp definition",
+        },
 
-                ["gm"] = {
-                    function()
-                        vim.lsp.buf.implementation()
-                    end,
-                    "lsp implementation",
-                },
+        ["K"] = {
+            function()
+                vim.lsp.buf.hover()
+            end,
+            "lsp hover",
+        },
 
-                ["<leader>ls"] = {
-                    function()
-                        vim.lsp.buf.signature_help()
-                    end,
-                    "lsp signature_help",
-                },
+        ["gm"] = {
+            function()
+                vim.lsp.buf.implementation()
+            end,
+            "lsp implementation",
+        },
 
-                ["<leader>D"] = {
-                    function()
-                        vim.lsp.buf.type_definition()
-                    end,
-                    "lsp definition type",
-                },
+        ["<leader>ls"] = {
+            function()
+                vim.lsp.buf.signature_help()
+            end,
+            "lsp signature_help",
+        },
 
-                ["<leader>ra"] = {
-                    function()
-                        require("nvchad_ui.renamer").open()
-                    end,
-                    "lsp rename",
-                },
+        ["<leader>D"] = {
+            function()
+                vim.lsp.buf.type_definition()
+            end,
+            "lsp definition type",
+        },
 
-                ["<leader>ca"] = {
-                    function()
-                        vim.lsp.buf.code_action()
-                    end,
-                    "lsp code_action",
-                },
+        ["<leader>ra"] = {
+            function()
+                require("nvchad_ui.renamer").open()
+            end,
+            "lsp rename",
+        },
 
-                ["gr"] = {
-                    function()
-                        vim.lsp.buf.references()
-                    end,
-                    "lsp references",
-                },
+        ["<leader>ca"] = {
+            function()
+                vim.lsp.buf.code_action()
+            end,
+            "lsp code_action",
+        },
 
-                ["<leader>f"] = {
-                    function()
-                        vim.diagnostic.open_float()
-                    end,
-                    "lsp floating diagnostic",
-                },
+        ["gr"] = {
+            function()
+                vim.lsp.buf.references()
+            end,
+            "lsp references",
+        },
 
-                ["[d"] = {
-                    function()
-                        vim.diagnostic.goto_prev()
-                    end,
-                    "lsp goto prev",
-                },
+        ["<leader>f"] = {
+            function()
+                vim.diagnostic.open_float()
+            end,
+            "lsp floating diagnostic",
+        },
 
-                ["d]"] = {
-                    function()
-                        vim.diagnostic.goto_next()
-                    end,
-                    "lsp goto_next",
-                },
+        ["[d"] = {
+            function()
+                vim.diagnostic.goto_prev()
+            end,
+            "lsp goto prev",
+        },
 
-                ["<leader>q"] = {
-                    function()
-                        vim.diagnostic.setloclist()
-                    end,
-                    "lsp diagnostic setloclist",
-                },
+        ["d]"] = {
+            function()
+                vim.diagnostic.goto_next()
+            end,
+            "lsp goto_next",
+        },
 
-                ["<leader>fm"] = {
-                    function()
-                        vim.lsp.buf.formatting {}
-                    end,
-                    "lsp formatting",
-                },
+        ["<leader>q"] = {
+            function()
+                vim.diagnostic.setloclist()
+            end,
+            "lsp diagnostic setloclist",
+        },
 
-                ["<leader>wa"] = {
-                    function()
-                        vim.lsp.buf.add_workspace_folder()
-                    end,
-                    "lsp add workspace folder",
-                },
+        ["<leader>fm"] = {
+            function()
+                vim.lsp.buf.formatting {}
+            end,
+            "lsp formatting",
+        },
 
-                ["<leader>wr"] = {
-                    function()
-                        vim.lsp.buf.remove_workspace_folder()
-                    end,
-                    "lsp remove workspace folder",
-                },
+        ["<leader>wa"] = {
+            function()
+                vim.lsp.buf.add_workspace_folder()
+            end,
+            "lsp add workspace folder",
+        },
 
-                ["<leader>wl"] = {
-                    function()
-                        print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-                    end,
-                    "lsp list workspace folders",
-                },
-            },
-        } --}}}
-
-        M.dap = {-- {{{
-            plugin = true,
-            n = {
-                ["<leader>ds"] = {
-                    function()
-                        local mydap = require("spike.dap")
-
-                        mydap.setup()
-                        require('spike.dap.utils').init_breakpoints()
-                        -- set a breakpoint at current line if there are none in
-                        --  the project
-
-                        if vim.o.filetype == "go" then
-                            mydap.go_debug()
-                        elseif vim.o.filetype == "rust"  then
-                            local rt = require("rust-tools")
-                            -- make sure lsp is running ?
-                            rt.debuggables.debuggables()
-                        end
-                    end,
-                    "start dap session"
-                },
+        ["<leader>wr"] = {
+            function()
+                vim.lsp.buf.remove_workspace_folder()
+            end,
+            "lsp remove workspace folder",
+        },
 
-                ["<leader>dS"] = {
-                    function()
-                        if vim.o.filetype == "go" then
-                            vim.cmd("GoDbgStop")
-                        end
-                    end,
-                    "stop dap session"
-                },
+        ["<leader>wl"] = {
+            function()
+                print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+            end,
+            "lsp list workspace folders",
+        },
+    },
+} --}}}
 
-                ["<leader>dd"] = {"<cmd> DapToggleBreakpoint <CR>"},
+M.dap = { -- {{{
+    plugin = true,
+    n = {
+        ["<leader>ds"] = {
+            function()
+                local mydap = require("spike.dap")
+
+                mydap.setup()
+                require('spike.dap.utils').init_breakpoints()
+                -- set a breakpoint at current line if there are none in
+                --  the project
+
+                if vim.o.filetype == "go" then
+                    mydap.go_debug()
+                elseif vim.o.filetype == "rust" then
+                    local rt = require("rust-tools")
+                    -- make sure lsp is running ?
+                    rt.debuggables.debuggables()
+                end
+            end,
+            "start dap session"
+        },
 
-                ["<leader>dc"] = {
-                    function()
-                        vim.ui.input({ prompt = "condition> "}, function(input)
-                            require("dap").set_breakpoint(input)
-                        end)
-                    end,
-                    "dap conditional breakpoint"
-                },
-                ["<leader>dm"] = {
-                    function()
-                        require('spike.dap.dapmode').start()
-                    end,
-                    "enter dap mode"
-                },
-                ["<leader>dr"] = {"<cmd>lua require'dap'.run_last()<CR>", "[dap] rerun last"},
-                ["<leader>dl"] = {
-                    function()
-                        require('spike.dap.utils').dap_logpoint()
-                    end,
-                    "[dap] add log point"
-                },
-                ["<leader>dt"] = {"<cmd>lua require'dapui'.toggle()<CR>", "[dap] toggle UI"},
-            },
-
-            }-- }}}
-
-            M.nvimtree = { --{{{
-                plugin = true,
-
-                n = {
-                    -- toggle
-                    ["<Left>"] = { "<cmd> NvimTreeToggle <CR>", "toggle nvimtree" },
-                },
-            } --}}}
-
-            M.fzf_lua = { --{{{
-                plugin = true,
-
-                n = {
-                    -- find
-                    -- ["<C-p>"] = { "<cmd> FzfLua files <CR>", "FzfLua find files" },
-                    -- ["<C-p>"] = { function ()
-                        --   local ignored_bufs = {
-                            --     "qf",
-                            --   }
-                            --   for _, ignored in ipairs(ignored_bufs) do
-                            --     if vim.bo.filetype == ignored then
-                            --       local default_keyseq = termcodes("<C-p>")
-                            --       vim.api.nvim_feedkeys(default_keyseq, 'n', false) 
-                            --       return
-                            --     end
-                            --   end
-                            --   vim.cmd "FzfLua files"
-                            -- end, "FzfLua find files" },
-
-                            ["<leader>fl"] = { "<cmd> FzfLua lines <CR>", "FzfLua grep open buffer lines" },
-
-                            -- grep
-                            -- ["<leader>fw"] = { "<cmd> FzfLua grep_cword <CR>", "FzfLua grep cword" },
-                            -- ["<leader>f."] = { "<cmd> FzfLua live_grep_native <CR>", "FzfLua grep live native" },
-                            -- ["<leader>ff"] = { "<cmd> FzfLua grep_project <CR>", "FzfLua grep live project" },
-                            ["<leader>f*"] = { "<cmd> FzfLua live_grep_glob <CR>", "FzfLua grep with glob (SPACE-- globs)" },
-
-                            -- continue
-                            -- ["<leader>fr"] = { "<cmd> FzfLua resume <CR>", "FzfLua resume last search" },
-
-                            -- ["<leader>;"] = { "<cmd> FzfLua buffers <CR>", "FzfLua find buffers" },
-                            -- ["<leader>fb"] = { "<cmd> FzfLua builtin <CR>", "FzfLua builtins" },
-                            -- ["<leader>fh"] = { "<cmd> FzfLua help_tags <CR>", "FzfLua find help pages" },
-                            -- ["<leader>fm"] = { "<cmd> FzfLua marks <CR>", "FzfLua marks" },
-                            -- ["<leader>fo"] = { "<cmd> FzfLua oldfiles <CR>", "FzfLua find oldfiles" },
-                            -- ["<leader>tk"] = { "<cmd> FzfLua keymaps <CR>", "FzfLua show keymaps" },
-
-                        }
-                    } --}}}
-
-                    M.telescope = { --{{{
-                        plugin = true,
-
-                        n = {
-                            -- find
-                            -- ["<leader>ff"] = { "<cmd> Telescope find_files <CR>", "find files" },
-                            -- ["<C-p>"] = { "<cmd> Telescope find_files <CR>", "find files" },
-                            --
-                            ["<leader>fa"] = { "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", "find all" },
-                            ["<C-p>"] = {
-                                function ()
-                                local ignored_bufs = {
-                                    "qf",
-                                    "guihua",
-                                    "NvimT*"
-                                }
-                                for _, ignored in ipairs(ignored_bufs) do
-                                    if vim.o.filetype:match(ignored) then
-                                        local default_keyseq = termcodes("<C-p>")
-                                        vim.api.nvim_feedkeys(default_keyseq, 'n', false) 
-                                        return
-                                    end
-                                end
-                                vim.cmd "Telescope find_files"
-                            end, "FzfLua find files" },
-                            ["<leader>f."] = { "<cmd> Telescope live_grep <CR>", "telescope live grep" },
-                            ["<leader>fw"] = { "<cmd> Telescope grep_string <CR>", "telescope grep cword" },
-                            ["<leader>;"] = { "<cmd> Telescope buffers <CR>", "telescope find buffers" },
-                            ["<leader>fb"] = { "<cmd> Telescope builtin <CR>", "telescope builtins" },
-                            ["<leader>fB"] = { "<cmd> Telescope vim_bookmarks <CR>", "telescope bookmarks" },
-                            ["<leader>fh"] = { "<cmd> Telescope help_tags <CR>", "help page" },
-                            ["<leader>fo"] = { "<cmd> Telescope oldfiles <CR>", "telescope find oldfiles" },
-                            ["<leader>fm"] = { "<cmd> Telescope marks <CR>", "Telescope marks" },
-                            ["<leader>fM"] = { "<cmd> Telescope man_pages <CR>", "Telescope marks" },
-                            ["<leader>tk"] = { "<cmd> Telescope keymaps <CR>", "Telescope show keys" },
-                            ["<leader>fr"] = { "<cmd> Telescope resume <CR>", "telescope resume last search" },
-                            ["<leader>fc"] = { "<cmd> Telescope commands <CR>", "telescope commands" },
-
-                            -- git
-                            ["<leader>fg"] = { " ", "telescope git commands" },
-                            ["<leader>fgc"] = { "<cmd> Telescope git_commits <CR>", "teles git commits" },
-                            ["<leader>fgs"] = { "<cmd> Telescope git_status <CR>", "teles git status" },
-                            ["<leader>fgf"] = { "<cmd> Telescope git_files <CR>", "teles git files" },
-
-                            -- pick a hidden term
-                            -- ["<leader>pt"] = { "<cmd> Telescope terms <CR>", "pick hidden term" },
-
-                            -- theme switcher
-                            ["<leader>th"] = { "<cmd> Telescope themes <CR>", "nvchad themes" },
-                        },
-                    } --}}}
-
-                    M.nvterm = { --{{{
-                        plugin = true,
-
-                        t = {
-                            -- toggle in terminal mode
-                            ["<A-i>"] = {
-                                function()
-                                    require("nvterm.terminal").toggle "float"
-                                end,
-                                "toggle floatinvg term",
-                            },
-
-                            ["<A-h>"] = {
-                                function()
-                                    require("nvterm.terminal").toggle "horizontal"
-                                end,
-                                "toggle horizontal term",
-                            },
-                        },
-
-                        n = {
-                            -- toggle in normal mode
-                            ["<A-i>"] = {
-                                function()
-                                    require("nvterm.terminal").toggle "float"
-                                end,
-                                "toggle floating term",
-                            },
-
-                            ["<A-h>"] = {
-                                function()
-                                    require("nvterm.terminal").toggle "horizontal"
-                                end,
-                                "toggle horizontal term",
-                            },
-
-                            ["<A-v>"] = {
-                                function()
-                                    require("nvterm.terminal").toggle "vertical"
-                                end,
-                                "toggle vertical term",
-                            },
-
-                            -- new
-
-                            ["<leader>h"] = {
-                                function()
-                                    require("nvterm.terminal").new "horizontal"
-                                end,
-                                "new horizontal term",
-                            },
-
-                            ["<leader>v"] = {
-                                function()
-                                    require("nvterm.terminal").new "vertical"
-                                end,
-                                "new vertical term",
-                            },
-                        },
-                    } --}}}
-
-                    M.whichkey = { --{{{
-                        plugin = true,
-
-                        n = {
-                            ["<leader>wK"] = {
-                                function()
-                                    vim.cmd "WhichKey"
-                                end,
-                                "which-key all keymaps",
-                            },
-                            ["<leader>wk"] = {
-                                function()
-                                    local input = vim.fn.input "WhichKey: "
-                                    vim.cmd("WhichKey " .. input)
-                                end,
-                                "which-key query lookup",
-                            },
-                        },
-                    } --}}}
-
-                    M.blankline = { --{{{
-                        plugin = true,
-
-                        n = {
-                            ["<BS>k"] = {
-                                function()
-                                    local ok, start = require("indent_blankline.utils").get_current_context(
-                                    vim.g.indent_blankline_context_patterns,
-                                    vim.g.indent_blankline_use_treesitter_scope
-                                    )
-
-                                    if ok then
-                                        vim.api.nvim_win_set_cursor(vim.api.nvim_get_current_win(), { start, 0 })
-                                        vim.cmd [[normal! _]]
-                                    end
-                                end,
-
-                                "Jump to current context",
-                            },
-                        },
-                    } --}}}
-
-                    -- code outline panel
-                    M.aerial =  {
-                        plugin = true,
-                        n = {
-                            ["<Right>"] = {"<cmd> AerialToggle! right<CR>"},
-                        }
-                    }
-
-                    M.asyncrun = { --{{{
-                        plugin = true,
-
-                        n = {
-                            -- TODO: find new mapping to close quickfix
-                            -- ["``"] = { "<cmd> call asyncrun#quickfix_toggle(8)<CR>", "toggle quickfix window" },
-                            ["<leader>m"] = { ":AsyncRun -program=" .. vim.o.makeprg .. "<CR>", "make using asyncrun" },
-                            ["<leader>ar"] = { ":AsyncRun ", "custom asyncrun command" },
-                            ["<leader>pd"] = { "<cmd> AsyncRun lpr -P PDF_PRINT %<CR>", "PDF print file" },
-                            ["<leader>pp"] = { "<cmd> AsyncRun lpr %<CR>" },
-                        },
-                    } --}}}
-
-                    M.vim_bookmarks = {--{{{
-                        n = {
-                            ["<BS>m"] = {"<cmd> Telescope vim_bookmarks<CR>", "show bookmarks"},
-                            ["mk"] = {"<cmd> BookmarkToggle<CR>", "toggle bookmarks"},
-                            ["<leader>mm"] = {"<cmd> BookmarkAnnotate<CR>", "annotation bookmarks"},
-                            ["<leader>mc"] = {"<cmd> BookmarkClear<CR>", "clear bookmarks in buffer"},
-                            ["<leader>mx"] = {"<cmd> BookmarkClearAll<CR>", "clear bookmarks in all buffers"},
-                            ["]b"] = {"<cmd>BookmarkNext<CR>", "jump to next bookmark"},
-                            ["[b"] = {"<cmd>BookmarkNext<CR>", "jump to prev bookmark"},
-                        },
-                    }--}}}
-
-                    M.iron = {-- {{{{{{
-                        plugin = true,
-                        n = {
-                            ["<leader>ir"] = {"<cmd>IronRepl<CR>", "start IronRepl"},
-                        }
-                    }
+        ["<leader>dS"] = {
+            function()
+                if vim.o.filetype == "go" then
+                    vim.cmd("GoDbgStop")
+                end
+            end,
+            "stop dap session"
+        },
+
+        ["<leader>dd"] = { "<cmd> DapToggleBreakpoint <CR>" },
+
+        ["<leader>dc"] = {
+            function()
+                vim.ui.input({ prompt = "condition> " }, function(input)
+                    require("dap").set_breakpoint(input)
+                end)
+            end,
+            "dap conditional breakpoint"
+        },
+        ["<leader>dm"] = {
+            function()
+                require('spike.dap.dapmode').start()
+            end,
+            "enter dap mode"
+        },
+        ["<leader>dr"] = { "<cmd>lua require'dap'.run_last()<CR>", "[dap] rerun last" },
+        ["<leader>dl"] = {
+            function()
+                require('spike.dap.utils').dap_logpoint()
+            end,
+            "[dap] add log point"
+        },
+        ["<leader>dt"] = { "<cmd>lua require'dapui'.toggle()<CR>", "[dap] toggle UI" },
+    },
+
+} -- }}}
+
+M.nvimtree = { --{{{
+    plugin = true,
+
+    n = {
+        -- toggle
+        ["<Left>"] = { "<cmd> NvimTreeToggle <CR>", "toggle nvimtree" },
+    },
+} --}}}
+
+M.fzf_lua = { --{{{
+    plugin = true,
+
+    n = {
+        -- find
+        -- ["<C-p>"] = { "<cmd> FzfLua files <CR>", "FzfLua find files" },
+        -- ["<C-p>"] = { function ()
+        --   local ignored_bufs = {
+        --     "qf",
+        --   }
+        --   for _, ignored in ipairs(ignored_bufs) do
+        --     if vim.bo.filetype == ignored then
+        --       local default_keyseq = termcodes("<C-p>")
+        --       vim.api.nvim_feedkeys(default_keyseq, 'n', false)
+        --       return
+        --     end
+        --   end
+        --   vim.cmd "FzfLua files"
+        -- end, "FzfLua find files" },
+
+        ["<leader>fl"] = { "<cmd> FzfLua lines <CR>", "FzfLua grep open buffer lines" },
+
+        -- grep
+        -- ["<leader>fw"] = { "<cmd> FzfLua grep_cword <CR>", "FzfLua grep cword" },
+        -- ["<leader>f."] = { "<cmd> FzfLua live_grep_native <CR>", "FzfLua grep live native" },
+        -- ["<leader>ff"] = { "<cmd> FzfLua grep_project <CR>", "FzfLua grep live project" },
+        ["<leader>f*"] = { "<cmd> FzfLua live_grep_glob <CR>", "FzfLua grep with glob (SPACE-- globs)" },
+
+        -- continue
+        -- ["<leader>fr"] = { "<cmd> FzfLua resume <CR>", "FzfLua resume last search" },
+
+        -- ["<leader>;"] = { "<cmd> FzfLua buffers <CR>", "FzfLua find buffers" },
+        -- ["<leader>fb"] = { "<cmd> FzfLua builtin <CR>", "FzfLua builtins" },
+        -- ["<leader>fh"] = { "<cmd> FzfLua help_tags <CR>", "FzfLua find help pages" },
+        -- ["<leader>fm"] = { "<cmd> FzfLua marks <CR>", "FzfLua marks" },
+        -- ["<leader>fo"] = { "<cmd> FzfLua oldfiles <CR>", "FzfLua find oldfiles" },
+        -- ["<leader>tk"] = { "<cmd> FzfLua keymaps <CR>", "FzfLua show keymaps" },
+
+    }
+} --}}}
+
+M.telescope = { --{{{
+    plugin = true,
+
+    n = {
+        -- find
+        -- ["<leader>ff"] = { "<cmd> Telescope find_files <CR>", "find files" },
+        -- ["<C-p>"] = { "<cmd> Telescope find_files <CR>", "find files" },
+        --
+        ["<leader>fa"] = { "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", "find all" },
+        ["<C-p>"] = {
+            function()
+                local ignored_bufs = {
+                    "qf",
+                    "guihua",
+                    "NvimT*"
+                }
+                for _, ignored in ipairs(ignored_bufs) do
+                    if vim.o.filetype:match(ignored) then
+                        local default_keyseq = termcodes("<C-p>")
+                        vim.api.nvim_feedkeys(default_keyseq, 'n', false)
+                        return
+                    end
+                end
+                vim.cmd "Telescope find_files"
+            end, "FzfLua find files"
+        },
+        ["<leader>f."] = { "<cmd> Telescope live_grep <CR>", "telescope live grep" },
+        ["<leader>fw"] = { "<cmd> Telescope grep_string <CR>", "telescope grep cword" },
+        ["<leader>;"] = { "<cmd> Telescope buffers <CR>", "telescope find buffers" },
+        ["<leader>fb"] = { "<cmd> Telescope builtin <CR>", "telescope builtins" },
+        ["<leader>fB"] = { "<cmd> Telescope vim_bookmarks <CR>", "telescope bookmarks" },
+        ["<leader>fh"] = { "<cmd> Telescope help_tags <CR>", "help page" },
+        ["<leader>fo"] = { "<cmd> Telescope oldfiles <CR>", "telescope find oldfiles" },
+        ["<leader>fm"] = { "<cmd> Telescope marks <CR>", "Telescope marks" },
+        ["<leader>fM"] = { "<cmd> Telescope man_pages <CR>", "Telescope marks" },
+        ["<leader>tk"] = { "<cmd> Telescope keymaps <CR>", "Telescope show keys" },
+        ["<leader>fr"] = { "<cmd> Telescope resume <CR>", "telescope resume last search" },
+        ["<leader>fc"] = { "<cmd> Telescope commands <CR>", "telescope commands" },
+
+        -- git
+        ["<leader>fg"] = { " ", "telescope git commands" },
+        ["<leader>fgc"] = { "<cmd> Telescope git_commits <CR>", "teles git commits" },
+        ["<leader>fgs"] = { "<cmd> Telescope git_status <CR>", "teles git status" },
+        ["<leader>fgf"] = { "<cmd> Telescope git_files <CR>", "teles git files" },
+
+        -- pick a hidden term
+        -- ["<leader>pt"] = { "<cmd> Telescope terms <CR>", "pick hidden term" },
+
+        -- theme switcher
+        ["<leader>th"] = { "<cmd> Telescope themes <CR>", "nvchad themes" },
+    },
+} --}}}
+
+M.nvterm = { --{{{
+    plugin = true,
+
+    t = {
+        -- toggle in terminal mode
+        ["<A-i>"] = {
+            function()
+                require("nvterm.terminal").toggle "float"
+            end,
+            "toggle floatinvg term",
+        },
+
+        ["<A-h>"] = {
+            function()
+                require("nvterm.terminal").toggle "horizontal"
+            end,
+            "toggle horizontal term",
+        },
+    },
+
+    n = {
+        -- toggle in normal mode
+        ["<A-i>"] = {
+            function()
+                require("nvterm.terminal").toggle "float"
+            end,
+            "toggle floating term",
+        },
+
+        ["<A-h>"] = {
+            function()
+                require("nvterm.terminal").toggle "horizontal"
+            end,
+            "toggle horizontal term",
+        },
+
+        ["<A-v>"] = {
+            function()
+                require("nvterm.terminal").toggle "vertical"
+            end,
+            "toggle vertical term",
+        },
+
+        -- new
+
+        ["<leader>h"] = {
+            function()
+                require("nvterm.terminal").new "horizontal"
+            end,
+            "new horizontal term",
+        },
+
+        ["<leader>v"] = {
+            function()
+                require("nvterm.terminal").new "vertical"
+            end,
+            "new vertical term",
+        },
+    },
+} --}}}
+
+M.whichkey = { --{{{
+    plugin = true,
+
+    n = {
+        ["<leader>wK"] = {
+            function()
+                vim.cmd "WhichKey"
+            end,
+            "which-key all keymaps",
+        },
+        ["<leader>wk"] = {
+            function()
+                local input = vim.fn.input "WhichKey: "
+                vim.cmd("WhichKey " .. input)
+            end,
+            "which-key query lookup",
+        },
+    },
+} --}}}
+
+M.blankline = { --{{{
+    plugin = true,
+
+    n = {
+        ["<BS>k"] = {
+            function()
+                local ok, start = require("indent_blankline.utils").get_current_context(
+                    vim.g.indent_blankline_context_patterns,
+                    vim.g.indent_blankline_use_treesitter_scope
+                )
+
+                if ok then
+                    vim.api.nvim_win_set_cursor(vim.api.nvim_get_current_win(), { start, 0 })
+                    vim.cmd [[normal! _]]
+                end
+            end,
+
+            "Jump to current context",
+        },
+    },
+} --}}}
+
+-- code outline panel
+M.aerial = {
+    plugin = true,
+    n = {
+        ["<Right>"] = { "<cmd> AerialToggle! right<CR>" },
+    }
+}
+
+M.asyncrun = { --{{{
+    plugin = true,
+
+    n = {
+        -- TODO: find new mapping to close quickfix
+        -- ["``"] = { "<cmd> call asyncrun#quickfix_toggle(8)<CR>", "toggle quickfix window" },
+        ["<leader>m"] = { ":AsyncRun -program=" .. vim.o.makeprg .. "<CR>", "make using asyncrun" },
+        ["<leader>ar"] = { ":AsyncRun ", "custom asyncrun command" },
+        ["<leader>pd"] = { "<cmd> AsyncRun lpr -P PDF_PRINT %<CR>", "PDF print file" },
+        ["<leader>pp"] = { "<cmd> AsyncRun lpr %<CR>" },
+    },
+} --}}}
+
+M.vim_bookmarks = { --{{{
+    n = {
+        ["<BS>m"] = { "<cmd> Telescope vim_bookmarks<CR>", "show bookmarks" },
+        ["mk"] = { "<cmd> BookmarkToggle<CR>", "toggle bookmarks" },
+        ["<leader>mm"] = { "<cmd> BookmarkAnnotate<CR>", "annotation bookmarks" },
+        ["<leader>mc"] = { "<cmd> BookmarkClear<CR>", "clear bookmarks in buffer" },
+        ["<leader>mx"] = { "<cmd> BookmarkClearAll<CR>", "clear bookmarks in all buffers" },
+        ["]b"] = { "<cmd>BookmarkNext<CR>", "jump to next bookmark" },
+        ["[b"] = { "<cmd>BookmarkNext<CR>", "jump to prev bookmark" },
+    },
+} --}}}
+
+M.iron = { -- {{{{{{
+    plugin = true,
+    n = {
+        ["<leader>ir"] = { "<cmd>IronRepl<CR>", "start IronRepl" },
+    }
+}
 -- }}}
 --
-                    -- color picker
-                    M.ccc = {
-                        plugin = true,
-                        n = {
-                            ["<leader>cp"] = {"<cmd>CccPick<CR>", "color picker"}
-                        },
-                    }
+-- color picker
+M.ccc = {
+    plugin = true,
+    n = {
+        ["<leader>cp"] = { "<cmd>CccPick<CR>", "color picker" }
+    },
+}
 -- }}}
 
-                    -- M.neorepl = {{{{
-                        --   plugin = true,
-                        --
-                        --   i = {
-                            --     ["C-p"] = { "<Plug>(neorepl-hist-prev)"},
-                            --   }
-                            --
-                            -- }
+-- M.neorepl = {{{{
+--   plugin = true,
+--
+--   i = {
+--     ["C-p"] = { "<Plug>(neorepl-hist-prev)"},
+--   }
+--
+-- }
 -- }}}
 
 M.vimux = {
     plugin = true,
     n = {
-        -- rerun last 
-        ["<leader><Down>"] = {"<cmd>VimuxRunLastCommand<CR>", "vimux run last command"},
+        -- rerun last
+        ["<leader><Down>"] = { "<cmd>VimuxRunLastCommand<CR>", "vimux run last command" },
         -- prompt
-        ["<leader>vv"] = {"<cmd>VimuxPromptCommand<CR>", "vimux prompt command"},
-        ["<leader>vc"] = {"<cmd>VimuxInterruptRunner<CR>", "vimux interrupt command"},
-        ["<leader>vl"] = {"<cmd>VimuxClearTerminalScreen<CR>", "vimux clear terminal"},
-        ["<leader>vx"] = {"<cmd>VimuxCloseRunner<CR>", "vimux close runner"},
+        ["<leader>vv"] = { "<cmd>VimuxPromptCommand<CR>", "vimux prompt command" },
+        ["<leader>vc"] = { "<cmd>VimuxInterruptRunner<CR>", "vimux interrupt command" },
+        ["<leader>vl"] = { "<cmd>VimuxClearTerminalScreen<CR>", "vimux clear terminal" },
+        ["<leader>vx"] = { "<cmd>VimuxCloseRunner<CR>", "vimux close runner" },
     }
 }
 
@@ -913,5 +915,33 @@ M.golang = {
         ["<leader>da"] = { "<cmd> GoDebug -a<CR>", "go debug attach" },
     }
 }
---
+
+-- git
+M.gitsigns = {
+    plugin = true,
+    n = {
+        ["<leader>gs"] = { "<cmd> lua require'gitsigns'.stage_hunk()<CR>",
+            "Git stage hunk",
+        },
+        ["<leader>gS"] = { "<cmd> lua require'gitsigns'.stage_buffer()<CR>",
+            "Git stage buffer",
+        },
+        ["<leader>gR"] = { "<cmd> lua require'gitsigns'.reset_buffer_index()<CR>",
+            "Git stage buffer",
+        },
+        ["<leader>gp"] = { "<cmd> lua require'gitsigns'.preview_hunk()<CR>",
+            "Git stage buffer",
+        },
+        ["<leader>gu"] = {"<cmd> lua require'gitsigns'.undo_stage_hunk()<CR>",
+            "Git undo stage hunk",
+        },
+        ["]h"] = { "<cmd> lua require'gitsigns'.next_hunk()<CR>", 
+            "Git next hunk",
+        },
+        ["[h"] = { "<cmd> lua require'gitsigns'.prev_hunk()<CR>", 
+            "Git prev hunk",
+        }
+    }
+}
+
 return M
diff --git a/lua/custom/chadrc.lua b/lua/custom/chadrc.lua
index a91296b..d51f400 100644
--- a/lua/custom/chadrc.lua
+++ b/lua/custom/chadrc.lua
@@ -14,7 +14,7 @@ local colors = {
 -- vim.tbl_deep_extend("force", M.ui.hl_add, custom_theme)
 
 M.ui = {
-    theme = "gruvbox_light",
+    theme = "monekai",
     theme_toggle = { "monekai", "gruvbox_light" },
     hl_override = {
         Comment = {
diff --git a/lua/custom/plugins/configs/gitsigns.lua b/lua/custom/plugins/configs/gitsigns.lua
new file mode 100644
index 0000000..49db3f5
--- /dev/null
+++ b/lua/custom/plugins/configs/gitsigns.lua
@@ -0,0 +1,32 @@
+local M = {}
+
+
+local on_attach = function(bufnr)
+    require("custom.utils").set_plugin_mappings "gitsigns"
+end
+
+M.setup = function()
+    local present, gitsigns = pcall(require, "gitsigns")
+
+    if not present then
+        return
+    end
+
+    require("base46").load_highlight "git"
+
+    local options = {
+        signs = {
+            add = { hl = "DiffAdd", text = "│", numhl = "GitSignsAddNr" },
+            change = { hl = "DiffChange", text = "│", numhl = "GitSignsChangeNr" },
+            delete = { hl = "DiffDelete", text = "", numhl = "GitSignsDeleteNr" },
+            topdelete = { hl = "DiffDelete", text = "‾", numhl = "GitSignsDeleteNr" },
+            changedelete = { hl = "DiffChangeDelete", text = "~", numhl = "GitSignsChangeNr" },
+        },
+        on_attach = on_attach,
+        
+    }
+
+    gitsigns.setup(options)
+end
+
+return M
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index 0199d6c..458bda7 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -80,7 +80,7 @@ return {
     -- Treesitter dev/exploration tool
     ["nvim-treesitter/playground"] = {
         opt = true,
-        cmd = {"TSPlayground*"},
+        cmd = { "TSPlayground*" },
     },
 
     ["nvim-treesitter/nvim-treesitter-context"] = {
@@ -194,22 +194,22 @@ return {
         after = "nvim-dap",
         config = function()
             require("nvim-dap-virtual-text").setup({
-                enabled = true,                        -- enable this plugin (the default)
-                enabled_commands = true,               -- create commands DapVirtualTextEnable, DapVirtualTextDisable, DapVirtualTextToggle, (DapVirtualTextForceRefresh for refreshing when debug adapter did not notify its termination)
-                highlight_changed_variables = true,    -- highlight changed values with NvimDapVirtualTextChanged, else always NvimDapVirtualText
-                highlight_new_as_changed = false,      -- highlight new variables in the same way as changed variables (if highlight_changed_variables)
-                show_stop_reason = true,               -- show stop reason when stopped for exceptions
-                commented = false,                     -- prefix virtual text with comment string
-                only_first_definition = true,          -- only show virtual text at first definition (if there are multiple)
-                all_references = false,                -- show virtual text on all all references of the variable (not only definitions)
+                enabled = true, -- enable this plugin (the default)
+                enabled_commands = true, -- create commands DapVirtualTextEnable, DapVirtualTextDisable, DapVirtualTextToggle, (DapVirtualTextForceRefresh for refreshing when debug adapter did not notify its termination)
+                highlight_changed_variables = true, -- highlight changed values with NvimDapVirtualTextChanged, else always NvimDapVirtualText
+                highlight_new_as_changed = false, -- highlight new variables in the same way as changed variables (if highlight_changed_variables)
+                show_stop_reason = true, -- show stop reason when stopped for exceptions
+                commented = false, -- prefix virtual text with comment string
+                only_first_definition = true, -- only show virtual text at first definition (if there are multiple)
+                all_references = false, -- show virtual text on all all references of the variable (not only definitions)
                 filter_references_pattern = '<module', -- filter references (not definitions) pattern when all_references is activated (Lua gmatch pattern, default filters out Python modules)
                 -- experimental features:
-                virt_text_pos = 'eol',                 -- position of virtual text, see `:h nvim_buf_set_extmark()`
-                all_frames = true,                    -- show virtual text for all stack frames not only current. Only works for debugpy on my machine.
-                virt_lines = false,                    -- show virtual lines instead of virtual text (will flicker!)
-                virt_text_win_col = 80                -- position the virtual text at a fixed window column (starting from the first text column) ,
-                                                       -- e.g. 80 to position at column 80, see `:h nvim_buf_set_extmark()`
-            }) 
+                virt_text_pos = 'eol', -- position of virtual text, see `:h nvim_buf_set_extmark()`
+                all_frames = true, -- show virtual text for all stack frames not only current. Only works for debugpy on my machine.
+                virt_lines = false, -- show virtual lines instead of virtual text (will flicker!)
+                virt_text_win_col = 80 -- position the virtual text at a fixed window column (starting from the first text column) ,
+                -- e.g. 80 to position at column 80, see `:h nvim_buf_set_extmark()`
+            })
         end
     }, -- }}}
 
@@ -304,15 +304,15 @@ return {
     },
 
     ["https://git.sp4ke.xyz/sp4ke/vim-vimux"] = {
-      cond = function()
-        return vim.env.TMUX ~= nil
-      end,
-      setup = function()
-        require("core.utils").load_mappings "vimux"
-        -- vim.g.VimuxDebug = 1
-        vim.g.VimuxHeight = 20
-      end
-  },
+        cond = function()
+            return vim.env.TMUX ~= nil
+        end,
+        setup = function()
+            require("core.utils").load_mappings "vimux"
+            -- vim.g.VimuxDebug = 1
+            vim.g.VimuxHeight = 20
+        end
+    },
 
     -- Job management (use nvim startjob )
     -- Run async commands (make & errors)
@@ -328,13 +328,23 @@ return {
     }, -- }}}
 
     -- Git
+    ["lewis6991/gitsigns.nvim"] = {
+        ft = "gitcommit",
+        setup = function()
+            require("core.lazy_load").gitsigns()
+        end,
+        config = function()
+            require("custom.plugins.configs.gitsigns").setup()
+        end,
+    },
+
     ["tpope/vim-fugitive"] = {
         cmd = { "G", "Git", "G*" }
     },
 
     ["sindrets/diffview.nvim"] = {
-        requires = {"nvim-lua/plenary.nvim"},
-        after = {"plenary.nvim"},
+        requires = { "nvim-lua/plenary.nvim" },
+        after = { "plenary.nvim" },
 
         config = function()
             require("diffview").setup({
@@ -385,22 +395,22 @@ return {
                 delay_ms = 1000, -- How long repeated usage of a key should be prevented
                 grace_period = 1, -- How many repeated keypresses are allowed
                 keys = { -- Which keys (in which modes) should be delayed
-                ['n'] = { 'h', 'j', 'k', 'l' },
-                -- ['nvi'] = { '<Left>', '<Down>', '<Up>', '<Right>' },
-            },
-            ignore_filetypes = {
-                "qf",
-                "NvimTree",
-                "help",
-                "qf",
-                "netrw",
-                "neorepl",
-                "dapui*",
-                "mason",
-                "guihua*",
-                "terminal*",
-            },
-        })
+                    ['n'] = { 'h', 'j', 'k', 'l' },
+                    -- ['nvi'] = { '<Left>', '<Down>', '<Up>', '<Right>' },
+                },
+                ignore_filetypes = {
+                    "qf",
+                    "NvimTree",
+                    "help",
+                    "qf",
+                    "netrw",
+                    "neorepl",
+                    "dapui*",
+                    "mason",
+                    "guihua*",
+                    "terminal*",
+                },
+            })
         end
     },
     -- ["takac/vim-hardtime"] = {-- {{{
@@ -505,9 +515,9 @@ return {
     --
 
     ['stevearc/aerial.nvim'] = {
-        after = {"base46"},
-        keys =  {"<Right>"},
-        cmd = {"Aerial*"},
+        after = { "base46" },
+        keys = { "<Right>" },
+        cmd = { "Aerial*" },
         config = function()
             require("core.utils").load_mappings "aerial"
             require('aerial').setup({})
diff --git a/lua/custom/utils.lua b/lua/custom/utils.lua
index d4087e0..a4ee939 100644
--- a/lua/custom/utils.lua
+++ b/lua/custom/utils.lua
@@ -13,6 +13,7 @@ local M = {}
       mapping_info.opts, opts.mode = nil, nil
       opts.desc = mapping_info[2]
 
+      P(keybind)
       vim.keymap.set(mode, keybind, mapping_info[1], opts)
     end
   end
diff --git a/lua/plugins/configs/cmp.lua b/lua/plugins/configs/cmp.lua
index 4f852ed..b411af4 100644
--- a/lua/plugins/configs/cmp.lua
+++ b/lua/plugins/configs/cmp.lua
@@ -92,7 +92,10 @@ local options = {
             elseif luasnip.expandable() then
                 luasnip.expand_or_jump()
             elseif has_words_before() then
-                cmp.confirm()
+                cmp.confirm({
+                    behavior = cmp.ConfirmBehavior.Replace,
+                    select = false,
+                })
             else
                 fallback()
             end
diff --git a/lua/plugins/configs/others.lua b/lua/plugins/configs/others.lua
index 32a5fd7..572f579 100644
--- a/lua/plugins/configs/others.lua
+++ b/lua/plugins/configs/others.lua
@@ -106,28 +106,6 @@ M.comment = function()
   nvim_comment.setup(options)
 end
 
-M.gitsigns = function()
-  local present, gitsigns = pcall(require, "gitsigns")
-
-  if not present then
-    return
-  end
-
-  require("base46").load_highlight "git"
-
-  local options = {
-    signs = {
-      add = { hl = "DiffAdd", text = "│", numhl = "GitSignsAddNr" },
-      change = { hl = "DiffChange", text = "│", numhl = "GitSignsChangeNr" },
-      delete = { hl = "DiffDelete", text = "", numhl = "GitSignsDeleteNr" },
-      topdelete = { hl = "DiffDelete", text = "‾", numhl = "GitSignsDeleteNr" },
-      changedelete = { hl = "DiffChangeDelete", text = "~", numhl = "GitSignsChangeNr" },
-    },
-  }
-
-  options = load_override(options, "lewis6991/gitsigns.nvim")
-  gitsigns.setup(options)
-end
 
 M.devicons = function()
   local present, devicons = pcall(require, "nvim-web-devicons")
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index ae8fb9c..6450a78 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -86,17 +86,6 @@ local plugins = {
     end,
   },
 
-  -- git stuff
-  ["lewis6991/gitsigns.nvim"] = {
-    ft = "gitcommit",
-    setup = function()
-      require("core.lazy_load").gitsigns()
-    end,
-    config = function()
-      require("plugins.configs.others").gitsigns()
-    end,
-  },
-
   -- lsp stuff
 
   ["williamboman/mason.nvim"] = {