nvim: change bindings to Oil, remove some old

nvim/.config/nvim/lazy-lock.json

@@ -16,12 +16,14 @@
   "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
   "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" },
   "leap.nvim": { "branch": "main", "commit": "626be4c4ec040aeaf6466c9aae17ee0ab09f1a5b" },
+  "lspsaga.nvim": { "branch": "main", "commit": "a4d442896a9ff1f83ee3db965d81b659ebc977d5" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "b129892f783740e6cf741f2ea09fa5dd512aa584" },
   "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
   "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
   "neogit": { "branch": "master", "commit": "c0b1d4dfc8ba6371857868ca7c4d33954cf002fd" },
+  "nightfox.nvim": { "branch": "main", "commit": "ce0cdf8538c8c0b9c8fb2884d3d1090c8faf515d" },
   "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" },
   "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
   "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" },

nvim/.config/nvim/lua/lupan/remap.lua

@@ -10,10 +10,8 @@ key('v', '<Space>', '<Nop>', { silent = true })
 key('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
 key('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
 
-key("n", "<leader>dd", "<cmd>Explore<CR>", { desc = "[D]isplay [d]irectory" })
-key("n", "<leader>dv", "<cmd>Vexplore<CR>", { desc = "[D]isplay directory ([v]ertical split)" })
-key("n", "<leader>dh", "<cmd>Sexplore<CR>", { desc = "[D]isplay [d]irectory ([h]orizontal split)" })
-key("n", "<leader>dt", "<cmd>Lexplore 30<CR>", { desc = "[D]isplay directory [t]oggle" })
+key("n", "<leader>dd", "<cmd>Oil<CR>", { desc = "[D]isplay [d]irectory" })
+key("n", "<leader>df", "<cmd>Oil --float<CR>", { desc = "[D]isplay directory [f]loat" })
 key("n", "<leader>ct", "<cmd>ColorizerToggle<CR>", { desc = "[C]olorizer [t]oggle" })
 key("n", "<leader>ut", "<cmd>UndotreeToggle<CR>", { desc = "[U]undotree [t]oggle" })
 
@@ -110,16 +108,14 @@ end, { silent = true })
 vim.keymap.set("n", "<leader>ss", "<cmd>source ~/.config/nvim/after/plugin/luasnip.lua<CR>",
   { desc = "[S]nippets [s]ource" })
 
--- terminal
-
-key('t', '<C-_>', '<C-\\><C-n>')
-
 -- colors
 
 key('n', '<F6>', function()
   if vim.o.background == "dark" then
-    vim.o.background = "light"
+    vim.cmd.colorscheme("dayfox")
+    -- vim.o.background = "light"
   else
-    vim.o.background = "dark"
+    vim.cmd.colorscheme("duskfox")
+    -- vim.o.background = "dark"
   end
 end)

nvim/.config/nvim/lua/plugins/appearance.lua

@@ -16,7 +16,7 @@ return {
     lazy = false,
     priority = 1000,
     config = function()
-      vim.cmd.colorscheme("everforest")
+      -- vim.cmd.colorscheme("everforest")
     end,
   },
   {
@@ -27,6 +27,12 @@ return {
       -- vim.cmd.colorscheme("NeoSolarized")
     end
   },
+  {
+    "EdenEast/nightfox.nvim",
+    config = function()
+      vim.cmd.colorscheme("duskfox")
+    end
+  },
 
   {
     -- Statusline (see `:help lualine.txt`)

nvim/.config/nvim/lua/plugins/lsp.lua

@@ -25,11 +25,14 @@ return {
           map('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
           map('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
           map('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
-          map('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
+          map('<leader>rn', '<cmd>Lspsaga rename<CR>', '[R]e[n]ame')
           map('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
-          map('K', vim.lsp.buf.hover, 'Hover Documentation')
+          map('K', '<cmd>Lspsaga hover_doc<CR>', 'Hover Documentation')
           map('<leader>K', vim.lsp.buf.signature_help, 'Signature Documentation')
           map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
+          vim.keymap.set('n', '[d', '<cmd>Lspsaga diagnostic_jump_prev<CR>',
+            { desc = 'Go to previous [D]iagnostic message' })
+          vim.keymap.set('n', ']d', '<cmd>Lspsaga diagnostic_jump_next<CR>', { desc = 'Go to next [D]iagnostic message' })
 
           -- Highlight references under cursor (clear highlight when cursor moves).
           local client = vim.lsp.get_client_by_id(event.data.client_id)
@@ -120,4 +123,37 @@ return {
       }
     end,
   },
+  {
+    'nvimdev/lspsaga.nvim',
+    dependencies = {
+      'nvim-treesitter/nvim-treesitter',
+      'nvim-tree/nvim-web-devicons',
+    },
+    config = function()
+      require('lspsaga').setup({
+        lightbulb = { enable = false }
+      })
+      vim.keymap.set('n', '<leader>la', '<cmd>Lspsaga code_action<CR>', { desc = "[L]spsaga code [A]ction" })
+      vim.keymap.set('n', '<leader>lb', '<cmd>Lspsaga show_buf_diagnostics<CR>',
+        { desc = "[L]spsaga [B]uffer diagnostics" })
+      vim.keymap.set('n', '<leader>lc', '<cmd>Lspsaga show_cursor_diagnostics<CR>',
+        { desc = "[L]spsaga [C]ursor diagnostics" })
+      vim.keymap.set('n', '<leader>ld', '<cmd>Lspsaga goto_definition<CR>', { desc = "[L]spsaga goto [D]efinition" })
+      vim.keymap.set('n', '<leader>lD', '<cmd>Lspsaga goto_type_definition<CR>',
+        { desc = "[L]spsaga goto type [D]efinition" })
+      vim.keymap.set('n', '<leader>lf', '<cmd>Lspsaga finder<CR>', { desc = "[L]spsaga [F]inder" })
+      vim.keymap.set('n', '<leader>lI', '<cmd>Lspsaga finder imp<CR>', { desc = "[L]spsaga finder [I]mplementations" })
+      vim.keymap.set('n', '<leader>li', '<cmd>Lspsaga incoming_calls<CR>', { desc = "[L]spsaga [I]ncomping calls" })
+      vim.keymap.set('n', '<leader>ll', '<cmd>Lspsaga show_line_diagnostics<CR>',
+        { desc = "[L]spsaga [L]ine diagnostics" })
+      vim.keymap.set('n', '<leader>lo', '<cmd>Lspsaga outgoing_calls<CR>', { desc = "[L]spsaga [O]utgoing calls" })
+      vim.keymap.set('n', '<leader>lO', '<cmd>Lspsaga outline<CR>', { desc = "[L]spsaga [O]utline" })
+      vim.keymap.set('n', '<leader>lp', '<cmd>Lspsaga peek_definition<CR>', { desc = "[L]spsaga [P]eek definition" })
+      vim.keymap.set('n', '<leader>lP', '<cmd>Lspsaga peek_type_definition<CR>',
+        { desc = "[L]spsaga [P]eek type definition" })
+      vim.keymap.set('n', '<leader>lw', '<cmd>Lspsaga show_workspace_diagnostics<CR>',
+        { desc = "[L]spsaga [W]orkspace diagnostics" })
+      vim.keymap.set({ 'n', 't' }, '<C-_>', '<cmd>Lspsaga term_toggle<CR>', { desc = "[L]spsaga [T]erm toggle" })
+    end,
+  },
 }

nvim/.config/nvim/lua/plugins/noice.lua

@@ -6,7 +6,8 @@ return {
     'rcarriga/nvim-notify',
   },
   config = function()
-    require('noice').setup({
+    local noice = require('noice')
+    noice.setup({
       lsp = {
         -- override markdown rendering so that **cmp** and other plugins use **Treesitter**
         override = {
@@ -24,5 +25,12 @@ return {
         lsp_doc_border = false,       -- add a border to hover docs and signature help
       },
     })
+    vim.keymap.set("n", "<leader>nl", function()
+      noice.cmd("last")
+    end)
+
+    vim.keymap.set("n", "<leader>nh", function()
+      noice.cmd("history")
+    end)
   end
 }