From 89478fac86209c25663db72fa0ca60b0c46f2137 Mon Sep 17 00:00:00 2001
From: Taken <taken@mairimashita.org>
Date: Sun, 15 Sep 2024 18:46:50 +0200
Subject: [PATCH] Updated mappings and plugins

---
 lua/taken/core/remaps.lua            |  1 -
 lua/taken/plugins/barbecue.lua       | 12 ----
 lua/taken/plugins/bufferline.lua     | 87 ------------------------
 lua/taken/plugins/conform.lua        |  7 +-
 lua/taken/plugins/dap.lua            |  4 +-
 lua/taken/plugins/dashboard.lua      | 98 ----------------------------
 lua/taken/plugins/gen.lua            | 24 -------
 lua/taken/plugins/keyseer.lua        | 56 ----------------
 lua/taken/plugins/neotree.lua        |  3 +-
 lua/taken/plugins/nvim-cmp.lua       |  8 +--
 lua/taken/plugins/nvimtree.lua       |  6 +-
 lua/taken/plugins/otherplugins.lua   | 15 ++++-
 lua/taken/plugins/sessionmanager.lua |  4 +-
 lua/taken/plugins/whichkey.lua       | 29 --------
 lua/taken/utils/mkdir.lua            | 14 ++--
 lua/taken/utils/on_attach.lua        |  4 +-
 16 files changed, 36 insertions(+), 336 deletions(-)
 delete mode 100644 lua/taken/plugins/barbecue.lua
 delete mode 100644 lua/taken/plugins/bufferline.lua
 delete mode 100644 lua/taken/plugins/dashboard.lua
 delete mode 100644 lua/taken/plugins/gen.lua
 delete mode 100644 lua/taken/plugins/keyseer.lua

diff --git a/lua/taken/core/remaps.lua b/lua/taken/core/remaps.lua
index 7a15e23..9ccdfb1 100644
--- a/lua/taken/core/remaps.lua
+++ b/lua/taken/core/remaps.lua
@@ -17,7 +17,6 @@ local M = {
 
         ["<leader>0"] = { "0", desc = "Go to true line beggining" },
         -- buffer
-        ["<leader>bs"] = { ":write <CR>", desc = "Save buffer" },
         ["<C-k>"] = { "<cmd>cnext<CR>zz" },
         ["<C-j>"] = { "<cmd>cprev<CR>zz" },
         ["<leader>k"] = { "<cmd>lnext<CR>zz" },
diff --git a/lua/taken/plugins/barbecue.lua b/lua/taken/plugins/barbecue.lua
deleted file mode 100644
index 10ba2d0..0000000
--- a/lua/taken/plugins/barbecue.lua
+++ /dev/null
@@ -1,12 +0,0 @@
---- @type LazyPluginSpec
-return {
-    "utilyre/barbecue.nvim",
-    name = "barbecue",
-    version = "*",
-    enabled = false,
-    dependencies = {
-        "SmiteshP/nvim-navic",
-        "nvim-tree/nvim-web-devicons",
-    },
-    config = true,
-}
diff --git a/lua/taken/plugins/bufferline.lua b/lua/taken/plugins/bufferline.lua
deleted file mode 100644
index a2345d6..0000000
--- a/lua/taken/plugins/bufferline.lua
+++ /dev/null
@@ -1,87 +0,0 @@
---- @type LazyPluginSpec
-return {
-    "akinsho/bufferline.nvim",
-    version = "*",
-    dependencies = "nvim-tree/nvim-web-devicons",
-    enabled = false,
-    config = function()
-        vim.keymap.set("n", "<leader><Tab>", ":BufferLineCycleNext <CR>", { silent = true, desc = "Cycle tabs" })
-        vim.keymap.set("n", "<leader>bn", ":BufferLineCycleNext <CR>", { silent = true, desc = "Next tab" })
-        vim.keymap.set("n", "<leader>bp", ":BufferLineCyclePrev <CR>", { silent = true, desc = "NextPrevious tab" })
-
-        local bufferline = require("bufferline")
-
-        bufferline.setup({
-            options = {
-                mode = "buffers",
-                style_preset = bufferline.style_preset.default,
-                themable = true,
-                numbers = "none",
-                indicator = {
-                    icon = "⏽",
-                    style = "icon",
-                },
-                show_buffer_close_icons = false,
-                show_close_icon = false,
-                max_name_length = 18,
-                max_prefix_length = 15,
-                truncate_names = true,
-                tab_size = 18,
-                offsets = {
-                    {
-                        filetype = "NvimTree",
-                        text = "File Explorer",
-                        highlight = "None",
-                        padding = 1,
-                    },
-                },
-                color_icons = true,
-                get_element_icon = function(element)
-                    local icon, hl =
-                        require("nvim-web-devicons").get_icon_by_filetype(element.filetype, { default = false })
-                    return icon, hl
-                end,
-                always_show_bufferline = true,
-                diagnostics = "nvim_lsp",
-                diagnostics_update_in_insert = false,
-                diagnostics_indicator = function(count, level, diagnostics_dict, context)
-                    if context.buffer:current() then
-                        return ""
-                    end
-
-                    return ""
-                end,
-                highlights = {
-                    background = {
-                        guibg = "None",
-                    },
-                    fill = {
-                        guibg = "None",
-                    },
-                    close_button = {
-                        guibg = "None",
-                    },
-                    separator_visible = {
-                        guibg = "None",
-                    },
-                    tab_close = {
-                        guibg = "None",
-                    },
-                    tab_separator = {
-                        guibg = "None",
-                    },
-                    tab_separator_selected = {
-                        guibg = "None",
-                    },
-                },
-            },
-        })
-
-        vim.g.transparent_groups = vim.list_extend(
-            vim.g.transparent_groups or {},
-            vim.tbl_map(function(v)
-                return v.hl_group
-            end, vim.tbl_values(require("bufferline.config").highlights))
-        )
-    end,
-}
diff --git a/lua/taken/plugins/conform.lua b/lua/taken/plugins/conform.lua
index df39f7a..9876877 100644
--- a/lua/taken/plugins/conform.lua
+++ b/lua/taken/plugins/conform.lua
@@ -28,11 +28,6 @@ return {
             require("conform").format({ async = true, lsp_format = "fallback", range = range })
         end, { range = true })
 
-        vim.api.nvim_set_keymap(
-            "n",
-            "<leader>bf",
-            "<cmd>Format<CR>",
-            { noremap = true, silent = true, desc = "Format buffer" }
-        )
+        vim.keymap.set("n", "<leader>bf", "<cmd>Format<CR>", { silent = true, desc = "Format buffer" })
     end,
 }
diff --git a/lua/taken/plugins/dap.lua b/lua/taken/plugins/dap.lua
index 693059a..69b3cf6 100644
--- a/lua/taken/plugins/dap.lua
+++ b/lua/taken/plugins/dap.lua
@@ -6,8 +6,8 @@ return {
         "nvim-neotest/nvim-nio",
     },
     config = function()
-        vim.keymap.set("n", "<leader>tb", "<cmd>DapToggleBreakpoint<CR>", { silent = true })
-        vim.keymap.set("n", "<leader>tc", "<cmd>DapContinue<CR>", { silent = true })
+        vim.keymap.set("n", "<leader>tb", "<cmd>DapToggleBreakpoint<CR>", { silent = true, desc = "Toggle breakpoint" })
+        vim.keymap.set("n", "<leader>tc", "<cmd>DapContinue<CR>", { silent = true, desc = "Continue debugger" })
 
         local dap = require("dap")
         local dapui = require("dapui")
diff --git a/lua/taken/plugins/dashboard.lua b/lua/taken/plugins/dashboard.lua
deleted file mode 100644
index 44d534b..0000000
--- a/lua/taken/plugins/dashboard.lua
+++ /dev/null
@@ -1,98 +0,0 @@
---- @type LazyPluginSpec
-return {
-    "glepnir/dashboard-nvim",
-    event = "VimEnter",
-    cmd = "Dashboard",
-    enabled = false,
-    dependencies = { "nvim-tree/nvim-web-devicons" },
-    config = function()
-        local db = require("dashboard")
-
-        local stats = require("lazy").stats()
-        local version = vim.version().major .. "." .. vim.version().minor .. "." .. vim.version().patch
-        local plugins_count = stats.count
-        local ms = math.floor(stats.startuptime + 0.5)
-        local time = vim.fn.strftime("%H:%M:%S")
-        local date = vim.fn.strftime("%d.%m.%Y")
-
-        db.setup({
-            theme = "doom",
-            config = {
-                header = {
-                    [[                                                                                ]],
-                    [[ =================     ===============     ===============   ========  ======== ]],
-                    [[ \\ . . . . . . .\\   //. . . . . . .\\   //. . . . . . .\\  \\. . .\\// . . // ]],
-                    [[ ||. . ._____. . .|| ||. . ._____. . .|| ||. . ._____. . .|| || . . .\/ . . .|| ]],
-                    [[ || . .||   ||. . || || . .||   ||. . || || . .||   ||. . || ||. . . . . . . || ]],
-                    [[ ||. . ||   || . .|| ||. . ||   || . .|| ||. . ||   || . .|| || . | . . . . .|| ]],
-                    [[ || . .||   ||. _-|| ||-_ .||   ||. . || || . .||   ||. _-|| ||-_.|\ . . . . || ]],
-                    [[ ||. . ||   ||-'  || ||  `-||   || . .|| ||. . ||   ||-'  || ||  `|\_ . .|. .|| ]],
-                    [[ || . _||   ||    || ||    ||   ||_ . || || . _||   ||    || ||   |\ `-_/| . || ]],
-                    [[ ||_-' ||  .|/    || ||    \|.  || `-_|| ||_-' ||  .|/    || ||   | \  / |-_.|| ]],
-                    [[ ||    ||_-'      || ||      `-_||    || ||    ||_-'      || ||   | \  / |  `|| ]],
-                    [[ ||    `'         || ||         `'    || ||    `'         || ||   | \  / |   || ]],
-                    [[ ||            .===' `===.         .==='.`===.         .===' /==. |  \/  |   || ]],
-                    [[ ||         .=='   \_|-_ `===. .==='   _|_   `===. .===' _-|/   `==  \/  |   || ]],
-                    [[ ||      .=='    _-'    `-_  `='    _-'   `-_    `='  _-'   `-_  /|  \/  |   || ]],
-                    [[ ||   .=='    _-'          `-__\._-'         `-_./__-'         `' |. /|  |   || ]],
-                    [[ ||.=='    _-'                                                     `' |  /==.|| ]],
-                    [[ =='    _-'                                                            \/   `== ]],
-                    [[ \   _-'                                                                `-_   / ]],
-                    [[  `''                                                                      ``'  ]],
-                    [[             [ TIP: To exit Neovim, just power off your computer. ]             ]],
-                    [[                                                                                ]],
-                },
-                center = {
-                    {
-                        icon = "󰍉 ",
-                        icon_hl = "main",
-                        desc = "Find files",
-                        desc_hl = "main",
-                        key = "f",
-                        key_hl = "main",
-                        action = "Telescope find_files",
-                    },
-                    {
-                        icon = " ",
-                        icon_hl = "main",
-                        desc = "Select project",
-                        desc_hl = "main",
-                        key = "p",
-                        key_hl = "main",
-                        action = "Telescope project",
-                    },
-                    {
-                        icon = " ",
-                        icon_hl = "main",
-                        desc = "Neorg",
-                        desc_hl = "main",
-                        key = "n",
-                        key_hl = "main",
-                        action = "Neorg workspace main",
-                    },
-                    {
-                        icon = "󰚰 ",
-                        icon_hl = "main",
-                        desc = "Lazy sync",
-                        desc_hl = "main",
-                        key = "l",
-                        key_hl = "main",
-                        action = "Lazy sync",
-                    },
-                },
-                footer = {
-                    " "
-                    .. version
-                    .. " "
-                    .. plugins_count
-                    .. " plugins in "
-                    .. ms
-                    .. "ms 󰃭 "
-                    .. date
-                    .. "  "
-                    .. time,
-                },
-            },
-        })
-    end,
-}
diff --git a/lua/taken/plugins/gen.lua b/lua/taken/plugins/gen.lua
deleted file mode 100644
index bf7ac37..0000000
--- a/lua/taken/plugins/gen.lua
+++ /dev/null
@@ -1,24 +0,0 @@
---- @type LazyPluginSpec
-return {
-    "David-Kunz/gen.nvim",
-    cmd = "Gen",
-    opts = {
-        model = "llama2",
-        host = "localhost",
-        port = "11434",
-        display_mode = "float",
-        show_prompt = false,
-        show_model = true,
-        no_auto_close = false,
-        init = function(options)
-            pcall(io.popen, "ollama serve")
-        end,
-        command = function(options)
-            return "curl --silent --no-buffer -X POST http://"
-                .. options.host
-                .. ":"
-                .. options.port
-                .. "/api/chat -d $body"
-        end,
-    },
-}
diff --git a/lua/taken/plugins/keyseer.lua b/lua/taken/plugins/keyseer.lua
deleted file mode 100644
index f52b39a..0000000
--- a/lua/taken/plugins/keyseer.lua
+++ /dev/null
@@ -1,56 +0,0 @@
---- @type LazyPluginSpec
-return {
-    "jokajak/keyseer.nvim",
-    cmd = "KeySeer",
-    config = function()
-        local keyseer = require("keyseer")
-
-        keyseer.setup({
-            debug = false,
-            initial_mode = "n",
-            include_builtin_keymaps = true,
-            include_global_keymaps = true,
-            include_buffer_keymaps = true,
-            include_modified_keypresses = false,
-            ignore_whichkey_conflicts = true,
-
-            ui = {
-                border = "double",
-                margin = { 1, 0, 1, 0 },
-                winblend = 0,
-                size = {
-                    width = 65,
-                    height = 10,
-                },
-                icons = {
-                    keyseer = "",
-                },
-                show_header = true,
-            },
-            keyboard = {
-                layout = "qwertz",
-                keycap_padding = { 0, 1, 0, 1 },
-                highlight_padding = { 0, 0, 0, 0 },
-                key_labels = {
-                    ["Up"] = "↑",
-                    ["Down"] = "↓",
-                    ["Left"] = "←",
-                    ["Right"] = "→",
-                    ["<F1>"] = "F1",
-                    ["<F2>"] = "F2",
-                    ["<F3>"] = "F3",
-                    ["<F4>"] = "F4",
-                    ["<F5>"] = "F5",
-                    ["<F6>"] = "F6",
-                    ["<F7>"] = "F7",
-                    ["<F8>"] = "F8",
-                    ["<F9>"] = "F9",
-                    ["<F10>"] = "F10",
-                    -- ["<space>"] = "SPC",
-                    -- ["<cr>"] = "RET",
-                    -- ["<tab>"] = "TAB",
-                },
-            },
-        })
-    end,
-}
diff --git a/lua/taken/plugins/neotree.lua b/lua/taken/plugins/neotree.lua
index 076888f..cc9d7e6 100644
--- a/lua/taken/plugins/neotree.lua
+++ b/lua/taken/plugins/neotree.lua
@@ -12,8 +12,7 @@ return {
         "MunifTanjim/nui.nvim",
     },
     config = function()
-        vim.keymap.set("n", "<leader>n", "<cmd>Neotree toggle<CR>")
-        vim.keymap.set("n", "<leader>e", "<cmd>Neotree focus<CR>")
+        vim.keymap.set("n", "<leader>n", "<cmd>Neotree toggle<CR>", { silent = true, desc = "Toggle neotree" })
 
         local neotree = require("neo-tree")
 
diff --git a/lua/taken/plugins/nvim-cmp.lua b/lua/taken/plugins/nvim-cmp.lua
index e7447db..df9264e 100644
--- a/lua/taken/plugins/nvim-cmp.lua
+++ b/lua/taken/plugins/nvim-cmp.lua
@@ -84,9 +84,9 @@ return {
 
         vim.keymap.set({ "i", "s" }, "<S-Tab>", function()
             luasnip.jump(1)
-        end, { silent = true })
-        -- vim.keymap.set({ "i", "s" }, "<C-Tab>", function()
-        --     luasnip.jump(-1)
-        -- end, { silent = true })
+        end, { silent = true, desc = "Jump to next snippet" })
+        vim.keymap.set({ "i", "s" }, "<C-Tab>", function()
+            luasnip.jump(-1)
+        end, { silent = true, desc = "Jump to previous snippet" })
     end,
 }
diff --git a/lua/taken/plugins/nvimtree.lua b/lua/taken/plugins/nvimtree.lua
index 0b5bc86..e141e3d 100644
--- a/lua/taken/plugins/nvimtree.lua
+++ b/lua/taken/plugins/nvimtree.lua
@@ -30,9 +30,9 @@ return {
             },
         })
 
-        vim.keymap.set("n", "<leader>n", ":NvimTreeToggle <CR>", { silent = true })
-        vim.keymap.set("n", "<leader>e", ":NvimTreeFocus <CR>", { silent = true })
-        vim.keymap.set("n", "<leader>r", ":NvimTreeRefresh <CR>", { silent = true })
+        vim.keymap.set("n", "<leader>n", ":NvimTreeToggle <CR>", { silent = true, desc = "Toggle nvim-tree" })
+        vim.keymap.set("n", "<leader>e", ":NvimTreeFocus <CR>", { silent = true, desc = "Focus nvim-tree" })
+        vim.keymap.set("n", "<leader>r", ":NvimTreeRefresh <CR>", { silent = true, desc = "Refresh nvim-tree" })
         vim.keymap.set("n", "<leader>tr", function()
             require("nvim-tree.api").tree.change_root(vim.fn.getcwd())
         end, { silent = true, desc = "Change root dir to current dir" })
diff --git a/lua/taken/plugins/otherplugins.lua b/lua/taken/plugins/otherplugins.lua
index c56e22f..55158f8 100644
--- a/lua/taken/plugins/otherplugins.lua
+++ b/lua/taken/plugins/otherplugins.lua
@@ -52,7 +52,7 @@ return {
             local todo = require("todo-comments")
 
             todo.setup({})
-            vim.keymap.set("n", "<leader>ft", "<cmd>TodoTelescope<CR>", { noremap = true, silent = true })
+            vim.keymap.set("n", "<leader>ft", "<cmd>TodoTelescope<CR>", { silent = true, desc = "Search for TODOs" })
         end,
     },
     {
@@ -150,4 +150,17 @@ return {
         "uga-rosa/ccc.nvim",
         cmd = { "CccPick", "CccConvert" },
     },
+    {
+        "mistweaverco/kulala.nvim",
+        ft = "http",
+        config = function()
+            require("kulala").setup()
+
+            vim.filetype.add({
+                extension = {
+                    ["http"] = "http",
+                },
+            })
+        end,
+    },
 }
diff --git a/lua/taken/plugins/sessionmanager.lua b/lua/taken/plugins/sessionmanager.lua
index ccf46b2..55c05e6 100644
--- a/lua/taken/plugins/sessionmanager.lua
+++ b/lua/taken/plugins/sessionmanager.lua
@@ -30,13 +30,13 @@ return {
             "n",
             "<leader>ps",
             "<cmd>Telescope neovim-project discover<CR>",
-            { desc = "Open project discover" }
+            { desc = "Open project discover", silent = true }
         )
         vim.keymap.set(
             "n",
             "<leader>ph",
             "<cmd>Telescope neovim-project history<CR>",
-            { desc = "Opens project history" }
+            { desc = "Opens project history", silent = true }
         )
     end,
 }
diff --git a/lua/taken/plugins/whichkey.lua b/lua/taken/plugins/whichkey.lua
index 11605de..c022d46 100644
--- a/lua/taken/plugins/whichkey.lua
+++ b/lua/taken/plugins/whichkey.lua
@@ -50,34 +50,5 @@ return {
                 { "<leader>w", group = "window" },
             },
         })
-
-        -- whichkey.register({
-        --     ["<leader>"] = {
-        --         w = {
-        --             name = "window",
-        --         },
-        --         f = {
-        --             name = "find",
-        --         },
-        --         b = {
-        --             name = "buffer",
-        --         },
-        --         g = {
-        --             name = "git",
-        --         },
-        --         l = {
-        --             name = "lazy",
-        --         },
-        --         t = {
-        --             name = "toggle",
-        --         },
-        --         p = {
-        --             name = "project",
-        --         },
-        --         h = {
-        --             name = "highlights",
-        --         },
-        --     },
-        -- })
     end,
 }
diff --git a/lua/taken/utils/mkdir.lua b/lua/taken/utils/mkdir.lua
index c4468e5..f4701e0 100644
--- a/lua/taken/utils/mkdir.lua
+++ b/lua/taken/utils/mkdir.lua
@@ -5,15 +5,15 @@ local fn = vim.fn
 local M = {}
 
 function M.run()
-  local dir = fn.expand('<afile>:p:h')
+    local dir = fn.expand("<afile>:p:h")
 
-  if dir:find('%l+://') == 1 then
-    return
-  end
+    if dir:find("%l+://") == 1 then
+        return
+    end
 
-  if fn.isdirectory(dir) == 0 then
-    fn.mkdir(dir, 'p')
-  end
+    if fn.isdirectory(dir) == 0 then
+        fn.mkdir(dir, "p")
+    end
 end
 
 return M
diff --git a/lua/taken/utils/on_attach.lua b/lua/taken/utils/on_attach.lua
index a1d4334..55fabfa 100644
--- a/lua/taken/utils/on_attach.lua
+++ b/lua/taken/utils/on_attach.lua
@@ -1,9 +1,9 @@
 local on_attach = function(client, bufnr)
     local function opts(desc)
         if desc then
-            return { noremap = true, silent = true, buffer = bufnr, desc = desc }
+            return { silent = true, buffer = bufnr, desc = desc }
         else
-            return { noremap = true, silent = true, buffer = bufnr }
+            return { silent = true, buffer = bufnr }
         end
     end