neovim update

.config/nvim/lua/config/keymaps.lua

@@ -30,6 +30,7 @@ vim.keymap.set('i', '<C-BS>', '<C-w>', { desc = 'delete word in insert mode' })
 
 -- kitty in current dir
 vim.keymap.set('n', '<leader>t', '<cmd>silent !kitty . &<CR>', { desc = 'open kitty in pwd' })
+vim.keymap.set('n', '<leader>e', '<cmd>silent !nautilus . &<CR>', { desc = 'open nautilus in pwd' })
 
 -- disable default comp
 vim.keymap.set('i', '<C-n>', '<NOP>', { desc = 'disable default comp' })
@@ -223,3 +224,15 @@ vim.keymap.set('n', '<leader>fr', '<cmd>FlutterRestart<CR>', { desc = 'flutter r
 vim.keymap.set('n', '<leader>fq', '<cmd>FlutterQuit<CR>', { desc = 'stop flutter' })
 vim.keymap.set('n', '<leader>fl', '<cmd>FlutterLogToggle<CR>', { desc = 'flutter log' })
 vim.keymap.set('n', '<leader>fc', '<cmd>FlutterLogClear<CR>', { desc = 'clear log' })
+
+-- INFO: Rest
+vim.keymap.set('n', '<leader>rr', '<cmd>Rest run<CR>', { desc = 'Run request under the cursor'})
+vim.keymap.set('n', '<leader>ro', '<cmd>vert Rest open<CR>', { desc = 'Open result pane'})
+vim.keymap.set('n', '<leader>rl', '<cmd>Rest last<CR>', { desc = 'Run last request'})
+vim.keymap.set('n', '<leader>rn', function ()
+  vim.ui.input({prompt = 'Enter request name'}, function (value)
+    if value then
+      vim.cmd('Rest run ' .. value)
+    end
+  end)
+end, { desc = 'Run last request'})

.config/nvim/lua/config/plugins/git.lua

@@ -44,12 +44,31 @@ return {
       require('diffview').setup({
 	keymaps = {
 	  disable_defaults = true,
+	  view = {
+	    { "n", "<c-n>",          actions.select_next_entry,              { desc = "Open the diff for the next file" } },
+	    { "n", "<c-p>",	     actions.select_prev_entry,              { desc = "Open the diff for the previous file" } },
+	    { "n", "[x",             actions.prev_conflict,                  { desc = "Go to the previous conflict" } },
+	    { "n", "]x",             actions.next_conflict,                  { desc = "Go to the next conflict" } },
+	  },
 	  file_panel = {
-	    ['i'] = '<Up>',
-	    ['k'] = '<Down>',
-	    ['j'] = false,
+	    { "n", "k",              actions.next_entry,                     { desc = "Bring the cursor to the next file entry" } },
+	    { "n", "i",              actions.prev_entry,                     { desc = "Bring the cursor to the previous file entry" } },
+	    { "n", "<CR>",           actions.select_entry,                   { desc = "Open the diff for the selected entry" } },
+	    { "n", "l",              actions.select_entry,                   { desc = "Open the diff for the selected entry" } },
+	    { "n", "s",              actions.toggle_stage_entry,             { desc = "Stage / unstage the selected entry" } },
+	    { "n", "S",              actions.stage_all,                      { desc = "Stage all entries" } },
+	    { "n", "U",              actions.unstage_all,                    { desc = "Unstage all entries" } },
+	    { "n", "<c-n>",          actions.select_next_entry,              { desc = "Open the diff for the next file" } },
+	    { "n", "<c-p>",	     actions.select_prev_entry,              { desc = "Open the diff for the previous file" } },
+	    { "n", "[x",             actions.prev_conflict,                  { desc = "Go to the previous conflict" } },
+	    { "n", "]x",             actions.next_conflict,                  { desc = "Go to the next conflict" } },
+	    { "n", "g?",             actions.help("file_panel"),             { desc = "Open the help panel" } },
 
-	    ['<Space>'] = function () actions.toggle_stage_entry() end
+	    -- { "n", "<leader>cO",     actions.conflict_choose_all("ours"),    { desc = "Choose the OURS version of a conflict for the whole file" } },
+	    -- { "n", "<leader>cT",     actions.conflict_choose_all("theirs"),  { desc = "Choose the THEIRS version of a conflict for the whole file" } },
+	    -- { "n", "<leader>cB",     actions.conflict_choose_all("base"),    { desc = "Choose the BASE version of a conflict for the whole file" } },
+	    -- { "n", "<leader>cA",     actions.conflict_choose_all("all"),     { desc = "Choose all the versions of a conflict for the whole file" } },
+	    -- { "n", "dX",             actions.conflict_choose_all("none"),    { desc = "Delete the conflict region for the whole file" } },
 
 	  }
 	}

.config/nvim/lua/config/plugins/init.lua

@@ -24,13 +24,14 @@ require('lazy').setup({
 
   require('config.plugins.git'),
   require('config.plugins.ui'),
-  -- require('config.plugins.telescope'),
+
   require('config.plugins.languages.lsp'),
   require('config.plugins.languages.treesitter'),
   require('config.plugins.harpoon'),
   require('config.plugins.autosession'),
   require('config.plugins.snacks'),
   require('config.plugins.mini'),
+  require('config.plugins.rest'),
 
   require('config.plugins.languages.notebook'),
   require('config.plugins.languages.flutter'),

.config/nvim/lua/config/plugins/rest.lua

@@ -0,0 +1,18 @@
+vim.g.rest_nvim = {
+  ui = {
+    keybinds = {
+      prev = 'J',
+      next = 'L',
+    },
+  },
+}
+return {
+  "rest-nvim/rest.nvim",
+  dependencies = {
+    "nvim-treesitter/nvim-treesitter",
+    opts = function (_, opts)
+      opts.ensure_installed = opts.ensure_installed or {}
+      table.insert(opts.ensure_installed, "http")
+    end,
+  },
+}