From e8e8b3d9ac923d35d8983bdf9f39c5465b2e41a8 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Wed, 21 Feb 2024 22:05:24 +0100 Subject: [PATCH 1/3] noice lsp fix --- lua/custom/plugins.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/custom/plugins.lua b/lua/custom/plugins.lua index fe69a90..9ae1ad2 100644 --- a/lua/custom/plugins.lua +++ b/lua/custom/plugins.lua @@ -335,8 +335,8 @@ local plugins = { require("noice").setup { lsp = { override = { - -- ["vim.lsp.util.convert_input_to_markdown_lines"] = true, - -- ["vim.lsp.util.stylize_markdown"] = true, + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, -- ["cmp.entry.get_documentation"] = true, }, -- IDK how to disable the nvchad builtins for this, which would From fd46b2a6b6265cffe6a3a1068c516db9ac02bd1b Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Thu, 29 Feb 2024 20:10:26 +0100 Subject: [PATCH 2/3] important changes --- lua/custom/init.lua | 2 +- lua/custom/plugins.lua | 48 +++++++++++++++++++++++++++++++++++++++++- spell/en.utf-8.add | 5 +++++ 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/lua/custom/init.lua b/lua/custom/init.lua index 2b1f16f..bb0538c 100644 --- a/lua/custom/init.lua +++ b/lua/custom/init.lua @@ -67,7 +67,7 @@ opt.foldlevel = 10 -- start with all folds open -- Editor UI -- === -vim.o.guifont = "FiraCode Nerd Font:h22" +vim.o.guifont = "FiraCode Nerd Font:h15" opt.termguicolors = true opt.shortmess = "xsTOInfFitloCaAs" opt.showmode = true -- Show mode in cmd window diff --git a/lua/custom/plugins.lua b/lua/custom/plugins.lua index 9ae1ad2..4b9eef9 100644 --- a/lua/custom/plugins.lua +++ b/lua/custom/plugins.lua @@ -821,7 +821,17 @@ local plugins = { }, -- LSP configuration server = { - auto_attach = false, + on_attach = function(client, bufnr) + -- you can also put keymaps in here + end, + settings = { + -- rust-analyzer language server configuration + ["rust-analyzer"] = { + cargo = { + features = "all", + }, + }, + }, }, -- DAP configuration dap = { @@ -840,6 +850,42 @@ local plugins = { require("nvim-dap-virtual-text").setup() end, }, + { + "jvgrootveld/telescope-zoxide", + dependencies = "nvim-telescope/telescope.nvim", + config = function() + -- Useful for easily creating commands + local z_utils = require "telescope._extensions.zoxide.utils" + + require("telescope").setup { + -- (other Telescope configuration...) + extensions = { + zoxide = { + prompt_title = "[ Walking on the shoulders of TJ ]", + mappings = { + default = { + after_action = function(selection) + print("Update to (" .. selection.z_score .. ") " .. selection.path) + end, + }, + [""] = { + before_action = function(selection) + print "before C-s" + end, + action = function(selection) + vim.cmd.edit(selection.path) + end, + }, + -- Opens the selected entry in a new split + [""] = { action = z_utils.create_basic_command "split" }, + }, + }, + }, + } + require("telescope").load_extension "zoxide" + end, + }, + { "nanotee/zoxide.vim" }, } return plugins diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index ffff2ce..ff89454 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -283,3 +283,8 @@ erstmal warmweißer WG SilverBullet +Forgejo +additional +scriptable +Autcrate +rustaceans From 4e77f5836e29f6be031aac36e8fdef73a8d3c5de Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Thu, 29 Feb 2024 20:13:12 +0100 Subject: [PATCH 3/3] zoxide --- lua/custom/mappings.lua | 3 +++ lua/custom/plugins.lua | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lua/custom/mappings.lua b/lua/custom/mappings.lua index 0647703..b8e91a2 100644 --- a/lua/custom/mappings.lua +++ b/lua/custom/mappings.lua @@ -208,6 +208,9 @@ M.telescope = { ["fo"] = { " Telescope oldfiles ", "Find oldfiles" }, ["fz"] = { " Telescope current_buffer_fuzzy_find ", "Find in current buffer" }, + -- directory + ["cd"] = { " Telescope zoxide list", "telescope zoxide cd" }, + -- git ["cm"] = { " Telescope git_commits ", "Git commits" }, ["gt"] = { " Telescope git_status ", "Git status" }, diff --git a/lua/custom/plugins.lua b/lua/custom/plugins.lua index 9d2040c..b74ccaf 100644 --- a/lua/custom/plugins.lua +++ b/lua/custom/plugins.lua @@ -885,7 +885,7 @@ local plugins = { require("telescope").load_extension "zoxide" end, }, - { "nanotee/zoxide.vim" }, + { "nanotee/zoxide.vim", lazy = false, enabled = false }, } return plugins