From 76ad2385e9c8aab056dd0343838e1866a1b28dfa Mon Sep 17 00:00:00 2001
From: Taken <taken@mairimashita.org>
Date: Tue, 16 Jan 2024 16:27:41 +0100
Subject: [PATCH] Updated remaps handling and disabled noice

Signed-off-by: Taken <taken@mairimashita.org>
---
 lua/taken/core/remaps.lua   | 133 +++++++++++++++++++++---------------
 lua/taken/plugins/noice.lua |   1 +
 2 files changed, 79 insertions(+), 55 deletions(-)

diff --git a/lua/taken/core/remaps.lua b/lua/taken/core/remaps.lua
index ec0b6c6..38a7939 100644
--- a/lua/taken/core/remaps.lua
+++ b/lua/taken/core/remaps.lua
@@ -1,65 +1,88 @@
-local vscode = require('vscode-neovim')
 local set = vim.keymap.set
 
-function loadInNeovim(mode, mapping, command, desc)
-    if desc == nil then
-        set(mode, mapping, command)
+local v = {
+    ["J"] = { ":m '>+1<CR>gv=gv" },
+    ["K"] = { ":m '<-2<CR>gv=gv" },
+}
+
+local n = {
+    ["<leader>P"] = { [["+p]], desc = "Paste from sys clipboard" },
+
+    ["J"] = { "mzJ`z" },
+    ["<C-d>"] = { "<C-d>zz" },
+    ["<C-u>"] = { "<C-u>zz" },
+    ["n"] = { "nzzzv" },
+    ["N"] = { "Nzzzv" },
+
+    ["Q"] = { "<nop>" },
+
+    -- buffer
+    ["<leader>bf"] = { vim.lsp.buf.format, desc = "Format 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" },
+    ["<leader>j"] = { "<cmd>lprev<CR>zz" },
+
+    -- window movement
+    ["<leader>ww"] = { "<C-w>w", desc = "Move between splits" },
+    ["<leader>wc"] = { "<C-w>c", desc = "Close split" },
+    ["<leader>wv"] = { "<C-w>v", desc = "Vertical split" },
+    ["<leader>ws"] = { "<C-w>s", desc = "Horizontal split" },
+
+    ["<leader><leader>"] = {
+        function()
+            if vim.bo.filetype ~= "lua" then
+                vim.notify("Not a lua file")
+                return
+            end
+
+            vim.cmd("so")
+        end,
+        desc = "Source current file",
+    },
+
+    ["<leader>ht"] = {
+        function()
+            require("taken.functions.themes").themeselector()
+        end,
+        desc = "Theme selector",
+    },
+
+    ["<leader>s"] = {
+        [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]],
+        desc = "Replace all instances of the word on cursor",
+    },
+
+    -- lazy
+    ["<leader>lu"] = { "<cmd>Lazy<CR>", desc = "Lazy UI" },
+}
+
+local vn = {
+    ["<leader>y"] = { [["+y]], desc = "Yank in to sys clipboard" },
+    ["<leader>d"] = { [["_d]], desc = "Actually deletes text" },
+}
+
+for map, command in pairs(v) do
+    if command.desc then
+        set("v", map, command[1], { desc = command.desc })
     else
-        set(mode, mapping, command, desc)
+        set("v", map, command[1])
     end
 end
 
-function loadInVscode(mode, mapping, command, desc)
-    if desc == nil then
-        vscode.map(mode, mapping, command)
+for map, command in pairs(n) do
+    if command.desc then
+        set("n", map, command[1], { desc = command.desc })
     else
-        vscode.map(mode, mapping, command, desc)
+        set("n", map, command[1])
     end
 end
 
-set("v", "J", ":m '>+1<CR>gv=gv")
-set("v", "K", ":m '<-2<CR>gv=gv")
-
-set("n", "J", "mzJ`z")
-set("n", "<C-d>", "<C-d>zz")
-set("n", "<C-u>", "<C-u>zz")
-set("n", "n", "nzzzv")
-set("n", "N", "Nzzzv")
-
-set({ "n", "v" }, "<leader>y", [["+y]], { desc = "Yank in to sys clipboard" })
-set("n", "<leader>P", [["+p]], { desc = "Paste from sys clipboard" })
-set({ "n", "v" }, "<leader>d", [["_d]], { desc = "Actually deletes text" })
-
-set("n", "Q", "<nop>")
-
--- buffer
-set("n", "<leader>bf", vim.lsp.buf.format, { desc = "Format buffer" })
-set("n", "<leader>bs", ":write <CR>", { desc = "Save buffer" })
-set("n", "<C-k>", "<cmd>cnext<CR>zz")
-set("n", "<C-j>", "<cmd>cprev<CR>zz")
-set("n", "<leader>k", "<cmd>lnext<CR>zz")
-set("n", "<leader>j", "<cmd>lprev<CR>zz")
-
-set(
-    "n",
-    "<leader>s",
-    [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]],
-    { desc = "Replace all instances of the word on cursor" }
-)
-
-set("n", "<leader><leader>", function()
-    vim.cmd("so")
-end, { desc = "Source current file" })
-
-set("n", "<leader>ht", function()
-    require("taken.functions.themes").themeselector()
-end, { desc = "Theme selector" })
-
--- window movement
-set("n", "<leader>ww", "<C-w>w", { desc = "Move between splits" })
-set("n", "<leader>wc", "<C-w>c", { desc = "Close split" })
-set("n", "<leader>wv", "<C-w>v", { desc = "Vertical split" })
-set("n", "<leader>ws", "<C-w>s", { desc = "Horizontal split" })
-
--- lazy
-set("n", "<leader>lu", "<cmd>Lazy<CR>", { desc = "Lazy UI" })
\ No newline at end of file
+for map, command in pairs(vn) do
+    if command.desc then
+        set({ "v", "n" }, map, command[1], { desc = command.desc })
+    else
+        set({ "v", "n" }, map, command[1])
+    end
+end
diff --git a/lua/taken/plugins/noice.lua b/lua/taken/plugins/noice.lua
index ad11ae1..57b5aa5 100644
--- a/lua/taken/plugins/noice.lua
+++ b/lua/taken/plugins/noice.lua
@@ -1,6 +1,7 @@
 return {
     "folke/noice.nvim",
     event = "VeryLazy",
+    enabled = false,
     dependencies = {
         "MunifTanjim/nui.nvim",
         "rcarriga/nvim-notify",