remove noice, it is not nice... | remove rustacean, just use rust_analyzer by itself it is fine as is | add fidget for lsp progress
This commit is contained in:
parent
77248911bc
commit
d822cd7b6d
9 changed files with 60 additions and 110 deletions
19
flake.lock
generated
19
flake.lock
generated
|
@ -50,20 +50,19 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nvim_plugin-folke/noice.nvim": {
|
"nvim_plugin-j-hui/fidget.nvim": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715761625,
|
"lastModified": 1712242924,
|
||||||
"narHash": "sha256-m3vRKLuWrNkhHMgnpfRodTqBScaQlsIYnShsrpjKa+E=",
|
"narHash": "sha256-fZhK5opGXRRryhNpdaEPLpBq4tTibZREelXmasMLHzw=",
|
||||||
"owner": "folke",
|
"owner": "j-hui",
|
||||||
"repo": "noice.nvim",
|
"repo": "fidget.nvim",
|
||||||
"rev": "8389ff59ec6eab87d7328a83e3f28ca96111d7b1",
|
"rev": "1ba38e4cbb24683973e00c2e36f53ae64da38ef5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "folke",
|
"owner": "j-hui",
|
||||||
"ref": "v2.0.3",
|
"repo": "fidget.nvim",
|
||||||
"repo": "noice.nvim",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -71,7 +70,7 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nvim_plugin-chrisgrieser/nvim-early-retirement": "nvim_plugin-chrisgrieser/nvim-early-retirement",
|
"nvim_plugin-chrisgrieser/nvim-early-retirement": "nvim_plugin-chrisgrieser/nvim-early-retirement",
|
||||||
"nvim_plugin-folke/noice.nvim": "nvim_plugin-folke/noice.nvim",
|
"nvim_plugin-j-hui/fidget.nvim": "nvim_plugin-j-hui/fidget.nvim",
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -17,10 +17,11 @@
|
||||||
url = "github:chrisgrieser/nvim-early-retirement";
|
url = "github:chrisgrieser/nvim-early-retirement";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
"nvim_plugin-folke/noice.nvim" = {
|
"nvim_plugin-j-hui/fidget.nvim" = {
|
||||||
url = "github:folke/noice.nvim/v2.0.3";
|
url = "github:j-hui/fidget.nvim";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
outputs =
|
outputs =
|
||||||
{ self, nixpkgs, ... }@inputs:
|
{ self, nixpkgs, ... }@inputs:
|
||||||
|
@ -61,7 +62,6 @@
|
||||||
"nvim_plugin-catppuccin/nvim" = catppuccin-nvim;
|
"nvim_plugin-catppuccin/nvim" = catppuccin-nvim;
|
||||||
"nvim_plugin-MunifTanjim/nui.nvim" = nui-nvim;
|
"nvim_plugin-MunifTanjim/nui.nvim" = nui-nvim;
|
||||||
"nvim_plugin-rcarriga/nvim-notify" = nvim-notify;
|
"nvim_plugin-rcarriga/nvim-notify" = nvim-notify;
|
||||||
# "nvim_plugin-folke/noice.nvim" = noice-nvim;
|
|
||||||
"nvim_plugin-nvim-lualine/lualine.nvim" = lualine-nvim;
|
"nvim_plugin-nvim-lualine/lualine.nvim" = lualine-nvim;
|
||||||
"nvim_plugin-folke/which-key.nvim" = which-key-nvim;
|
"nvim_plugin-folke/which-key.nvim" = which-key-nvim;
|
||||||
"nvim_plugin-nvim-telescope/telescope.nvim" = telescope-nvim;
|
"nvim_plugin-nvim-telescope/telescope.nvim" = telescope-nvim;
|
||||||
|
@ -97,7 +97,6 @@
|
||||||
"nvim_plugin-zbirenbaum/copilot-cmp" = copilot-cmp;
|
"nvim_plugin-zbirenbaum/copilot-cmp" = copilot-cmp;
|
||||||
"nvim_plugin-zbirenbaum/copilot.lua" = copilot-lua;
|
"nvim_plugin-zbirenbaum/copilot.lua" = copilot-lua;
|
||||||
"nvim_plugin-folke/neodev.nvim" = neodev-nvim;
|
"nvim_plugin-folke/neodev.nvim" = neodev-nvim;
|
||||||
"nvim_plugin-mrcjkb/rustaceanvim" = rustaceanvim;
|
|
||||||
"nvim_plugin-Saecki/crates.nvim" = crates-nvim;
|
"nvim_plugin-Saecki/crates.nvim" = crates-nvim;
|
||||||
"nvim_plugin-lvimuser/lsp-inlayhints.nvim" = lsp-inlayhints-nvim;
|
"nvim_plugin-lvimuser/lsp-inlayhints.nvim" = lsp-inlayhints-nvim;
|
||||||
"nvim_plugin-rafamadriz/friendly-snippets" = friendly-snippets;
|
"nvim_plugin-rafamadriz/friendly-snippets" = friendly-snippets;
|
||||||
|
@ -126,7 +125,7 @@
|
||||||
fzf # search fuzzy
|
fzf # search fuzzy
|
||||||
tree-sitter
|
tree-sitter
|
||||||
glow # markdown renderer
|
glow # markdown renderer
|
||||||
# curl # http requests TODO
|
curl # http requests
|
||||||
# nodePackages.cspell TODO
|
# nodePackages.cspell TODO
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -18,8 +18,7 @@ vim.opt.timeoutlen = 300
|
||||||
|
|
||||||
-- line numbering, relative
|
-- line numbering, relative
|
||||||
vim.opt.number = true
|
vim.opt.number = true
|
||||||
vim.wo.number = true
|
vim.opt.relativenumber = true
|
||||||
vim.wo.relativenumber = true
|
|
||||||
|
|
||||||
-- Highlights the results of previous search, which is annoying when we are done searching
|
-- Highlights the results of previous search, which is annoying when we are done searching
|
||||||
vim.opt.hlsearch = false
|
vim.opt.hlsearch = false
|
||||||
|
@ -69,7 +68,7 @@ vim.opt.splitbelow = true
|
||||||
vim.opt.splitright = true
|
vim.opt.splitright = true
|
||||||
|
|
||||||
-- Set completeopt to have a better completion experience
|
-- Set completeopt to have a better completion experience
|
||||||
vim.opt.completeopt = "menuone,noselect"
|
vim.opt.completeopt = "menu,menuone,noinsert,noselect"
|
||||||
vim.diagnostic.config({
|
vim.diagnostic.config({
|
||||||
float = { border = "single" },
|
float = { border = "single" },
|
||||||
})
|
})
|
||||||
|
@ -85,5 +84,3 @@ vim.opt.equalalways = false
|
||||||
|
|
||||||
-- enable colors for opacity changes
|
-- enable colors for opacity changes
|
||||||
vim.opt.termguicolors = true
|
vim.opt.termguicolors = true
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -46,8 +46,7 @@ return {
|
||||||
luasnip.lsp_expand(args.body)
|
luasnip.lsp_expand(args.body)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
completion = { completeopt = "menu,menuone,noinsert" },
|
completion = { completeopt = "menu,menuone,noinsert,noselect" },
|
||||||
|
|
||||||
mapping = cmp.mapping.preset.insert({
|
mapping = cmp.mapping.preset.insert({
|
||||||
-- Scroll the documentation window [b]ack / [f]orward
|
-- Scroll the documentation window [b]ack / [f]orward
|
||||||
["<C-u>"] = cmp.mapping.scroll_docs(-4),
|
["<C-u>"] = cmp.mapping.scroll_docs(-4),
|
||||||
|
@ -55,17 +54,20 @@ return {
|
||||||
["<esc>"] = cmp.mapping(function(fallback)
|
["<esc>"] = cmp.mapping(function(fallback)
|
||||||
if cmp.visible() then
|
if cmp.visible() then
|
||||||
cmp.abort()
|
cmp.abort()
|
||||||
|
if cmp.get_active_entry() == nil then
|
||||||
|
-- TODO this is still being weird... if I go into active entry then back up and press esc it causes havoc
|
||||||
fallback()
|
fallback()
|
||||||
|
end
|
||||||
else
|
else
|
||||||
fallback()
|
fallback()
|
||||||
end
|
end
|
||||||
end),
|
end),
|
||||||
|
-- ["<esc>"] = cmp.mapping.abort(),
|
||||||
|
|
||||||
-- Select the [n]ext item
|
-- Select the [n]ext item
|
||||||
["<C-j>"] = cmp.mapping(function(fallback)
|
["<C-j>"] = cmp.mapping(function(fallback)
|
||||||
if cmp.visible() then
|
if cmp.visible() then
|
||||||
cmp.select_next_item()
|
cmp.select_next_item()
|
||||||
-- elseif luasnip.expand_or_jumpable() then
|
|
||||||
elseif luasnip.expand_or_locally_jumpable() then
|
elseif luasnip.expand_or_locally_jumpable() then
|
||||||
luasnip.expand_or_jump()
|
luasnip.expand_or_jump()
|
||||||
else
|
else
|
||||||
|
@ -83,7 +85,7 @@ return {
|
||||||
end
|
end
|
||||||
end, { "i", "s" }),
|
end, { "i", "s" }),
|
||||||
["<C-y>"] = cmp.mapping.confirm({ select = true }),
|
["<C-y>"] = cmp.mapping.confirm({ select = true }),
|
||||||
["<C-space>"] = cmp.mapping.complete({}),
|
["<C-c>"] = cmp.mapping.complete({}),
|
||||||
}),
|
}),
|
||||||
sources = {
|
sources = {
|
||||||
{
|
{
|
||||||
|
@ -107,21 +109,6 @@ return {
|
||||||
-- Rust crates.io integration
|
-- Rust crates.io integration
|
||||||
{ name = "crates" },
|
{ name = "crates" },
|
||||||
},
|
},
|
||||||
-- TODO revisit if I want these or not
|
|
||||||
-- sorting = {
|
|
||||||
-- priority_weight = 1,
|
|
||||||
-- comparators = {
|
|
||||||
-- cmp.config.compare.locality,
|
|
||||||
-- cmp.config.compare.recently_used,
|
|
||||||
-- cmp.config.compare.score,
|
|
||||||
-- cmp.config.compare.offset,
|
|
||||||
-- cmp.config.compare.order,
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
-- window = { -- also? https://github.com/RingOfStorms/nvim/blob/master/lua/plugins/lsp.lua#L330-L347
|
|
||||||
-- completion = cmp.config.window.bordered(),
|
|
||||||
-- documentation = cmp.config.window.bordered(),
|
|
||||||
-- },
|
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,7 @@ end
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"nvim-lualine/lualine.nvim",
|
"nvim-lualine/lualine.nvim",
|
||||||
dependencies = { { "folke/noice.nvim", optional = true } },
|
-- dependencies = { { "folke/noice.nvim", optional = true } },
|
||||||
lazy = false,
|
lazy = false,
|
||||||
opts = function()
|
opts = function()
|
||||||
return {
|
return {
|
||||||
|
|
|
@ -1,55 +0,0 @@
|
||||||
return {
|
|
||||||
"folke/noice.nvim",
|
|
||||||
dependencies = {
|
|
||||||
"MunifTanjim/nui.nvim",
|
|
||||||
"rcarriga/nvim-notify",
|
|
||||||
{ "nvim-telescope/telescope.nvim", optional = true },
|
|
||||||
},
|
|
||||||
event = "VeryLazy",
|
|
||||||
opts = {
|
|
||||||
route = {
|
|
||||||
routes = {
|
|
||||||
{ filter = { event = "lsp" }, opts = { skip = true } },
|
|
||||||
-- { opts = { skip = true } },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
-- cmdline = {
|
|
||||||
-- enabled = false,
|
|
||||||
-- },
|
|
||||||
-- popupmenu = {
|
|
||||||
-- enabled = false, -- enables the Noice popupmenu
|
|
||||||
-- },
|
|
||||||
-- notify = {
|
|
||||||
-- enabled = false,
|
|
||||||
-- },
|
|
||||||
-- smart_move = {
|
|
||||||
-- enabled = false,
|
|
||||||
-- },
|
|
||||||
messages = {
|
|
||||||
-- enabled = false,
|
|
||||||
view = "mini", -- default view for messages
|
|
||||||
view_error = "notify", -- view for errors
|
|
||||||
view_warn = "mini", -- view for warnings
|
|
||||||
view_history = "messages", -- view for :messages
|
|
||||||
view_search = false, -- view for search count messages. Set to `false` to disable
|
|
||||||
},
|
|
||||||
lsp = {
|
|
||||||
-- override markdown rendering so that **cmp** and other plugins use **Treesitter**
|
|
||||||
override = {
|
|
||||||
["vim.lsp.util.convert_input_to_markdown_lines"] = true,
|
|
||||||
["vim.lsp.util.stylize_markdown"] = true,
|
|
||||||
["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp
|
|
||||||
},
|
|
||||||
-- I had an issue with auto_open kicking me out of insert mode when entering insert mode
|
|
||||||
signature = { enabled = false, auto_open = { trigger = false } },
|
|
||||||
-- hover = { enabled = false },
|
|
||||||
-- message = { enabled = false },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
config = function(_, opts)
|
|
||||||
require("noice").setup(opts)
|
|
||||||
U.safeRequire("telescope", function(t)
|
|
||||||
t.load_extension("noice")
|
|
||||||
end)
|
|
||||||
end,
|
|
||||||
}
|
|
|
@ -8,5 +8,18 @@ return {
|
||||||
},
|
},
|
||||||
config = function(_, opts)
|
config = function(_, opts)
|
||||||
require("notify").setup(opts)
|
require("notify").setup(opts)
|
||||||
|
vim.notify = require("notify")
|
||||||
|
|
||||||
|
U.safeRequire("telescope", function(t)
|
||||||
|
t.load_extension("notify")
|
||||||
|
end)
|
||||||
end,
|
end,
|
||||||
|
keys = {
|
||||||
|
{
|
||||||
|
"<leader>fn",
|
||||||
|
"<cmd>Telescope notify<cr>",
|
||||||
|
desc = "Telescope search notifications",
|
||||||
|
mode = { "n", "v", "x" },
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
7
lua/plugins/fidget_notificaitons.lua
Normal file
7
lua/plugins/fidget_notificaitons.lua
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
return {
|
||||||
|
"j-hui/fidget.nvim",
|
||||||
|
event = "VeryLazy",
|
||||||
|
opts = {
|
||||||
|
},
|
||||||
|
main = "fidget",
|
||||||
|
}
|
|
@ -1,7 +1,11 @@
|
||||||
return {
|
return {
|
||||||
-- LSP helper plugins for various languages
|
-- LSP helper plugins for various languages
|
||||||
{ "folke/neodev.nvim", event = { "BufRead *.lua", "BufRead *.vim" }, opts = {}, main = "neodev" },
|
{ "folke/neodev.nvim", event = { "BufRead *.lua", "BufRead *.vim" }, opts = {}, main = "neodev" },
|
||||||
{ "mrcjkb/rustaceanvim", lazy = false }, -- uses ftplugins to enable itself lazily already
|
-- { TODO come back to this, do I actually use any features provided here? I was losing out on rust-analyzer stuff when this was on and it was added below...
|
||||||
|
-- "mrcjkb/rustaceanvim",
|
||||||
|
-- -- uses ftplugins to enable itself lazily already
|
||||||
|
-- lazy = false,
|
||||||
|
-- },
|
||||||
-- TODO add some hotkeys for opening the popup menus on crates
|
-- TODO add some hotkeys for opening the popup menus on crates
|
||||||
{ "Saecki/crates.nvim", event = "BufRead Cargo.toml", tag = "stable", opts = {}, main = "crates" },
|
{ "Saecki/crates.nvim", event = "BufRead Cargo.toml", tag = "stable", opts = {}, main = "crates" },
|
||||||
{
|
{
|
||||||
|
@ -106,9 +110,8 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
rust_analyzer = {},
|
||||||
nil_ls = {},
|
nil_ls = {},
|
||||||
-- TODO probably remove V
|
|
||||||
v_analyzer = { filetypes = { "vlang", "v", "vsh", "vv" } },
|
|
||||||
tsserver = {
|
tsserver = {
|
||||||
-- typescript/javascript
|
-- typescript/javascript
|
||||||
implicitProjectConfiguration = {
|
implicitProjectConfiguration = {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue