misc cleanup

Flake lock file updates:

• Updated input 'dart':
    'github:iofq/dart.nvim/26b476f2113143329637a27d4e52ce9772bcae5b?narHash=sha256-Z9idyP9kiKxC10VL0vHnxcBwrkpNtBrC%2BZxl9mQbCj8%3D' (2025-10-18)
  → 'github:iofq/dart.nvim/205f809fbb27d56aff22756a97b5ba6f0c7243c3?narHash=sha256-lLY34wnbyzi21zE8i%2BVM0AoEt67r4aPn/EoaZ8o4NgU%3D' (2025-12-07)
• Updated input 'neovim-nightly-overlay':
    'github:nix-community/neovim-nightly-overlay/3c9432813e5528a13075f5493da6ff9ef249ad1d?narHash=sha256-THAk4qzBOsp03bDBYK9Ek3mQEvl2g8Fea0QhpCoEzfs%3D' (2025-10-19)
  → 'github:nix-community/neovim-nightly-overlay/d31b28318affe5d58ef12e7f72a7adfa66930a7a?narHash=sha256-pxxUR3VRDcDpMgF1qb9FnlHAEOGi24bk6pdB1QzL1II%3D' (2026-01-10)
• Removed input 'neovim-nightly-overlay/flake-compat'
• Updated input 'neovim-nightly-overlay/flake-parts':
    'github:hercules-ci/flake-parts/4e627ac2e1b8f1de7f5090064242de9a259dbbc8?narHash=sha256-lbHQ7FXGzt6/IygWvJ1lCq%2BTxcut3xYYd6VIpF1ojkg%3D' (2025-10-18)
  → 'github:hercules-ci/flake-parts/250481aafeb741edfe23d29195671c19b36b6dca?narHash=sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY%3D' (2026-01-05)
• Removed input 'neovim-nightly-overlay/git-hooks'
• Removed input 'neovim-nightly-overlay/git-hooks/flake-compat'
• Removed input 'neovim-nightly-overlay/git-hooks/gitignore'
• Removed input 'neovim-nightly-overlay/git-hooks/gitignore/nixpkgs'
• Removed input 'neovim-nightly-overlay/git-hooks/nixpkgs'
• Removed input 'neovim-nightly-overlay/hercules-ci-effects'
• Removed input 'neovim-nightly-overlay/hercules-ci-effects/flake-parts'
• Removed input 'neovim-nightly-overlay/hercules-ci-effects/nixpkgs'
• Updated input 'neovim-nightly-overlay/neovim-src':
    'github:neovim/neovim/be73c35943f85e7835c3a0fc89bddaeba944db29?narHash=sha256-VYkZdjjMOYsugoSydDDWE/1l79swm4zc4NJl1Z0brjA%3D' (2025-10-18)
  → 'github:neovim/neovim/930817f1009d9d392103b5440e2503cb47fdacc0?narHash=sha256-hcdQHR8l8oZDIl0vXKNtbrN%2B32dTs9EYvlqppoHgG2k%3D' (2026-01-09)
• Removed input 'neovim-nightly-overlay/treefmt-nix'
• Removed input 'neovim-nightly-overlay/treefmt-nix/nixpkgs'
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/6a3b08503e9cab108f9f0ec27065c5854655662a?narHash=sha256-Il5%2B67iRA3xp0cIErILj4VwEJ2ICrDrvTAHEmBsZJKQ%3D' (2025-10-19)
  → 'github:NixOS/nixpkgs/299d331f770cdf7c466a4faa08b3070a767d681d?narHash=sha256-V7El1ktdJ0/WWEr6wGBKFYu433vitrWvxmvPk79FsSc%3D' (2026-01-10)
• Updated input 'nvim-treesitter-main':
    'github:iofq/nvim-treesitter-main/420c14c0523d65c6c7ce943e8f2fb896eff950e3?narHash=sha256-WJScDX0q/%2BPCRpvBSlJfV01kwvu9WCk5YDpzW2Zswj8%3D' (2025-10-19)
  → 'github:iofq/nvim-treesitter-main/d82b04e1a05f88ed88c6221672ca0636dc8d6ef7?narHash=sha256-ej7y4nhiJNFE/HcZSPTEIrU6/WQmkMJo%2BbVQfgT3abE%3D' (2026-01-06)
• Updated input 'nvim-treesitter-main/nixpkgs':
    'github:nixos/nixpkgs/544961dfcce86422ba200ed9a0b00dd4b1486ec5?narHash=sha256-EVAqOteLBFmd7pKkb0%2BFIUyzTF61VKi7YmvP1tw4nEw%3D' (2025-10-15)
  → 'github:nixos/nixpkgs/fb7944c166a3b630f177938e478f0378e64ce108?narHash=sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf%2BOkucw%3D' (2026-01-02)
• Updated input 'nvim-treesitter-main/nvim-treesitter':
    'github:nvim-treesitter/nvim-treesitter/71bf1665f804d46f7e4b24ad7ffc11f6ea5b271a?narHash=sha256-ZeNCXy6%2BI18N%2BNu2sKnEk2otVEb8V3tKhL8Jq95wS5k%3D' (2025-10-19)
  → 'github:nvim-treesitter/nvim-treesitter/300b906a9514d5e0ce02911d371445382fe35a31?narHash=sha256-LX0rKTZ56Rp0uQfIXZ2JrcWxuCA/t8NJjK05aKiT0Yw%3D' (2026-01-03)
• Updated input 'nvim-treesitter-main/nvim-treesitter-textobjects':
    'github:nvim-treesitter/nvim-treesitter-textobjects/1b2d85d3de6114c4bcea89ffb2cd1ce9e3a19931?narHash=sha256-%2BKmOpRi4JAqm6UqYdtk80jwFrJhLCs0lZM/Liofq0R4%3D' (2025-08-28)
  → 'github:nvim-treesitter/nvim-treesitter-textobjects/28a3494c075ef0f353314f627546537e43c09592?narHash=sha256-5VeIAW09my%2B4fqXbzVG7RnLXrjpXAk/g2vd7RbhNws8%3D' (2026-01-03)

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        package_name: ["nvim"]
+        package_name: ["nvim-min"]
     steps:
       - uses: actions/checkout@v3
       - uses: DeterminateSystems/nix-installer-action@main

README.md

@@ -5,7 +5,7 @@
 ## Usage
 Try it out!
 ```bash
-nix run "github:iofq/nvim.nix" #nvim
+nix run "github:iofq/nvim.nix" #nvim-min
 ```
 
 Or use in a flake:

flake.lock

@@ -61,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765835352,
+        "lastModified": 1767609335,
-        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
+        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
+        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
         "type": "github"
       },
       "original": {
@@ -203,11 +203,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766016290,
+        "lastModified": 1768003501,
-        "narHash": "sha256-YMf/PUyY4z7RlIe/Dzn1NnxZGS0Vp2eHxcMNWJM9q+A=",
+        "narHash": "sha256-pxxUR3VRDcDpMgF1qb9FnlHAEOGi24bk6pdB1QzL1II=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "f7fbc4e3d4ccea45eaa5b187884592eb42dfdbbd",
+        "rev": "d31b28318affe5d58ef12e7f72a7adfa66930a7a",
         "type": "github"
       },
       "original": {
@@ -219,11 +219,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1766014002,
+        "lastModified": 1768000044,
-        "narHash": "sha256-KE/ufBGH8XFXTw3Vt1DrK1rQmAEp1Q+oyLQibX5UKO0=",
+        "narHash": "sha256-hcdQHR8l8oZDIl0vXKNtbrN+32dTs9EYvlqppoHgG2k=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "c172fd9f464d5766eab9071e8f4770504c920c05",
+        "rev": "930817f1009d9d392103b5440e2503cb47fdacc0",
         "type": "github"
       },
       "original": {
@@ -277,98 +277,27 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1765779637,
+        "lastModified": 1768020509,
-        "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
+        "narHash": "sha256-V7El1ktdJ0/WWEr6wGBKFYu433vitrWvxmvPk79FsSc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
+        "rev": "299d331f770cdf7c466a4faa08b3070a767d681d",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1765472234,
-        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nvim-treesitter": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1765632521,
-        "narHash": "sha256-HT+UzX1m4hm2QAqDa0dltArr3gMyYhXHnHoYkkQBWZA=",
-        "owner": "nvim-treesitter",
-        "repo": "nvim-treesitter",
-        "rev": "74b119812e9f82bccc2f0eca156faff0354362ae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-treesitter",
-        "ref": "main",
-        "repo": "nvim-treesitter",
-        "type": "github"
-      }
-    },
-    "nvim-treesitter-main": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3",
-        "nvim-treesitter": "nvim-treesitter",
-        "nvim-treesitter-textobjects": "nvim-treesitter-textobjects"
-      },
-      "locked": {
-        "lastModified": 1765744132,
-        "narHash": "sha256-+Uw+965kDJTriyUGiYF/eYAuQBowoBZpLzJswInqLCY=",
-        "owner": "iofq",
-        "repo": "nvim-treesitter-main",
-        "rev": "2e8b5c686fc346c34b1d2a269584b32f480e7b7f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "iofq",
-        "repo": "nvim-treesitter-main",
-        "type": "github"
-      }
-    },
-    "nvim-treesitter-textobjects": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1765672441,
-        "narHash": "sha256-w2dzc5oWyEoPUgbqaAuNKCeFeh81rYJPOCPVRnFC724=",
-        "owner": "nvim-treesitter",
-        "repo": "nvim-treesitter-textobjects",
-        "rev": "0d7c800fadcfe2d33089f5726cb8907fc846eece",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-treesitter",
-        "ref": "main",
-        "repo": "nvim-treesitter-textobjects",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "dart": "dart",
         "flake-utils": "flake-utils_2",
         "gen-luarc": "gen-luarc",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_2"
-        "nvim-treesitter-main": "nvim-treesitter-main"
       }
     },
     "systems": {

flake.nix

@@ -2,7 +2,7 @@
   description = "Neovim derivation";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/master";
     flake-utils.url = "github:numtide/flake-utils";
     neovim-nightly-overlay = {
       url = "github:nix-community/neovim-nightly-overlay";
@@ -15,9 +15,6 @@
     dart = {
       url = "github:iofq/dart.nvim";
     };
-    nvim-treesitter-main = {
-      url = "github:iofq/nvim-treesitter-main";
-    };
   };
   outputs =
     inputs@{
@@ -32,17 +29,6 @@
       neovim-overlay = import ./nix/neovim-overlay.nix { inherit inputs; };
       finalOverlays = [
         inputs.neovim-nightly-overlay.overlays.default
-        inputs.nvim-treesitter-main.overlays.default
-        (final: prev: {
-          vimPlugins = prev.vimPlugins.extend (
-            f: p: {
-              nvim-treesitter = p.nvim-treesitter.withAllGrammars;
-              nvim-treesitter-textobjects = p.nvim-treesitter-textobjects.overrideAttrs {
-                dependencies = [ f.nvim-treesitter ];
-              };
-            }
-          );
-        })
         neovim-overlay
       ];
     in
@@ -73,6 +59,7 @@
         packages = rec {
           default = nvim;
           nvim = pkgs.nvim-pkg;
+          nvim-min = pkgs.nvim-min-pkg;
         };
         devShells = {
           default = shell;

nix/neovim-overlay.nix

@@ -14,21 +14,43 @@ let
     nvim-autopairs
     nvim-lint
     nvim-lspconfig
-    nvim-treesitter
+    nvim-treesitter.withAllGrammars
     nvim-treesitter-textobjects
     quicker-nvim
     render-markdown-nvim
     snacks-nvim
   ];
 
-  packages = with prev; [
+  basePackages = with prev; [
     ripgrep
     fd
   ];
+  # Extra packages that should be included on nixos but don't need to be bundled
+  extraPackages = with prev; [
+    # linters
+    yamllint
+    jq
+    hadolint
+    nixfmt
+    shellcheck
+    golangci-lint
+
+    # LSPs
+    gopls
+    lua-language-server
+    nixd
+    basedpyright
+  ];
 in
 {
   nvim-pkg = mkNeovim {
-    inherit plugins packages;
+    inherit plugins;
+    packages = basePackages ++ extraPackages;
+  };
+
+  nvim-min-pkg = mkNeovim {
+    inherit plugins;
+    packages = basePackages;
   };
 
   nvim-luarc-json = final.mk-luarc-json {

nvim/after/lua/iofq/snacks_jj.lua

@@ -62,21 +62,6 @@ function M.file_history(filename)
     end
   end
 
-  local function confirm(picker, item)
-    picker:close()
-    local cmd = string.format('jj show --git -r %s', item.rev)
-    local out = vim.fn.systemlist(cmd)
-
-    local bufnr = vim.api.nvim_create_buf(false, true)
-    vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, out)
-    vim.bo[bufnr].bufhidden = 'wipe'
-    vim.bo[bufnr].buftype = 'nofile'
-    vim.bo[bufnr].filetype = 'diff'
-    vim.keymap.set('n', 'q', vim.cmd.bdelete, { buffer = bufnr, noremap = true })
-
-    vim.api.nvim_set_current_buf(bufnr)
-  end
-
   local function get_history(f)
     local status_raw = vim.fn.system(
       'jj log --ignore-working-copy --no-graph'
@@ -100,7 +85,6 @@ function M.file_history(filename)
     title = 'jj file history for ' .. filename,
     items = get_history(filename),
     preview = preview,
-    confirm = confirm,
   }
 end
 return M

nvim/after/plugin/autocmd.lua

@@ -48,7 +48,7 @@ cmd('FileType', {
       local ns = vim.api.nvim_create_namespace('nvim.difftool.hl')
       vim.api.nvim_buf_clear_namespace(event.buf, ns, 0, -1)
       for i, item in ipairs(qf) do
-        local path = vim.fn.fnamemodify(item.user_data.right, ':.')
+        local path = vim.fn.fnamemodify(item.user_data.right, ':t')
         local hl = 'Added'
         if
           exec('git diff --quiet -- %s', path) ~= 0
@@ -98,45 +98,6 @@ cmd('BufWinEnter', {
         vim.cmd(string.format('%dcopen', math.min(10, #items)))
       end)
     end
-
-    local function get_hunks(bufnr)
-      local conf_start = vim.fn.search('^<<<<<<<', 'bc')
-      local base_start = vim.fn.search('^|||||||', 'W')
-      local base_end = vim.fn.search('^=======', 'W')
-      local conf_end = vim.fn.search('^>>>>>>>', 'W')
-
-      local left = vim.api.nvim_buf_get_lines(bufnr, conf_start, base_start - 1, false)
-      local right = vim.api.nvim_buf_get_lines(bufnr, base_end, conf_end - 1, false)
-
-      return {
-        start = conf_start,
-        stop = conf_end,
-        left = left,
-        right = right,
-      }
-    end
-
-    local function apply_hunk(hunks, first)
-      local result = {}
-      if first == -1 then -- left first
-        vim.list_extend(result, hunks.left)
-        vim.list_extend(result, hunks.right)
-      else
-        vim.list_extend(result, hunks.right)
-        vim.list_extend(result, hunks.left)
-      end
-
-      -- apply hunk in place
-      vim.api.nvim_buf_set_lines(0, hunks.start - 1, hunks.stop, false, result)
-    end
-
-    -- "combine" mappings ala vscode's merge editor
-    vim.keymap.set('n', '<leader>dl', function()
-      apply_hunk(get_hunks(event.buf), -1)
-    end, { buffer = event.buf })
-    vim.keymap.set('n', '<leader>dr', function()
-      apply_hunk(get_hunks(event.buf), 1)
-    end, { buffer = event.buf })
   end,
 })
 

nvim/after/plugin/mini.lua

@@ -9,8 +9,6 @@ vim.schedule(function()
   ai.setup {
     n_lines = 300,
     custom_textobjects = {
-      i = require('mini.extra').gen_ai_spec.indent(),
-      b = require('mini.extra').gen_ai_spec.buffer(),
       a = ai.gen_spec.treesitter { a = '@parameter.outer', i = '@parameter.inner' },
       f = ai.gen_spec.treesitter { a = '@function.outer', i = '@function.inner' },
     },
@@ -18,7 +16,9 @@ vim.schedule(function()
 
   require('mini.git').setup()
   map('n', '<leader>gb', '<Cmd>Git blame -- %<CR>')
-  map('n', '<leader>go', MiniGit.show_at_cursor)
+  map('n', '<leader>go', function()
+    return MiniGit.show_at_cursor()
+  end)
 
   local jump = require('mini.jump2d')
   jump.setup {

nvim/after/plugin/plugins.lua

@@ -3,7 +3,12 @@ local map = vim.keymap.set
 require('mini.basics').setup { mappings = { windows = true } }
 require('mini.icons').setup()
 
-require('dart').setup {}
+require('dart').setup {
+  tabline = {
+    icons = false,
+    label_marked_fg = 'cyan',
+  },
+}
 
 require('snacks').setup {
   bigfile = { enabled = true },
@@ -71,6 +76,7 @@ vim.schedule(function()
       json = { 'jq' },
       lua = { 'stylua' },
       python = { 'ruff' },
+      nix = { 'nixfmt' },
       fish = { 'fish_indent' },
       ['*'] = { 'trim_whitespace' },
     },
@@ -93,14 +99,11 @@ vim.schedule(function()
 
   require('lint').linters_by_ft = {
     docker = { 'hadolint' },
-    yaml = { 'yamllint' },
     sh = { 'shellcheck' },
     go = { 'golangcilint' },
-    ruby = { 'rubocop' },
     fish = { 'fish' },
     bash = { 'bash' },
     nix = { 'nix' },
-    php = { 'php' },
   }
   vim.api.nvim_create_autocmd({ 'BufWritePost' }, {
     callback = function()
@@ -116,7 +119,7 @@ vim.schedule(function()
     sources = {
       default = { 'lsp', 'path', 'snippets', 'ripgrep', 'buffer' },
       providers = {
-        lsp = { fallbacks = {}, async = true }, -- include buffer even when LSP is active
+        lsp = { fallbacks = {} }, -- include buffer even when LSP is active
         path = { opts = { get_cwd = vim.fn.getcwd } }, -- use nvim pwd instead of current file pwd
         ripgrep = {
           module = 'blink-ripgrep',