diff --git a/lua/taken/core/remaps.lua b/lua/taken/core/remaps.lua index 9ed733c..f276f87 100644 --- a/lua/taken/core/remaps.lua +++ b/lua/taken/core/remaps.lua @@ -41,23 +41,33 @@ set("n", "", function() vim.cmd("so") end, { desc = "Source current file" }) +-- telescope + +set("n", "ff", "Telescope find_files", { desc = "Find files" }) +set("n", "fg", "Telescope live_grep", { desc = "Live grep" }) +set("n", "fb", "Telescope buffers", { desc = "Find buffers" }) +set("n", "fB", "Telescope builtin", { desc = "Find buffers" }) +set("n", "fh", "Telescope help_tags", { desc = "Help tags" }) +set("n", "fp", "Telescope project", { desc = "Find projects" }) +set("n", "fd", "Telescope file_browser", { desc = "File browser" }) +set("n", "fr", "Telescope reloader", { desc = "Reload config" }) +set("n", "ht", "Telescope colorscheme", { desc = "Colorscheme" }) +set("n", "fc", "Telescope commands", { desc = "Commands" }) + -- window movement set("n", "ww", "w", { desc = "Move between splits" }) set("n", "wc", "c", { desc = "Close split" }) set("n", "wv", "v", { desc = "Vertical split" }) set("n", "ws", "s", { desc = "Horizontal split" }) --- Packer -set("n", "pu", ":PackerUpdate ") -set("n", "ps", ":PackerSync ") -set("n", "pc", ":PackerClean ") -set("n", "po", ":PackerCompile ") +-- lazy +set("n", "lu", "Lazy", { desc = "Lazy UI" }) -- nvim-tree set("n", "n", ":NvimTreeToggle ") set("n", "e", ":NvimTreeFocus ") set("n", "r", ":NvimTreeRefresh ") -vim.keymap.set("n", "tr", function () +set("n", "tr", function () require("nvim-tree.api").tree.change_root(vim.fn.getcwd()) end, {desc = "Change root dir to current dir"} ) diff --git a/lua/taken/lazy/lazy.lua b/lua/taken/lazy/lazy.lua index 2c2adf0..86e2c01 100644 --- a/lua/taken/lazy/lazy.lua +++ b/lua/taken/lazy/lazy.lua @@ -93,6 +93,7 @@ require("lazy").setup({ build = function() vim.fn["mkdp#util#install"]() end, + ft = "markdown", }, "numToStr/Comment.nvim", { "NeogitOrg/neogit", dependencies = "nvim-lua/plenary.nvim" }, @@ -125,7 +126,7 @@ require("lazy").setup({ }, { "akinsho/toggleterm.nvim", version = "*" }, "rcarriga/nvim-notify", - { + { "akinsho/bufferline.nvim", version = "*", dependencies = "nvim-tree/nvim-web-devicons" @@ -140,5 +141,8 @@ require("lazy").setup({ }, "ObserverOfTime/nvimcord", "xiyaowong/transparent.nvim", - "jokajak/keyseer.nvim", + { + "jokajak/keyseer.nvim", + cmd = "KeySeer" + }, }) diff --git a/lua/taken/plugins/telescope.lua b/lua/taken/plugins/telescope.lua index 830fe5c..e5b360b 100644 --- a/lua/taken/plugins/telescope.lua +++ b/lua/taken/plugins/telescope.lua @@ -3,16 +3,8 @@ if not telescope_setup then return end -local builtin_setup, builtin = pcall(require, "telescope.builtin") -if not builtin_setup then - return -end - telescope.load_extension("project") -local findProject = require("telescope").extensions.project.project -local fileBrowser = require("telescope").extensions.file_browser.file_browser - telescope.setup({ extensions = { project = { @@ -38,14 +30,3 @@ telescope.setup({ telescope.load_extension("file_browser") telescope.load_extension("fzf") - -vim.keymap.set("n", "ff", builtin.find_files, { desc = "Find files" }) -vim.keymap.set("n", "fg", builtin.live_grep, { desc = "Live grep" }) -vim.keymap.set("n", "fb", builtin.buffers, { desc = "Find buffers" }) -vim.keymap.set("n", "fB", "Telescope builtin", { desc = "Find buffers" }) -vim.keymap.set("n", "fh", builtin.help_tags, { desc = "Help tags" }) -vim.keymap.set("n", "fp", findProject, { desc = "Find projects" }) -vim.keymap.set("n", "fd", fileBrowser, { desc = "File browser" }) -vim.keymap.set("n", "fr", builtin.reloader, { desc = "Reload config" }) -vim.keymap.set("n", "ht", builtin.colorscheme, { desc = "Colorscheme" }) -vim.keymap.set("n", "fc", builtin.commands, { desc = "Commands" }) diff --git a/lua/taken/plugins/whichkey.lua b/lua/taken/plugins/whichkey.lua index 7622263..6942ea6 100644 --- a/lua/taken/plugins/whichkey.lua +++ b/lua/taken/plugins/whichkey.lua @@ -31,8 +31,8 @@ whichkey.register({ g = { name = "git", }, - p = { - name = "packer", + l = { + name = "lazy", }, t = { name = "toggle",