Tokyonight colorscheme and lazydev.nvim

4 files changed, 35 insertions, 7 deletions

diff --git a/lua/bee/LSPs/init.lua b/lua/bee/LSPs/init.lua
index 69f34cf..d5abf9b 100644
--- a/lua/bee/LSPs/init.lua
+++ b/lua/bee/LSPs/init.lua
@@ -25,6 +25,28 @@ return {
         end,
     },
     {
+        "lazydev.nvim",
+        auto_enable = true,
+        cmd = { "LazyDev" },
+        ft = "lua",
+        after = function(_)
+            require("lazydev").setup({
+                library = {
+                    {
+                        words = { "uv", "vim%.uv", "vim%.loop" },
+                        path = nixInfo("luvit-meta", "plugins", "start", "luvit-meta") .. "/library",
+                    },
+                    { words = { "nixInfo" }, path = nixInfo("", "info_plugin_path") .. "/lua" },
+                    { words = { "nixInfo%.lze" }, path = nixInfo("lze", "plugins", "start", "lze") .. "/lua" },
+                    {
+                        words = { "nixInfo%.lze" },
+                        path = nixInfo("lzextras", "plugins", "start", "lzextras") .. "/lua",
+                    },
+                },
+            })
+        end,
+    },
+    {
         "rustaceanvim",
         auto_enable = true,
         lazy = false, -- lazy loaded by default
diff --git a/lua/bee/init.lua b/lua/bee/init.lua
index 265a0e3..ca4ba08 100644
--- a/lua/bee/init.lua
+++ b/lua/bee/init.lua
@@ -40,6 +40,11 @@ nixInfo.lze.load({
         end,
     },
     {
+        "tokyonight.nvim",
+        auto_enable = true,
+        colorscheme = "tokyonight",
+    },
+    {
         "nvim-surround",
         auto_enable = true,
         event = "DeferredUIEnter",
@@ -87,4 +92,4 @@ nixInfo.lze.load({
     },
 })
 
-vim.cmd.colorscheme("base46-tokyonight")
+vim.cmd.colorscheme("tokyonight")
diff --git a/module.nix b/module.nix
index 18881df..d49fdd4 100644
--- a/module.nix
+++ b/module.nix
@@ -142,11 +142,12 @@ inputs:
         data = nvim-web-devicons;
         lazy = false;
       }
-      {
-        data = config.nvim-lib.neovimPlugins.base46;
-        lazy = false;
-      }
+      # {
+      #   data = config.nvim-lib.neovimPlugins.base46;
+      #   lazy = false;
+      # }
 
+      tokyonight-nvim
       config.nvim-lib.neovimPlugins.neogit
       blink-indent
       blink-pairs
diff --git a/plugin/keymaps.lua b/plugin/keymaps.lua
index bb623e4..0614e51 100644
--- a/plugin/keymaps.lua
+++ b/plugin/keymaps.lua
@@ -1,5 +1,5 @@
-vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv", { desc = "Moves Line Down" })
-vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv", { desc = "Moves Line Up" })
+vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv", { desc = "Moves Line Down", silent = true })
+vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv", { desc = "Moves Line Up", silent = true })
 vim.keymap.set("n", "<C-d>", "<C-d>zz", { desc = "Scroll Down" })
 vim.keymap.set("n", "<C-u>", "<C-u>zz", { desc = "Scroll Up" })
 vim.keymap.set("n", "n", "nzzzv", { desc = "Next Search Result" })