From c712b6dadacdba738968b29bc50a153831d9e1a5 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Tue, 14 Nov 2023 21:47:20 +0100 Subject: [PATCH] nvim: update config --- flake.lock | 6 +++--- home/config/nvim/nifoc/keymap.fnl | 4 +++- home/config/nvim/plugins/cmp.fnl | 3 +-- home/config/nvim/plugins/fidget.fnl | 3 +++ home/config/nvim/plugins/lsp.fnl | 6 +++--- home/config/nvim/plugins/notify.fnl | 3 --- home/programs/nvim/default.nix | 4 ++-- home/programs/nvim/plugins.nix | 18 +++++++++--------- home/programs/nvim/plugins.yaml | 2 +- 9 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 home/config/nvim/plugins/fidget.fnl delete mode 100644 home/config/nvim/plugins/notify.fnl diff --git a/flake.lock b/flake.lock index d194a87..06f91fe 100644 --- a/flake.lock +++ b/flake.lock @@ -363,11 +363,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1699686971, - "narHash": "sha256-fttf55Uo88Ei57sxTuDOwKXg8izdR365lFjI13+XfwE=", + "lastModified": 1699956859, + "narHash": "sha256-dmlFTx0svBi8Z26Cbqpg8ZF/7K5IwoFvFOfAZovO3Hw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d638da8b6a17041483d90ba9af6c3b5e30b4fbcc", + "rev": "df4d6022db36b396fca38931afb41a626ef88e8a", "type": "github" }, "original": { diff --git a/home/config/nvim/nifoc/keymap.fnl b/home/config/nvim/nifoc/keymap.fnl index aafbc3e..cd97aa8 100644 --- a/home/config/nvim/nifoc/keymap.fnl +++ b/home/config/nvim/nifoc/keymap.fnl @@ -78,7 +78,9 @@ (keymap.set :n :tw #(telescope-builtin.lsp_dynamic_workspace_symbols telescope-dropdown) {:buffer bufnr :desc "LSP Workspace Symbols"}) - (keymap.set :n :th #(vim.lsp.inlay_hint bufnr nil) + (keymap.set :n :th + #(vim.lsp.inlay_hint.enable bufnr + (not (vim.lsp.inlay_hint.is_enabled bufnr))) {:buffer bufnr :desc "Toggle Inlay Hints"}) (keymap.set :n :lca #(telescope-builtin.lsp_code_actions telescope-dropdown) diff --git a/home/config/nvim/plugins/cmp.fnl b/home/config/nvim/plugins/cmp.fnl index e67d067..75b81e5 100644 --- a/home/config/nvim/plugins/cmp.fnl +++ b/home/config/nvim/plugins/cmp.fnl @@ -56,8 +56,7 @@ :nvim_lsp "[LSP]" :nvim_lsp_document_symbol "[Symbol]" :nvim_lua "[Lua]" - :path "[Path]"}})} - :experimental {:ghost_text true}}) + :path "[Path]"}})}}) (cmp.setup.cmdline "/" {:sources (cmp.config.sources [{:name :nvim_lsp_document_symbol}] [{:name :buffer}]) diff --git a/home/config/nvim/plugins/fidget.fnl b/home/config/nvim/plugins/fidget.fnl new file mode 100644 index 0000000..b5ff480 --- /dev/null +++ b/home/config/nvim/plugins/fidget.fnl @@ -0,0 +1,3 @@ +(let [fidget (require :fidget)] + (fidget.setup {}) + (set vim.notify fidget.notify)) diff --git a/home/config/nvim/plugins/lsp.fnl b/home/config/nvim/plugins/lsp.fnl index b9f8804..7d24ac5 100644 --- a/home/config/nvim/plugins/lsp.fnl +++ b/home/config/nvim/plugins/lsp.fnl @@ -6,10 +6,10 @@ augroup (vim.api.nvim_create_augroup :NifocLsp {:clear true}) aucmd vim.api.nvim_create_autocmd] (fn setup-inlay-hint-toggle [bufnr] - (aucmd :InsertEnter {:callback #(vim.lsp.inlay_hint bufnr false) + (aucmd :InsertEnter {:callback #(vim.lsp.inlay_hint.enable bufnr false) :buffer bufnr :group augroup}) - (aucmd :InsertLeave {:callback #(vim.lsp.inlay_hint bufnr true) + (aucmd :InsertLeave {:callback #(vim.lsp.inlay_hint.enable bufnr true) :buffer bufnr :group augroup})) @@ -20,7 +20,7 @@ (when (client.supports_method :textDocument/documentSymbol) (navic.attach client bufnr)) (when (client.supports_method :textDocument/inlayHint) - (vim.lsp.inlay_hint bufnr true) + (vim.lsp.inlay_hint.enable bufnr true) (setup-inlay-hint-toggle bufnr)) (diagnostic.maybe-enable-lsp client bufnr))) :group augroup diff --git a/home/config/nvim/plugins/notify.fnl b/home/config/nvim/plugins/notify.fnl deleted file mode 100644 index c9492f5..0000000 --- a/home/config/nvim/plugins/notify.fnl +++ /dev/null @@ -1,3 +0,0 @@ -(let [notify (require :notify)] - (notify.setup {:stages :fade}) - (set vim.notify notify)) diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index 5d458d9..f0d16b1 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -308,8 +308,8 @@ in } { - plugin = nvim-notify; - config = builtins.readFile ../../config/nvim/plugins/notify.fnl; + plugin = fidget-nvim; + config = builtins.readFile ../../config/nvim/plugins/fidget.fnl; type = "fennel"; } ]; diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index bf13329..025d51b 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -223,8 +223,8 @@ in src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "fa04d48113d7db6223c52b98c049995ecce3456e"; - sha256 = "0sapa53g91hy9w2rnzvd4560is9vp1qv6fk3w4w9la5yw4snmbda"; + rev = "0a0682d4646a6869b85a4e4d0e30da5ef8b11f66"; + sha256 = "0i64ly4lgpvdywyczv39vnmljr6y445apvidz4db9cbrzzf39wd0"; fetchSubmodules = false; }; }; @@ -492,14 +492,14 @@ in fetchSubmodules = false; }; }; - nvim-notify = buildVimPlugin { - pname = "nvim-notify"; - version = "2023-09-28"; + fidget-nvim = buildVimPlugin { + pname = "fidget.nvim"; + version = "2023-11-14"; src = fetchFromGitHub { - owner = "rcarriga"; - repo = "nvim-notify"; - rev = "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3"; - sha256 = "1a7s4y8xd1plcidnzs29rhqw7mfbj1q01bqffqjmimii9v6azmfn"; + owner = "j-hui"; + repo = "fidget.nvim"; + rev = "6c8274e13483de5782a5c6020a4fc837b81a7b49"; + sha256 = "0nc8x1gh4z023pr04nw9rdpm5jncvq89sm6w9mya358mpd34sa6l"; fetchSubmodules = false; }; }; diff --git a/home/programs/nvim/plugins.yaml b/home/programs/nvim/plugins.yaml index fadad67..dd87374 100644 --- a/home/programs/nvim/plugins.yaml +++ b/home/programs/nvim/plugins.yaml @@ -58,4 +58,4 @@ - src: lukas-reineke/virt-column.nvim - src: axieax/urlview.nvim - src: lewis6991/gitsigns.nvim -- src: rcarriga/nvim-notify +- src: j-hui/fidget.nvim