diff --git a/lua/taken/core/opts.lua b/lua/taken/core/opts.lua index 2384e01..2e80df0 100644 --- a/lua/taken/core/opts.lua +++ b/lua/taken/core/opts.lua @@ -34,9 +34,13 @@ opt.incsearch = true opt.termguicolors = true +opt.splitright = true +opt.splitbelow = true + opt.scrolloff = 8 opt.signcolumn = "yes" opt.isfname:append("@-@") +opt.backspace = "indent,eol,start" opt.updatetime = 50 @@ -44,7 +48,7 @@ opt.updatetime = 50 if vim.fn.has("win32") == 1 then o.shell = "pwsh -nologo" o.shellcmdflag = - "-NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.Encoding]::UTF8;" + "-NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.Encoding]::UTF8;" o.shellredir = "2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode" o.shellpipe = "2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode" o.shellquote = "" diff --git a/lua/taken/core/remaps.lua b/lua/taken/core/remaps.lua index b9ae6fc..725aa0c 100644 --- a/lua/taken/core/remaps.lua +++ b/lua/taken/core/remaps.lua @@ -54,8 +54,11 @@ local M = { end, desc = "Theme selector", }, + ["hc"] = { ":nohl", desc = "Clear search highlights" }, }, vn = { + ["+"] = { "", desc = "Increment number" }, + ["-"] = { "", desc = "Decrement number" }, ["y"] = { [["+y]], desc = "Yank in to sys clipboard" }, ["d"] = { [["_d]], desc = "Actually deletes text" }, }, diff --git a/lua/taken/plugins/lsp/mason.lua b/lua/taken/plugins/lsp/mason.lua index 4c101fc..2a633a7 100644 --- a/lua/taken/plugins/lsp/mason.lua +++ b/lua/taken/plugins/lsp/mason.lua @@ -1,9 +1,7 @@ --- @type LazyPluginSpec return { "williamboman/mason.nvim", - build = function() - pcall(vim.cmd, "MasonUpdate") - end, + build = "MasonUpdate", dependencies = { "williamboman/mason-lspconfig.nvim", "jayp0521/mason-null-ls.nvim", @@ -13,7 +11,15 @@ return { local mason_lspconfig = require("mason-lspconfig") local mason_null_ls = require("mason-null-ls") - mason.setup() + mason.setup({ + ui = { + icons = { + package_installed = "✓", + package_pending = "➜", + package_uninstalled = "✗", + }, + }, + }) mason_lspconfig.setup({ ensure_installed = { diff --git a/lua/taken/plugins/otherplugins.lua b/lua/taken/plugins/otherplugins.lua index d8b9df3..e87972d 100644 --- a/lua/taken/plugins/otherplugins.lua +++ b/lua/taken/plugins/otherplugins.lua @@ -9,7 +9,12 @@ return { "folke/todo-comments.nvim", ependencies = { "nvim-lua/plenary.nvim" }, event = { "BufReadPre", "BufNewFile" }, - config = true, + config = function() + local todo = require("todo-comments") + + todo.setup({}) + vim.keymap.set("n", "ft", "TodoTelescope", { noremap = true, silent = true }) + end, }, { "folke/trouble.nvim", diff --git a/lua/taken/plugins/telescope.lua b/lua/taken/plugins/telescope.lua index 19b328b..6b8a8ad 100644 --- a/lua/taken/plugins/telescope.lua +++ b/lua/taken/plugins/telescope.lua @@ -5,35 +5,29 @@ return { dependencies = { "nvim-lua/plenary.nvim", "nvim-telescope/telescope-file-browser.nvim", - "nvim-telescope/telescope-project.nvim", { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, }, config = function() local telescope = require("telescope") local command = { "fd", "-I", "-H", "--type", "file" } - local ignored = { "node_modules", ".git", "dist" } + local ignored = { "node_modules", ".git" } for i, v in ipairs(ignored) do table.insert(command, "--exclude") table.insert(command, v) end - telescope.load_extension("project") - telescope.setup({ + defaults = { + path_display = { "smart" }, + }, pickers = { find_files = { find_command = command, }, }, extensions = { - project = { - -- sync_with_nvim_tree = true, - -- on_project_selected = function() - -- require("nvim-tree.api").tree.change_root(vim.fn.getcwd()) - -- end, - }, file_browser = { hidden = { file_browser = true, @@ -41,10 +35,10 @@ return { }, }, fzf = { - fuzzy = true, -- false will only do exact matching + fuzzy = true, -- false will only do exact matching override_generic_sorter = true, -- override the generic sorter - override_file_sorter = true, -- override the file sorter - case_mode = "smart_case", -- or "ignore_case" or "respect_case" + override_file_sorter = true, -- override the file sorter + case_mode = "smart_case", -- or "ignore_case" or "respect_case" }, }, }) diff --git a/lua/taken/plugins/whichkey.lua b/lua/taken/plugins/whichkey.lua index 9d74bd4..819c59e 100644 --- a/lua/taken/plugins/whichkey.lua +++ b/lua/taken/plugins/whichkey.lua @@ -47,7 +47,7 @@ return { name = "project", }, h = { - name = "theme", + name = "highlights", }, }, })