update

.config/nvim/lazy-lock.json

@@ -6,23 +6,23 @@
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "fidget.nvim": { "branch": "main", "commit": "889e2e96edef4e144965571d46f7a77bcc4d0ddf" },
   "flutter-tools.nvim": { "branch": "main", "commit": "677cc07c16e8b89999108d2ebeefcfc5f539b73c" },
-  "gitsigns.nvim": { "branch": "main", "commit": "8d82c240f190fc33723d48c308ccc1ed8baad69d" },
+  "gitsigns.nvim": { "branch": "main", "commit": "6d808f99bd63303646794406e270bd553ad7792e" },
   "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
   "jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
   "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
   "lualine.nvim": { "branch": "master", "commit": "a905eeebc4e63fdc48b5135d3bf8aea5618fb21c" },
-  "markview.nvim": { "branch": "main", "commit": "1861f959599ae03cfd59f56222a542035b0cd947" },
+  "markview.nvim": { "branch": "main", "commit": "e27dee8b2a61f89ac3a06deae0264ad1d3f7b62c" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "0a3b42c3e503df87aef6d6513e13148381495c3a" },
   "mason.nvim": { "branch": "main", "commit": "b03fb0f20bc1d43daf558cda981a2be22e73ac42" },
   "mini.nvim": { "branch": "main", "commit": "a995fe9cd4193fb492b5df69175a351a74b3d36b" },
   "molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" },
-  "nvim-lspconfig": { "branch": "master", "commit": "8a9378a822719346a0288fa004dab302ca3c0a8f" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e05fb8c3bd61d909dacff24f77f23beb644daf54" },
   "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
   "nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" },
   "otter.nvim": { "branch": "main", "commit": "a455e68a99d395889ab30a25ac3846a135e93c46" },
   "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "aab6caaffd79b8def22ec4320a5344f7c42f58d2" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "08783ec022e7ddefe0f12a16f1ac4968f55478b0" },
   "rest.nvim": { "branch": "main", "commit": "714d5512aaec5565d55652480c16c26f8d95645d" },
   "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" },
   "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },

.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

@@ -7,6 +7,11 @@ return {
       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 },

.config/nvim/snippets/http.snippets

@@ -1,6 +1,6 @@
 snippet req "new request"
 	# @name ${1:name}
-	${2:GET} {{QA_BASE}}/${3:api}
+	${2:GET} {{${3:QA}_BASE}}/${4:api}
 	$0
 
 	###

.config/starship.toml

@@ -8,14 +8,19 @@ $username\
 [ ](bg:#3B4252 fg:#1793d1)\
 $directory\
 [ ](bg:#33658A fg:#3B4252)\
-$git_branch\
+$git_branch$character\
 [](fg:#33658A) \
 """
 # format = """$os$username$directory$git_branch"""
 
 [character]
-success_symbol = ''
-error_symbol = ''
+format = '$symbol'
+success_symbol = '[󰄾](bold fg:#00fff2 bg:#33658A)'
+error_symbol = '[󰄾](bold fg:red bg:#33658A)'
+vimcmd_symbol = '[󰄾](bold fg:#00fff2 bg:#33658A)'
+vimcmd_visual_symbol = '[󰄾](bold fg:#00fff2 bg:#33658A)'
+vimcmd_replace_one_symbol = '[󰄾](bold fg:#00fff2 bg:#33658A)'
+vimcmd_replace_symbol = '[󰄾](bold fg:#00fff2 bg:#33658A)'
 
 [os]
 format = '[$symbol]($style)'

.config/zed/settings.json

@@ -45,7 +45,7 @@
       "effort": "high",
       "enable_thinking": false,
       "provider": "copilot_chat",
-      "model": "gemini-3.1-pro-preview"
+      "model": "gpt-5.2-codex"
     },
   },
   "terminal": {