nvim update

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

@@ -1,10 +1,10 @@
 -- INFO: General --
 
 -- hjkl to ijkl remap
-vim.keymap.set({ 'n', 'x', 'o' }, 'j', 'h', { desc = 'hjkl to ijkl' })
-vim.keymap.set({ 'n', 'x', 'o' }, 'h', 'i', { desc = 'hjkl to ijkl' })
-vim.keymap.set({ 'n', 'x', 'o' }, 'i', 'k', { desc = 'hjkl to ijkl' })
-vim.keymap.set({ 'n', 'x', 'o' }, 'k', 'j', { desc = 'hjkl to ijkl' })
+vim.keymap.set({ 'n', 'x', 'o' }, 'j', 'h', { desc = 'hjkl to ijkl', nowait = true })
+vim.keymap.set({ 'n', 'x', 'o' }, 'h', 'i', { desc = 'hjkl to ijkl', nowait = true })
+vim.keymap.set({ 'n', 'x', 'o' }, 'i', 'k', { desc = 'hjkl to ijkl', nowait = true })
+vim.keymap.set({ 'n', 'x', 'o' }, 'k', 'j', { desc = 'hjkl to ijkl', nowait = true })
 
 -- indentation
 vim.keymap.set('n', '<Tab>', '>>', { desc = 'tab indent' })
@@ -17,13 +17,14 @@ vim.keymap.set({ 'n', 'v' }, '<C-d>', '<C-d>zz', { desc = 'centered scroll' })
 vim.keymap.set({ 'n', 'v' }, '<C-u>', '<C-u>zz', { desc = 'centered scroll' })
 vim.keymap.set({ 'n', 'v' }, '<C-o>', '<C-o>zz', { desc = 'centered jump back' })
 vim.keymap.set({ 'n', 'v' }, '<C-p>', '<C-i>zz', { desc = 'centered jump forward' })
+vim.keymap.set({ 'n', 'v' }, 'zJ', 'zH', { desc = 'scroll half page left' })
 
 -- start of line
 vim.keymap.set({ 'n', 'v', 'o' }, '#', '_', { desc = '# start of line' })
 
 -- save / quit
 vim.keymap.set('n', '<C-s>', ':w<CR>', { desc = 'ctrl-s save' })
-vim.keymap.set('n', '<C-w>', ':bd<CR>', { desc = 'save and close', nowait = true })
+vim.keymap.set('n', '<C-w>', Snacks.bufdelete.delete, { desc = 'save and close', nowait = true })
 
 -- delete word in insert mode
 vim.keymap.set('i', '<C-BS>', '<C-w>', { desc = 'delete word in insert mode' })
@@ -65,6 +66,20 @@ vim.keymap.set({ 'n', 'v', 'o' }, '<leader>kk', ':wincmd j<CR>', { desc = 'move
 vim.keymap.set({ 'n', 'v', 'o' }, '<leader>kl', ':wincmd l<CR>', { desc = 'move focus between windows', silent = true })
 vim.keymap.set({ 'n', 'v', 'o' }, '<leader>kj', ':wincmd h<CR>', { desc = 'move focus between windows', silent = true })
 
+vim.keymap.set('n', '<leader>w=', '<cmd>wincmd =<CR>', { desc = 'resize windows' })
+vim.keymap.set('n', '<leader>wi', function ()
+  vim.cmd('resize -' .. (vim.v.count1 * 5))
+end, { desc = 'resize windows' })
+vim.keymap.set('n', '<leader>wk', function ()
+  vim.cmd('resize +' .. (vim.v.count1 * 5))
+end, { desc = 'resize windows' })
+vim.keymap.set('n', '<leader>wj', function ()
+  vim.cmd('vert resize -' .. (vim.v.count1 * 5))
+end, { desc = 'resize windows' })
+vim.keymap.set('n', '<leader>wl', function ()
+  vim.cmd('vert resize +' .. (vim.v.count1 * 5))
+end, { desc = 'resize windows' })
+
 -- INFO: Picker
 
 local Snacks = require('snacks')

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

@@ -42,6 +42,11 @@ return {
     config = function ()
       local actions = require('diffview.config').actions
       require('diffview').setup({
+	view = {
+	  merge_tool = {
+	    layout = 'diff3_mixed',
+	  },
+	},
 	keymaps = {
 	  disable_defaults = true,
 	  view = {

.config/nvim/lua/config/plugins/languages/flutter.lua

@@ -1,13 +1,18 @@
 return {
-    'nvim-flutter/flutter-tools.nvim',
-    lazy = false,
-    dependencies = { 'nvim-lua/plenary.nvim', },
-    config = function()
-        require('flutter-tools').setup({
-            fvm = true,
-            dev_log = {
-                open_cmd = 'FloutterLog',
-            }
-        })
-    end,
+  'nvim-flutter/flutter-tools.nvim',
+  lazy = false,
+  dependencies = { 'nvim-lua/plenary.nvim', },
+  config = function()
+    require('flutter-tools').setup({
+      fvm = true,
+      dev_log = {
+        open_cmd = 'FloutterLog',
+      },
+      lsp = {
+        settings = {
+          showTodos = false,
+        }
+      }
+    })
+  end,
 }

.config/nvim/lua/config/plugins/languages/notebook.lua

@@ -58,9 +58,9 @@ return {
     'benlubas/molten-nvim',
     version = '^1.0.0', -- use version <2.0.0 to avoid breaking changes
     build = ':UpdateRemotePlugins',
+    lazy = false,
     init = function()
-      -- these are examples, not defaults. Please see the readme
-      vim.g.molten_image_provider = 'image.nvim'
+      vim.g.molten_image_provider = 'snacks.nvim'
       vim.g.molten_virt_text_output = true
       vim.g.molten_virt_lines_off_by_1 = true
       vim.g.molten_auto_open_output = false

.config/nvim/lua/config/plugins/languages/treesitter.lua

@@ -4,6 +4,7 @@ return {
   config = function()
     require('nvim-treesitter').install({
       'bash',
+      'fish',
       'c',
       'cpp',
       'diff',
@@ -25,6 +26,7 @@ return {
       'r',
       'dart',
       'prisma',
+      'sql',
       'regex',
       'kotlin',
       'java',

.config/nvim/lua/config/plugins/snacks.lua

@@ -112,8 +112,8 @@ return {
     },
 
     image = { enabled = true },
+    bufdelete = { enabled = true },
 
-    bufdelete = { enabled = false },
     debug = { enabled = false },
     dim = { enabled = false },
     explorer = { enabled = false },