From fd5825813595db81552132226b8471f4c8c514c8 Mon Sep 17 00:00:00 2001 From: Hiroki Sakuraba Date: Tue, 11 Jul 2023 11:31:09 +0900 Subject: [PATCH 1/3] Update --- flake.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/flake.nix b/flake.nix index 7569c2ef..2616c193 100644 --- a/flake.nix +++ b/flake.nix @@ -182,10 +182,6 @@ NVIM_APPNAME = "nvim-eval"; }; - packages = [ - inputs.disko.packages.${system}.default - ]; - languages.go.enable = true; languages.nix.enable = true; From 39954820b1433f0fa87f2d3ba2cdc89b5dca6c51 Mon Sep 17 00:00:00 2001 From: Hiroki Sakuraba Date: Tue, 11 Jul 2023 16:33:17 +0900 Subject: [PATCH 2/3] Update --- home/features/fish.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/features/fish.nix b/home/features/fish.nix index cf766521..9c85126c 100644 --- a/home/features/fish.nix +++ b/home/features/fish.nix @@ -44,6 +44,7 @@ tree = "exa --tree --icons --all --git-ignore --ignore-glob=.git"; cat = "bat"; vim = "nvim"; + _vim = "env NVIM_APPNAME=nvim-eval nvim"; }; shellAbbrs = { From 199864fd3b6a0c9b223c9809c55cffc3254ee698 Mon Sep 17 00:00:00 2001 From: Hiroki Sakuraba Date: Tue, 11 Jul 2023 20:16:04 +0900 Subject: [PATCH 3/3] Update --- .luarc.json | 3 +- home/features/neovim/lazy-lock.json | 9 +- home/features/neovim/lua/plugins/lsp.lua | 113 ++++++----------------- 3 files changed, 33 insertions(+), 92 deletions(-) diff --git a/.luarc.json b/.luarc.json index cb65e789..58e35ebc 100644 --- a/.luarc.json +++ b/.luarc.json @@ -1,5 +1,6 @@ { "workspace.library": [ "${3rd}/luassert/library" - ] + ], + "workspace.checkThirdParty": false } \ No newline at end of file diff --git a/home/features/neovim/lazy-lock.json b/home/features/neovim/lazy-lock.json index 3663b380..818aaa81 100644 --- a/home/features/neovim/lazy-lock.json +++ b/home/features/neovim/lazy-lock.json @@ -1,9 +1,8 @@ { "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, "LuaSnip": { "branch": "master", "commit": "45a4e899ca8f54936fe32ead6bba65f2a8d42e12" }, - "actions-preview.nvim": { "branch": "master", "commit": "3028c9a35853bb5fb77670fb58537ce28085329c" }, "bufferline.nvim": { "branch": "main", "commit": "cd27a52ecdfed7f14a41b61b7976f155e3d593c7" }, - "catppuccin": { "branch": "main", "commit": "d603a47478e71795d8b7e7db0b325cdaa561208e" }, + "catppuccin": { "branch": "main", "commit": "f36af062e3242f333b12fe9b730053fdda36e000" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, @@ -14,13 +13,13 @@ "flash.nvim": { "branch": "main", "commit": "a8da6ff212c1885ecde26af477207742959c67d7" }, "friendly-snippets": { "branch": "main", "commit": "6e0afe3be0ba43ef03d495a529de8fb22721c0d0" }, "gitsigns.nvim": { "branch": "main", "commit": "48c3ae8ec74cb83f9570ceb0c5ab8217db7a2220" }, + "glance.nvim": { "branch": "master", "commit": "3e7158ffaaa0fa1f7268df30ae40f24c07b840d1" }, "guess-indent.nvim": { "branch": "main", "commit": "b8ae749fce17aa4c267eec80a6984130b94f80b2" }, "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, "lazy.nvim": { "branch": "main", "commit": "da8b00581a52f5f87ad2aba9f52171fda7491f18" }, "lsp-format.nvim": { "branch": "master", "commit": "ca0df5c8544e51517209ea7b86ecc522c98d4f0a" }, "lsp-inlayhints.nvim": { "branch": "main", "commit": "d981f65c9ae0b6062176f0accb9c151daeda6f16" }, "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, - "lspsaga.nvim": { "branch": "main", "commit": "44f2beafd826083d07da5fc07f19a4eca1a19f73" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "mini.bufremove": { "branch": "main", "commit": "7821606e35c1ac931b56d8e3155f45ffe76ee7e5" }, "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" }, @@ -33,14 +32,14 @@ "noice.nvim": { "branch": "main", "commit": "6c87c1d11c38180fb72bf8f45518a0a3e081afc1" }, "nui.nvim": { "branch": "main", "commit": "d146966a423e60699b084eeb28489fe3b6427599" }, "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" }, - "nvim": { "branch": "main", "commit": "d603a47478e71795d8b7e7db0b325cdaa561208e" }, + "nvim": { "branch": "main", "commit": "f36af062e3242f333b12fe9b730053fdda36e000" }, "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, "nvim-hlslens": { "branch": "main", "commit": "5e3e9088fba7508cee3612ee50b14dfdd3ab19af" }, "nvim-lspconfig": { "branch": "master", "commit": "deade69789089c3da15237697156334fb3e943f0" }, "nvim-navic": { "branch": "master", "commit": "6e8850a524307814decc1b195a2c8a51482a9886" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" }, - "nvim-treesitter": { "branch": "master", "commit": "f2efc5f35743b8383a1b50f727faae94658506d5" }, + "nvim-treesitter": { "branch": "master", "commit": "3af1220e18034eb2ce7d1c8e77055bc3bf3c1c36" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "7f625207f225eea97ef7a6abe7611e556c396d2f" }, "nvim-web-devicons": { "branch": "master", "commit": "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9" }, "overseer.nvim": { "branch": "master", "commit": "5564d0d1b7c956be5c51f4945ebbde7408a48043" }, diff --git a/home/features/neovim/lua/plugins/lsp.lua b/home/features/neovim/lua/plugins/lsp.lua index 81e08cd7..b6324595 100644 --- a/home/features/neovim/lua/plugins/lsp.lua +++ b/home/features/neovim/lua/plugins/lsp.lua @@ -210,60 +210,6 @@ return { }) end, }, - { - "nvimdev/lspsaga.nvim", - cmd = "Lspsaga", - dependencies = { - "nvim-tree/nvim-web-devicons", - "nvim-treesitter/nvim-treesitter", - "catppuccin/nvim", - }, - opts = function() - return { - ui = { - title = false, - border = "solid", - winblend = 0, - expand = "", - collapse = "", - code_action = "", - incoming = " ", - outgoing = " ", - hover = " ", - kind = require("catppuccin.groups.integrations.lsp_saga").custom_kind(), - }, - symbol_in_winbar = { - enable = false, - }, - finder = { - default = "def+ref+imp", - silent = true, - }, - } - end, - keys = { - { - "nn", - "Lspsaga finder", - desc = "Show the defintion, reference and implementation", - }, - { - "nr", - "Lspsaga rename", - desc = "Rename", - }, - { - "no", - "Lspsaga outline", - desc = "Show outline", - }, - { - "nd", - "Lspsaga hover_doc", - desc = "Show document", - }, - }, - }, { "pmizio/typescript-tools.nvim", dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" }, @@ -271,44 +217,39 @@ return { opts = {}, }, { - "aznhe21/actions-preview.nvim", - event = "VeryLazy", - dependencies = { - "nvim-telescope/telescope.nvim", - "MunifTanjim/nui.nvim", - }, + "dnlhc/glance.nvim", + cmd = "Glance", opts = { - backend = { "nui" }, - diff = { - algorithm = "histogram", - ctxlen = 2, - ignore_whitespace = true, - ignore_whitespace_change = true, - ignore_whitespace_change_at_eol = true, - ignore_cr_at_eol = true, - ignore_blank_lines = true, - indent_heuristic = true, + folds = { + fold_closed = "", + fold_open = "", + folded = false, }, - nui = { - dir = "row", - anchor = "NW", - keymap = nil, - layout = { - relative = "cursor", - position = 0, - size = "20%", - min_width = 40, - min_height = 10, - }, + hooks = { + before_open = function(results, open, jump, _method) + if #results == 1 then + jump(results[1]) -- argument is optional + else + open(results) -- argument is optional + end + end, }, }, keys = { { - "na", - function() - require("actions-preview").code_actions() - end, - desc = "Show code actions", + "nd", + "Glance definitions", + desc = "Show definitions", + }, + { + "nr", + "Glance references", + desc = "Show references", + }, + { + "ni", + "Glance implementations", + desc = "Show implementations", }, }, },