From a0b8181590653082e58eeb7adf0cc1428ef11807 Mon Sep 17 00:00:00 2001 From: Philipp Hochkamp Date: Mon, 6 Mar 2023 21:00:37 +0100 Subject: [PATCH] update --- flake.lock | 51 +++++++++++++------- flake.nix | 6 ++- hm-imports/nvim/config/lua/coc.lua | 4 +- hm-imports/nvim/config/lua/plugin/notice.lua | 18 +++++++ hm-imports/nvim/config/nvim.lua | 1 + hm-imports/nvim/default.nix | 17 +++++++ 6 files changed, 76 insertions(+), 21 deletions(-) create mode 100644 hm-imports/nvim/config/lua/plugin/notice.lua diff --git a/flake.lock b/flake.lock index fc4e725e..aea551b8 100644 --- a/flake.lock +++ b/flake.lock @@ -38,22 +38,6 @@ "type": "github" } }, - "coc-nvim": { - "flake": false, - "locked": { - "lastModified": 1677728877, - "narHash": "sha256-Btj7crJo0zk8/uF/RXtbGOiD3fQxzxKwmK+mMhf2s0I=", - "owner": "neoclide", - "repo": "coc.nvim", - "rev": "b28b8dc4278f0c68f14b74609d73169c88c97ec4", - "type": "github" - }, - "original": { - "owner": "neoclide", - "repo": "coc.nvim", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -376,6 +360,38 @@ "type": "github" } }, + "notice-nvim": { + "flake": false, + "locked": { + "lastModified": 1677882849, + "narHash": "sha256-3XQklNVwwzkrQtaKw8U8iXnNcDMiuEvXtceE2ACY6wc=", + "owner": "folke", + "repo": "noice.nvim", + "rev": "c22651651da01239fc4afac4cdb7261797d5f02e", + "type": "github" + }, + "original": { + "owner": "folke", + "repo": "noice.nvim", + "type": "github" + } + }, + "notify-nvim": { + "flake": false, + "locked": { + "lastModified": 1677922748, + "narHash": "sha256-3E9FN+dAKswzLTX6PYJIj30MWxd3estsZORBEf2Csn0=", + "owner": "rcarriga", + "repo": "nvim-notify", + "rev": "281e4d793c550c866bea3fb85d39de1f0188fb50", + "type": "github" + }, + "original": { + "owner": "rcarriga", + "repo": "nvim-notify", + "type": "github" + } + }, "octoprint-spoolmanager": { "flake": false, "locked": { @@ -466,7 +482,6 @@ "inputs": { "agenix": "agenix", "agkozak-zsh-prompt": "agkozak-zsh-prompt", - "coc-nvim": "coc-nvim", "darwin": "darwin_2", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", @@ -478,6 +493,8 @@ "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-master": "nixpkgs-master", "nnn-vim": "nnn-vim", + "notice-nvim": "notice-nvim", + "notify-nvim": "notify-nvim", "octoprint-spoolmanager": "octoprint-spoolmanager", "octoprint-telegram": "octoprint-telegram", "pandoc-latex-template": "pandoc-latex-template", diff --git a/flake.nix b/flake.nix index 8013229d..97e08cae 100644 --- a/flake.nix +++ b/flake.nix @@ -32,8 +32,10 @@ ## vim nnn-vim.url = "github:mcchrish/nnn.vim"; nnn-vim.flake = false; - coc-nvim.url = "github:neoclide/coc.nvim"; - coc-nvim.flake = false; + notify-nvim.url = "github:rcarriga/nvim-notify"; + notify-nvim.flake = false; + notice-nvim.url = "github:folke/noice.nvim"; + notice-nvim.flake = false; ## zsh zsh-completions.url = "github:zsh-users/zsh-completions"; diff --git a/hm-imports/nvim/config/lua/coc.lua b/hm-imports/nvim/config/lua/coc.lua index 8a02a154..f3043c7e 100644 --- a/hm-imports/nvim/config/lua/coc.lua +++ b/hm-imports/nvim/config/lua/coc.lua @@ -146,8 +146,8 @@ keyset("v", "", 'coc#float#has_scroll() ? coc#float#scroll(0) : ""', o -- Use CTRL-S for selections ranges -- Requires 'textDocument/selectionRange' support of language server -keyset("n", "", "(coc-range-select)", {silent = true}) -keyset("x", "", "(coc-range-select)", {silent = true}) +keyset("n", "", "(coc-range-select)", {silent = true}) +keyset("x", "", "(coc-range-select)", {silent = true}) -- Add `:Format` command to format current buffer diff --git a/hm-imports/nvim/config/lua/plugin/notice.lua b/hm-imports/nvim/config/lua/plugin/notice.lua new file mode 100644 index 00000000..9b8e296a --- /dev/null +++ b/hm-imports/nvim/config/lua/plugin/notice.lua @@ -0,0 +1,18 @@ +require("noice").setup({ + 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, + }, + }, + -- you can enable a preset for easier configuration + presets = { + bottom_search = true, -- use a classic bottom cmdline for search + command_palette = true, -- position the cmdline and popupmenu together + long_message_to_split = true, -- long messages will be sent to a split + inc_rename = false, -- enables an input dialog for inc-rename.nvim + lsp_doc_border = false, -- add a border to hover docs and signature help + }, +}) diff --git a/hm-imports/nvim/config/nvim.lua b/hm-imports/nvim/config/nvim.lua index 114c4392..251d9a73 100644 --- a/hm-imports/nvim/config/nvim.lua +++ b/hm-imports/nvim/config/nvim.lua @@ -11,6 +11,7 @@ require('plugin.nnn') require('plugin.rainbow') require('plugin.terminal') require('plugin.project') +require('plugin.notice') require('plugin.telescope') diff --git a/hm-imports/nvim/default.nix b/hm-imports/nvim/default.nix index 125d6183..4f6672b2 100644 --- a/hm-imports/nvim/default.nix +++ b/hm-imports/nvim/default.nix @@ -38,6 +38,16 @@ version = "1.0.0"; src = inputs.nnn-vim; }; + notify-nvim = pkgs.vimUtils.buildVimPlugin { + pname = "notify-nvim"; + version = "1.0.0"; + src = inputs.notify-nvim; + }; + notice-nvim = pkgs.vimUtils.buildVimPlugin { + pname = "notice-nvim"; + version = "1.0.0"; + src = inputs.notice-nvim; + }; #coc-nvim = pkgs.vimUtils.buildVimPlugin { # name = "coc-nvim"; # src = inputs.coc-nvim; @@ -74,6 +84,13 @@ ultisnips #dart-vim + nvim-treesitter + notify-nvim + notice-nvim + nui-nvim + + + plenary-nvim telescope-nvim project-nvim