feat(snacks): add extra packages

Regression details see here https://github.com/nix-community/neovim-nightly-overlay/issues/741

.gitea/workflows/build-flake.yml

@@ -10,25 +10,22 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        with:
-          ref: "main"
       - name: Setup sudo (required for the next step)
         run: apt-get update && apt-get install -y sudo
       - name: Setup nix
-        uses: cachix/install-nix-action@v30
+        uses: cachix/install-nix-action@v31
         with:
           extra_nix_config: |
             experimental-features = nix-command flakes
           github_access_token: ${{ secrets.GH_ACCESS_TOKEN }}
-          nix_path: nixpkgs=channel:nixos-24.05
-      - uses: cachix/cachix-action@v15
+          nix_path: nixpkgs=channel:nixos-25.05
+      - uses: cachix/cachix-action@v16
         with:
           name: palkx
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
           extraPullNames: nix-community
       - name: Build nix flake
         run: |
-          while true; do sleep 1; rm -rf /homeless-shelter; done &
-          nix build
+          nix build .
       - name: Check nix flake
         run: nix flake check --all-systems

config/default.nix

@@ -1,9 +1,32 @@
-{ pkgs }:
-pkgs.stdenv.mkDerivation {
-  name = "nvim-config";
-  src = ./src;
-  installPhase = ''
-    mkdir -p $out/
-    cp -r . $out/
-  '';
+{
+  imports = [
+    ./options.nix
+
+    ./modules/colorschemes/catppuccin.nix
+
+    ./modules/plugins/lsp
+
+    ./modules/plugins/airline.nix
+    ./modules/plugins/blink-cmp.nix
+    ./modules/plugins/bufferline.nix
+    ./modules/plugins/conform-nvim.nix
+    ./modules/plugins/fzf-lua.nix
+    ./modules/plugins/gitsigns.nix
+    # ./modules/plugins/lazygit.nix
+    ./modules/plugins/mini.nix
+    ./modules/plugins/neotree.nix
+    ./modules/plugins/oil.nix
+    ./modules/plugins/snacks.nix
+    ./modules/plugins/tmux-navigator.nix
+    ./modules/plugins/treesitter.nix
+    ./modules/plugins/undotree.nix
+    ./modules/plugins/which-key.nix
+  ];
+
+  performance.byteCompileLua.enable = true;
+  performance.byteCompileLua.configs = true;
+  performance.byteCompileLua.initLua = true;
+  performance.byteCompileLua.luaLib = true;
+  performance.byteCompileLua.nvimRuntime = true;
+  performance.byteCompileLua.plugins = true;
 }

config/modules/colorschemes/catppuccin.nix

@@ -0,0 +1,14 @@
+{
+  colorschemes = {
+    catppuccin = {
+      enable = true;
+      settings = {
+        flavour = "macchiato";
+        transparent_background = false;
+        dim_inactive = {
+          enabled = true;
+        };
+      };
+    };
+  };
+}

config/modules/plugins/airline.nix

@@ -0,0 +1,5 @@
+{
+  plugins.airline = {
+    enable = true;
+  };
+}

config/modules/plugins/blink-cmp.nix

@@ -0,0 +1,54 @@
+{
+  plugins.blink-cmp = {
+    enable = true;
+    settings = {
+      appearance = {
+        nerd_font_variant = "normal";
+        use_nvim_cmp_as_default = true;
+      };
+      completion = {
+        accept = {
+          auto_brackets = {
+            enabled = true;
+            semantic_token_resolution = {
+              enabled = false;
+            };
+          };
+        };
+        trigger = {
+          show_on_keyword = true;
+          show_on_trigger_character = true;
+        };
+        documentation = {
+          auto_show = true;
+          auto_show_delay_ms = 500;
+        };
+        menu = {
+          auto_show = true;
+        };
+      };
+      keymap = {
+        preset = "default";
+      };
+      signature = {
+        enabled = true;
+      };
+      sources = {
+        default = [
+          "lsp"
+          "buffer"
+          "snippets"
+          "path"
+        ];
+        providers = {
+          buffer = {
+            score_offset = -7;
+          };
+          lsp = {
+            fallbacks = [ ];
+          };
+        };
+      };
+    };
+  };
+}

config/modules/plugins/bufferline.nix

@@ -0,0 +1,46 @@
+{
+  plugins.bufferline.enable = true;
+
+  keymaps = [
+    {
+      mode = "n";
+      key = "<Tab>";
+      action = "<cmd>BufferLineCycleNext<cr>";
+      options = {
+        desc = "Cycle to next buffer";
+      };
+    }
+    {
+      mode = "n";
+      key = "<S-Tab>";
+      action = "<cmd>BufferLineCyclePrev<cr>";
+      options = {
+        desc = "Cycle to previous buffer";
+      };
+    }
+    {
+      mode = "n";
+      key = "<S-l>";
+      action = "<cmd>BufferLineCycleNext<cr>";
+      options = {
+        desc = "Cycle to next buffer";
+      };
+    }
+    {
+      mode = "n";
+      key = "<S-h>";
+      action = "<cmd>BufferLineCyclePrev<cr>";
+      options = {
+        desc = "Cycle to previous buffer";
+      };
+    }
+    {
+      mode = "n";
+      key = "<leader>bd";
+      action = "<cmd>bdelete<cr>";
+      options = {
+        desc = "Delete buffer";
+      };
+    }
+  ];
+}

config/modules/plugins/conform-nvim.nix

@@ -0,0 +1,203 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+{
+  config = {
+    extraConfigLuaPre =
+      # lua
+      ''
+        local slow_format_filetypes = {}
+
+        vim.api.nvim_create_user_command("FormatDisable", function(args)
+           if args.bang then
+            -- FormatDisable! will disable formatting just for this buffer
+            vim.b.disable_autoformat = true
+          else
+            vim.g.disable_autoformat = true
+          end
+        end, {
+          desc = "Disable autoformat-on-save",
+          bang = true,
+        })
+        vim.api.nvim_create_user_command("FormatEnable", function()
+          vim.b.disable_autoformat = false
+          vim.g.disable_autoformat = false
+        end, {
+          desc = "Re-enable autoformat-on-save",
+        })
+        vim.api.nvim_create_user_command("FormatToggle", function(args)
+          local Snacks = require("Snacks");
+          if args.bang then
+            -- Toggle formatting for current buffer
+            vim.b.disable_autoformat = not vim.b.disable_autoformat
+            Snacks.notify.notify("[Buffer] Autoformat enabled: " .. tostring(not vim.b.disable_autoformat))
+          else
+            -- Toggle formatting globally
+            vim.g.disable_autoformat = not vim.g.disable_autoformat
+            Snacks.notify.notify("[Global] Autoformat enabled: " .. tostring(not vim.g.disable_autoformat))
+          end
+        end, {
+          desc = "Toggle autoformat-on-save",
+          bang = true,
+        })
+      '';
+
+    plugins.conform-nvim = {
+      enable = true;
+      settings = {
+        format_on_save = ''
+          function(bufnr)
+            if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
+              return
+            end
+
+            if slow_format_filetypes[vim.bo[bufnr].filetype] then
+              return
+            end
+
+            local function on_format(err)
+              if err and err:match("timeout$") then
+                slow_format_filetypes[vim.bo[bufnr].filetype] = true
+              end
+            end
+
+            return { timeout_ms = 200, lsp_fallback = true }, on_format
+           end
+        '';
+
+        format_after_save = ''
+          function(bufnr)
+            if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
+              return
+            end
+
+            if not slow_format_filetypes[vim.bo[bufnr].filetype] then
+              return
+            end
+
+            return { lsp_fallback = true }
+          end
+        '';
+        notify_on_error = true;
+        formatters_by_ft = {
+          html = {
+            __unkeyed-1 = "prettierd";
+            __unkeyed-2 = "prettier";
+            stop_after_first = true;
+          };
+          css = {
+            __unkeyed-1 = "prettierd";
+            __unkeyed-2 = "prettier";
+            stop_after_first = true;
+          };
+          javascript = {
+            __unkeyed-1 = "prettierd";
+            __unkeyed-2 = "prettier";
+            stop_after_first = true;
+          };
+          javascriptreact = {
+            __unkeyed-1 = "prettierd";
+            __unkeyed-2 = "prettier";
+            stop_after_first = true;
+          };
+          typescript = {
+            __unkeyed-1 = "prettierd";
+            __unkeyed-2 = "prettier";
+            stop_after_first = true;
+          };
+          typescriptreact = {
+            __unkeyed-1 = "prettierd";
+            __unkeyed-2 = "prettier";
+            stop_after_first = true;
+          };
+          python = [ "ruff" ];
+          lua = [ "stylua" ];
+          nix = [ "nixfmt-rfc-style" ];
+          markdown = {
+            __unkeyed-1 = "prettierd";
+            __unkeyed-2 = "prettier";
+            stop_after_first = true;
+          };
+          yaml = {
+            __unkeyed-1 = "prettierd";
+            __unkeyed-2 = "prettier";
+            stop_after_first = true;
+          };
+          terraform = [ "terraform_fmt" ];
+          bash = [
+            "shellcheck"
+            "shellharden"
+            "shfmt"
+          ];
+          json = [ "jq" ];
+          "_" = [ "trim_whitespace" ];
+        };
+
+        formatters = {
+          ruff = {
+            command = "${lib.getExe pkgs.ruff}";
+          };
+          nixfmt-rfc-style = {
+            command = "${lib.getExe pkgs.nixfmt-rfc-style}";
+          };
+          alejandra = {
+            command = "${lib.getExe pkgs.alejandra}";
+          };
+          jq = {
+            command = "${lib.getExe pkgs.jq}";
+          };
+          prettier = {
+            command = "${lib.getExe pkgs.nodePackages.prettier}";
+          };
+          prettierd = {
+            command = "${lib.getExe pkgs.prettierd}";
+          };
+          stylua = {
+            command = "${lib.getExe pkgs.stylua}";
+          };
+          shellcheck = {
+            command = "${lib.getExe pkgs.shellcheck}";
+          };
+          shfmt = {
+            command = "${lib.getExe pkgs.shfmt}";
+          };
+          shellharden = {
+            command = "${lib.getExe pkgs.shellharden}";
+          };
+          yamlfmt = {
+            command = "${lib.getExe pkgs.yamlfmt}";
+          };
+          terraform_fmt = {
+            command = "${lib.getExe (
+              pkgs.terraform.overrideAttrs (oldAttrs: {
+                meta = lib.recursiveUpdate oldAttrs.meta {
+                  license = lib.licenses.gpl3Only;
+                };
+              })
+            )}";
+          };
+        };
+      };
+    };
+    keymaps = [
+      {
+        mode = "n";
+        key = "<leader>uf";
+        action = "<cmd>FormatToggle<cr>";
+        options = {
+          desc = "Toggle Format (Global)";
+        };
+      }
+      {
+        mode = "n";
+        key = "<leader>uF";
+        action = "<cmd>FormatToggle!<cr>";
+        options = {
+          desc = "Toggle Format (Buffer)";
+        };
+      }
+    ];
+  };
+}

config/modules/plugins/fzf-lua.nix

@@ -0,0 +1,30 @@
+{ lib, pkgs, ... }:
+{
+  plugins.fzf-lua = {
+    enable = true;
+    # keymaps = {
+    #   "<leader>sf" = {
+    #     action = "files";
+    #     options = {
+    #       desc = "Fzf-Lua File Grep";
+    #     };
+    #   };
+    #   "<leader>sg" = {
+    #     action = "live_grep_native";
+    #     options = {
+    #       desc = "Fzf-Lua File Grep";
+    #     };
+    #   };
+    #   "<leader>sv" = {
+    #     action = "git_files";
+    #     # settings = {
+    #     #   previewers.cat.cmd = lib.getExe' pkgs.coreutils "cat";
+    #     #   winopts.height = 0.5;
+    #     # };
+    #     options = {
+    #       desc = "Fzf-Lua VCS Grep (Git)";
+    #     };
+    #   };
+    # };
+  };
+}

config/modules/plugins/gitsigns.nix

@@ -0,0 +1,9 @@
+{
+  plugins.gitsigns = {
+    enable = true;
+    settings = {
+      current_line_blame = true;
+      current_line_blame_formatter = "   <author>, <committer_time:%R> • <summary>";
+    };
+  };
+}

config/modules/plugins/lazygit.nix

@@ -0,0 +1,3 @@
+{
+  plugins.lazygit.enable = true;
+}

config/modules/plugins/lsp/ansiblels.nix

@@ -0,0 +1,3 @@
+{
+  lsp.servers.ansiblels.enable = true;
+}

config/modules/plugins/lsp/bashls.nix

@@ -0,0 +1,3 @@
+{
+  lsp.servers.bashls.enable = true;
+}

config/modules/plugins/lsp/default.nix

@@ -0,0 +1,75 @@
+{ lib, ... }:
+{
+  imports = [
+    # Default configurations for lsp servers
+    ./lspconfig.nix
+
+    ./ansiblels.nix
+    ./bashls.nix
+    ./docker_compose_language_server.nix
+    ./dockerls.nix
+    ./gopls.nix
+    ./helm_ls.nix
+    ./jdtls.nix
+    ./jsonls.nix
+    ./jsonnet_ls.nix
+    ./just.nix
+    ./lua_ls.nix
+    ./marksman.nix
+    ./nixd.nix
+    ./ruff.nix
+    ./tflint.nix
+    ./yamlls.nix
+  ];
+
+  # lsp.keymaps = [
+  #   {
+  #     key = "gd";
+  #     lspBufAction = "definition";
+  #   }
+  #   {
+  #     key = "gD";
+  #     lspBufAction = "references";
+  #   }
+  #   {
+  #     key = "gt";
+  #     lspBufAction = "type_definition";
+  #   }
+  #   {
+  #     key = "gi";
+  #     lspBufAction = "implementation";
+  #   }
+  #   {
+  #     key = "K";
+  #     lspBufAction = "hover";
+  #   }
+  #   {
+  #     action = lib.nixvim.mkRaw "function() vim.diagnostic.jump({ count=-1, float=true }) end";
+  #     key = "<leader>k";
+  #   }
+  #   {
+  #     action = lib.nixvim.mkRaw "function() vim.diagnostic.jump({ count=1, float=true }) end";
+  #     key = "<leader>j";
+  #   }
+  #   {
+  #     action = "<CMD>LspStop<Enter>";
+  #     key = "<leader>lx";
+  #   }
+  #   {
+  #     action = "<CMD>LspStart<Enter>";
+  #     key = "<leader>ls";
+  #   }
+  #   {
+  #     action = "<CMD>LspRestart<Enter>";
+  #     key = "<leader>lr";
+  #   }
+  #   # {
+  #   #   action = lib.nixvim.mkRaw "require('telescope.builtin').lsp_definitions";
+  #   #   key = "gd";
+  #   # }
+  #   {
+  #     action = "<CMD>Lspsaga hover_doc<Enter>";
+  #     key = "K";
+  #   }
+  # ];
+}

config/modules/plugins/lsp/docker_compose_language_server.nix

@@ -0,0 +1,3 @@
+{
+  lsp.servers.docker_compose_language_service.enable = true;
+}

config/modules/plugins/lsp/dockerls.nix

@@ -0,0 +1,3 @@
+{
+  lsp.servers.dockerls.enable = true;
+}

config/modules/plugins/lsp/gopls.nix

@@ -0,0 +1,3 @@
+{
+  lsp.servers.gopls.enable = true;
+}

config/modules/plugins/lsp/helm_ls.nix

@@ -0,0 +1,3 @@
+{
+  lsp.servers.helm_ls.enable = true;
+}

config/modules/plugins/lsp/jdtls.nix

@@ -0,0 +1,3 @@
+{
+  lsp.servers.jdtls.enable = true;
+}

config/modules/plugins/lsp/jsonls.nix

@@ -0,0 +1,3 @@
+{
+  lsp.servers.jsonls.enable = true;
+}

config/modules/plugins/lsp/jsonnet_ls.nix

@@ -0,0 +1,3 @@
+{
+  lsp.servers.jsonnet_ls.enable = true;
+}

config/modules/plugins/lsp/just.nix

@@ -0,0 +1,3 @@
+{
+  lsp.servers.just.enable = true;
+}

config/modules/plugins/lsp/lspconfig.nix

@@ -0,0 +1,3 @@
+{
+  plugins.lspconfig.enable = true;
+}

config/modules/plugins/lsp/lua_ls.nix

@@ -0,0 +1,3 @@
+{
+  lsp.servers.lua_ls.enable = true;
+}

config/modules/plugins/lsp/marksman.nix

@@ -0,0 +1,3 @@
+{
+  lsp.servers.marksman.enable = true;
+}

config/modules/plugins/lsp/nixd.nix

@@ -0,0 +1,3 @@
+{
+  lsp.servers.nixd.enable = true;
+}

config/modules/plugins/lsp/ruff.nix

@@ -0,0 +1,3 @@
+{
+  lsp.servers.ruff.enable = true;
+}

config/modules/plugins/lsp/tflint.nix

@@ -0,0 +1,3 @@
+{
+  lsp.servers.tflint.enable = true;
+}

config/modules/plugins/lsp/yamlls.nix

@@ -0,0 +1,3 @@
+{
+  lsp.servers.yamlls.enable = true;
+}

config/modules/plugins/mini.nix

@@ -0,0 +1,11 @@
+{
+  plugins.mini = {
+    enable = true;
+    mockDevIcons = true;
+    modules = {
+      icons = { };
+      comment = { };
+      diff = { };
+    };
+  };
+}

config/modules/plugins/neotree.nix

@@ -0,0 +1,32 @@
+{
+  plugins.neo-tree = {
+    enable = true;
+    enableDiagnostics = true;
+    enableGitStatus = true;
+    enableModifiedMarkers = true;
+    enableRefreshOnWrite = true;
+    closeIfLastWindow = true;
+    popupBorderStyle = "rounded"; # Type: null or one of “NC”, “double”, “none”, “rounded”, “shadow”, “single”, “solid” or raw lua code
+    buffers = {
+      bindToCwd = false;
+      followCurrentFile = {
+        enabled = true;
+      };
+    };
+    window = {
+      width = 40;
+      height = 15;
+      autoExpandWidth = false;
+      mappings = {
+        "<space>" = "none";
+      };
+    };
+  };
+
+  keymaps = [
+    {
+      action = "<cmd>Neotree toggle<CR>";
+      key = "<leader>e";
+    }
+  ];
+}

config/modules/plugins/oil.nix

@@ -0,0 +1,28 @@
+{
+  plugins.oil = {
+    enable = true;
+    settings = {
+      win_options = {
+        signcolumn = "yes:2";
+      };
+    };
+  };
+
+  plugins.oil-git-status = {
+    enable = true;
+    settings = {
+      show_ignored = true;
+    };
+  };
+
+  keymaps = [
+    {
+      mode = "n";
+      action = "<cmd>Oil<CR>";
+      key = "<leader>o";
+      options = {
+        desc = "Open [O]il";
+      };
+    }
+  ];
+}

config/modules/plugins/snacks.nix

@@ -0,0 +1,499 @@
+{ lib, pkgs, ... }:
+{
+  plugins.snacks = {
+    enable = true;
+    settings = {
+      bigfile.enabled = true;
+      notifier.enabled = true;
+      quickfile.enabled = true;
+      statuscolumn.enabled = true;
+      words.enabled = true;
+      lazygit.enabled = true;
+      picker.enabled = true;
+      indent.enabled = true;
+      scope.enabled = true;
+    };
+  };
+
+  extraPackages = [
+    pkgs.ripgrep
+    pkgs.fd
+    pkgs.lazygit
+  ];
+
+  keymaps = [
+    {
+      key = "<leader><space>";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.smart() end";
+      options = {
+        desc = "Smart Find Files";
+      };
+    }
+    {
+      key = "<leader>,";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.buffers() end";
+      options = {
+        desc = "Buffers";
+      };
+    }
+    {
+      key = "<leader>/";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.grep() end";
+      options = {
+        desc = "Grep";
+      };
+    }
+    {
+      key = "<leader>:";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.command_history() end";
+      options = {
+        desc = "Command History";
+      };
+    }
+    {
+      key = "<leader>n";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.notifications() end";
+      options = {
+        desc = "Notification History";
+      };
+    }
+    {
+      key = "<leader>e";
+      action = lib.nixvim.mkRaw "function() Snacks.explorer() end";
+      options = {
+        desc = "File Explorer";
+      };
+    }
+    {
+      key = "<leader>fb";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.buffers() end";
+      options = {
+        desc = "Buffers";
+      };
+    }
+    {
+      key = "<leader>fc";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.files({ cwd = vim.fn.stdpath(\"config\") }) end";
+      options = {
+        desc = "Find Config File";
+      };
+    }
+    {
+      key = "<leader>ff";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.files() end";
+      options = {
+        desc = "Find Files";
+      };
+    }
+    {
+      key = "<leader>fg";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.git_files() end";
+      options = {
+        desc = "Find Git Files";
+      };
+    }
+    {
+      key = "<leader>fp";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.projects() end";
+      options = {
+        desc = "Projects";
+      };
+    }
+    {
+      key = "<leader>fr";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.recent() end";
+      options = {
+        desc = "Recent";
+      };
+    }
+    {
+      key = "<leader>gb";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.git_branches() end";
+      options = {
+        desc = "Git Branches";
+      };
+    }
+    {
+      key = "<leader>gl";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.git_log() end";
+      options = {
+        desc = "Git Log";
+      };
+    }
+    {
+      key = "<leader>gL";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.git_log_line() end";
+      options = {
+        desc = "Git Log Line";
+      };
+    }
+    {
+      key = "<leader>gs";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.git_status() end";
+      options = {
+        desc = "Git Status";
+      };
+    }
+    {
+      key = "<leader>gS";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.git_stash() end";
+      options = {
+        desc = "Git Stash";
+      };
+    }
+    {
+      key = "<leader>gd";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.git_diff() end";
+      options = {
+        desc = "Git Diff (Hunks)";
+      };
+    }
+    {
+      key = "<leader>gf";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.git_log_file() end";
+      options = {
+        desc = "Git Log File";
+      };
+    }
+    {
+      key = "<leader>sb";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.lines() end";
+      options = {
+        desc = "Buffer Lines";
+      };
+    }
+    {
+      key = "<leader>sB";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.grep_buffers() end";
+      options = {
+        desc = "Grep Open Buffers";
+      };
+    }
+    {
+      key = "<leader>sg";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.grep() end";
+      options = {
+        desc = "Grep";
+      };
+    }
+    {
+      key = "<leader>sw";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.grep_word() end";
+      options = {
+        desc = "Visual selection or word";
+      };
+      mode = "n";
+    }
+    {
+      key = "<leader>s\"";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.registers() end";
+      options = {
+        desc = "Registers";
+      };
+    }
+    {
+      key = "<leader>s/";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.search_history() end";
+      options = {
+        desc = "Search History";
+      };
+    }
+    {
+      key = "<leader>sa";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.autocmds() end";
+      options = {
+        desc = "Autocmds";
+      };
+    }
+    {
+      key = "<leader>sb";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.lines() end";
+      options = {
+        desc = "Buffer Lines";
+      };
+    }
+    {
+      key = "<leader>sc";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.command_history() end";
+      options = {
+        desc = "Command History";
+      };
+    }
+    {
+      key = "<leader>sC";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.commands() end";
+      options = {
+        desc = "Commands";
+      };
+    }
+    {
+      key = "<leader>sd";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.diagnostics() end";
+      options = {
+        desc = "Diagnostics";
+      };
+    }
+    {
+      key = "<leader>sD";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.diagnostics_buffer() end";
+      options = {
+        desc = "Buffer Diagnostics";
+      };
+    }
+    {
+      key = "<leader>sh";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.help() end";
+      options = {
+        desc = "Help Pages";
+      };
+    }
+    {
+      key = "<leader>sH";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.highlights() end";
+      options = {
+        desc = "Highlights";
+      };
+    }
+    {
+      key = "<leader>si";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.icons() end";
+      options = {
+        desc = "Icons";
+      };
+    }
+    {
+      key = "<leader>sj";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.jumps() end";
+      options = {
+        desc = "Jumps";
+      };
+    }
+    {
+      key = "<leader>sk";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.keymaps() end";
+      options = {
+        desc = "Keymaps";
+      };
+    }
+    {
+      key = "<leader>sl";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.loclist() end";
+      options = {
+        desc = "Location List";
+      };
+    }
+    {
+      key = "<leader>sm";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.marks() end";
+      options = {
+        desc = "Marks";
+      };
+    }
+    {
+      key = "<leader>sM";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.man() end";
+      options = {
+        desc = "Man Pages";
+      };
+    }
+    {
+      key = "<leader>sp";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.lazy() end";
+      options = {
+        desc = "Search for Plugin Spec";
+      };
+    }
+    {
+      key = "<leader>sq";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.qflist() end";
+      options = {
+        desc = "Quickfix List";
+      };
+    }
+    {
+      key = "<leader>sR";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.resume() end";
+      options = {
+        desc = "Resume";
+      };
+    }
+    {
+      key = "<leader>su";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.undo() end";
+      options = {
+        desc = "Undo History";
+      };
+    }
+    {
+      key = "<leader>uC";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.colorschemes() end";
+      options = {
+        desc = "Colorschemes";
+      };
+    }
+    {
+      key = "gd";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.lsp_definitions() end";
+      options = {
+        desc = "Goto Definition";
+      };
+    }
+    {
+      key = "gD";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.lsp_declarations() end";
+      options = {
+        desc = "Goto Declaration";
+      };
+    }
+    {
+      key = "gr";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.lsp_references() end";
+      options = {
+        desc = "References";
+      };
+    }
+    {
+      key = "gI";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.lsp_implementations() end";
+      options = {
+        desc = "Goto Implementation";
+      };
+    }
+    {
+      key = "gy";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.lsp_type_definitions() end";
+      options = {
+        desc = "Goto T[y]pe Definition";
+      };
+    }
+    {
+      key = "gai";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.lsp_incoming_calls() end";
+      options = {
+        desc = "C[a]lls Incoming";
+      };
+    }
+    {
+      key = "gao";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.lsp_outgoing_calls() end";
+      options = {
+        desc = "C[a]lls Outgoing";
+      };
+    }
+    {
+      key = "<leader>ss";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.lsp_symbols() end";
+      options = {
+        desc = "LSP Symbols";
+      };
+    }
+    {
+      key = "<leader>sS";
+      action = lib.nixvim.mkRaw "function() Snacks.picker.lsp_workspace_symbols() end";
+      options = {
+        desc = "LSP Workspace Symbols";
+      };
+    }
+    {
+      key = "<leader>z";
+      action = lib.nixvim.mkRaw "function() Snacks.zen() end";
+      options = {
+        desc = "Toggle Zen Mode";
+      };
+    }
+    {
+      key = "<leader>Z";
+      action = lib.nixvim.mkRaw "function() Snacks.zen.zoom() end";
+      options = {
+        desc = "Toggle Zoom";
+      };
+    }
+    {
+      key = "<leader>.";
+      action = lib.nixvim.mkRaw "function() Snacks.scratch() end";
+      options = {
+        desc = "Toggle Scratch Buffer";
+      };
+    }
+    {
+      key = "<leader>S";
+      action = lib.nixvim.mkRaw "function() Snacks.scratch.select() end";
+      options = {
+        desc = "Select Scratch Buffer";
+      };
+    }
+    {
+      key = "<leader>n";
+      action = lib.nixvim.mkRaw "function() Snacks.notifier.show_history() end";
+      options = {
+        desc = "Notification History";
+      };
+    }
+    {
+      key = "<leader>bd";
+      action = lib.nixvim.mkRaw "function() Snacks.bufdelete() end";
+      options = {
+        desc = "Delete Buffer";
+      };
+    }
+    {
+      key = "<leader>cR";
+      action = lib.nixvim.mkRaw "function() Snacks.rename.rename_file() end";
+      options = {
+        desc = "Rename File";
+      };
+    }
+    {
+      key = "<leader>gB";
+      action = lib.nixvim.mkRaw "function() Snacks.gitbrowse() end";
+      options = {
+        desc = "Git Browse";
+      };
+      mode = "n";
+    }
+    {
+      key = "<leader>gg";
+      action = lib.nixvim.mkRaw "function() Snacks.lazygit() end";
+      options = {
+        desc = "Lazygit";
+      };
+    }
+    {
+      key = "<leader>un";
+      action = lib.nixvim.mkRaw "function() Snacks.notifier.hide() end";
+      options = {
+        desc = "Dismiss All Notifications";
+      };
+    }
+    {
+      key = "<c-/>";
+      action = lib.nixvim.mkRaw "function() Snacks.terminal() end";
+      options = {
+        desc = "Toggle Terminal";
+      };
+    }
+    {
+      key = "<c-_>";
+      action = lib.nixvim.mkRaw "function() Snacks.terminal() end";
+      options = {
+        desc = "which_key_ignore";
+      };
+    }
+    {
+      key = "]]";
+      action = lib.nixvim.mkRaw "function() Snacks.words.jump(vim.v.count1) end";
+      options = {
+        desc = "Next Reference";
+      };
+      mode = "n";
+    }
+    {
+      key = "[[";
+      action = lib.nixvim.mkRaw "function() Snacks.words.jump(-vim.v.count1) end";
+      options = {
+        desc = "Prev Reference";
+      };
+      mode = "n";
+    }
+  ];
+}

config/modules/plugins/tmux-navigator.nix

@@ -0,0 +1,3 @@
+{
+  plugins.tmux-navigator.enable = true;
+}

config/modules/plugins/treesitter.nix

@@ -0,0 +1,35 @@
+{ pkgs, ... }:
+{
+  plugins = {
+    treesitter = {
+      enable = true;
+
+      settings = {
+        indent = {
+          enable = true;
+        };
+        highlight = {
+          enable = true;
+        };
+      };
+
+      nixvimInjections = true;
+      grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars;
+    };
+
+    treesitter-context = {
+      enable = false;
+    };
+
+    treesitter-textobjects = {
+      enable = true;
+      select = {
+        enable = true;
+        lookahead = true;
+      };
+    };
+  };
+  extraConfigLua = ''
+    local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
+  '';
+}

config/modules/plugins/undotree.nix

@@ -0,0 +1,14 @@
+{
+  plugins.undotree.enable = true;
+
+  keymaps = [
+    {
+      mode = "n";
+      key = "<leader>ut";
+      action = "<cmd>UndotreeToggle<CR>";
+      options = {
+        desc = "Undotree";
+      };
+    }
+  ];
+}

config/modules/plugins/which-key.nix

@@ -0,0 +1,5 @@
+{
+  plugins.which-key = {
+    enable = true;
+  };
+}

config/options.nix

@@ -0,0 +1,115 @@
+{ pkgs, ... }:
+{
+  globalOpts = {
+    # Line numbers
+    number = true;
+    relativenumber = true;
+
+    # Enable more colors (24-bit)
+    termguicolors = true;
+
+    # Have a better completion experience
+    completeopt = [
+      "menuone"
+      "noselect"
+      "noinsert"
+    ];
+
+    # Always show the signcolumn, otherwise text would be shifted when displaying error icons
+    signcolumn = "yes:3";
+
+    # Enable mouse
+    mouse = "a";
+
+    # Search
+    ignorecase = true;
+    smartcase = true;
+
+    # Configure how new splits should be opened
+    splitright = true;
+    splitbelow = true;
+
+    list = true;
+    # NOTE: .__raw here means that this field is raw lua code
+    listchars.__raw = "{ tab = '» ', trail = '·', nbsp = '␣' }";
+
+    expandtab = true;
+    tabstop = 2;
+    shiftwidth = 2;
+    softtabstop = 0;
+    smarttab = true;
+
+    # Set encoding
+    encoding = "utf-8";
+    fileencoding = "utf-8";
+
+    # Save undo history
+    undofile = true;
+    swapfile = true;
+    backup = false;
+    autoread = true;
+
+    # Highlight the current line for cursor
+    cursorline = true;
+
+    # Show line and column when searching
+    ruler = true;
+
+    # Global substitution by default
+    gdefault = true;
+
+    # Start scrolling when the cursor is X lines away from the top/bottom
+    scrolloff = 5;
+  };
+
+  diagnostic.settings = {
+    update_in_insert = true;
+    severity_sort = true;
+    float = {
+      border = "rounded";
+    };
+    jump = {
+      severity.__raw = "vim.diagnostic.severity.WARN";
+    };
+  };
+
+  # userCommands = {
+  #   Q.command = "q";
+  #   Q.bang = true;
+  #   Wq.command = "q";
+  #   Wq.bang = true;
+  #   WQ.command = "q";
+  #   WQ.bang = true;
+  #   W.command = "q";
+  #   W.bang = true;
+  # };
+
+  globals.mapleader = ",";
+
+  # autoCmd = [
+  #   {
+  #     event = [ "VimEnter" ];
+  #     callback = {
+  #       __raw = "function() if vim.fn.argv(0) == '' then require('telescope.builtin').find_files() end end";
+  #     };
+  #   }
+  #   {
+  #     event = [ "VimEnter" ];
+  #     command = "set relativenumber";
+  #   }
+  # ];
+  #autoCmd = [
+  #  {
+  #    event = [ "BufEnter" "BufWinEnter" ];
+  #    pattern = [ "*.md" "*.mdx" ];
+  #    command = "MarkdownPreviewToggle";
+  #  }
+  #];
+
+  # highlight = {
+  #   Comment.fg = "#ff00ff";
+  #   Comment.bg = "#000000";
+  #   Comment.underline = true;
+  #   Comment.bold = true;
+  # };
+}

config/src/lazygit/config.yml

@@ -1 +0,0 @@
-/tmp/lazyvim-lazygit/config.yml

config/src/lazygit/state.yml

@@ -1 +0,0 @@
-/tmp/lazyvim-lazygit/state.yml

config/src/nvim/.neoconf.json

@@ -1,15 +0,0 @@
-{
-  "neodev": {
-    "library": {
-      "enabled": true,
-      "plugins": true
-    }
-  },
-  "neoconf": {
-    "plugins": {
-      "lua_ls": {
-        "enabled": true
-      }
-    }
-  }
-}

config/src/nvim/init.lua

@@ -1,8 +0,0 @@
--- Configure symlinks needed by LazyVim
-vim.fn.system({ "mkdir", "-p", os.getenv("HOME") .. "/.config/lazyvim/nvim" })
-vim.fn.system({ "mkdir", "-p", os.getenv("HOME") .. "/.config/lazyvim/lazygit" })
-vim.fn.system({ "ln", "-sfT", os.getenv("HOME") .. "/.config/lazyvim/nvim", "/tmp/lazyvim-nvim" })
-vim.fn.system({ "ln", "-sfT", os.getenv("HOME") .. "/.config/lazyvim/lazygit", "/tmp/lazyvim-lazygit" })
-
--- Load lazyvim
-require("config.lazy")

config/src/nvim/lazy-lock.json

@@ -1 +0,0 @@
-/tmp/lazyvim-nvim/lazy-lock.json

config/src/nvim/lazyvim.json

@@ -1 +0,0 @@
-/tmp/lazyvim-nvim/lazyvim.json

config/src/nvim/lua/config/autocmds.lua

@@ -1,3 +0,0 @@
--- Autocmds are automatically loaded on the VeryLazy event
--- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
--- Add any additional autocmds here

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

@@ -1,3 +0,0 @@
--- Keymaps are automatically loaded on the VeryLazy event
--- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
--- Add any additional keymaps here

config/src/nvim/lua/config/lazy.lua

@@ -1,60 +0,0 @@
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-  -- bootstrap lazy.nvim
-  -- stylua: ignore
-  vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable",
-    lazypath })
-end
-vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
-
-require("lazy").setup({
-  spec = {
-    -- add LazyVim and import its plugins
-    { "LazyVim/LazyVim", import = "lazyvim.plugins" },
-    -- Blink currently not supported by all extras 2024-11-19 11:08
-    -- { import = "lazyvim.plugins.extras.coding.blink" },
-    { import = "lazyvim.plugins.extras.editor.illuminate" },
-    { import = "lazyvim.plugins.extras.editor.outline" },
-    { import = "lazyvim.plugins.extras.editor.telescope" },
-    { import = "lazyvim.plugins.extras.formatting.prettier" },
-    { import = "lazyvim.plugins.extras.lang.ansible" },
-    { import = "lazyvim.plugins.extras.lang.docker" },
-    { import = "lazyvim.plugins.extras.lang.git" },
-    { import = "lazyvim.plugins.extras.lang.go" },
-    { import = "lazyvim.plugins.extras.lang.helm" },
-    { import = "lazyvim.plugins.extras.lang.java" },
-    { import = "lazyvim.plugins.extras.lang.json" },
-    { import = "lazyvim.plugins.extras.lang.markdown" },
-    { import = "lazyvim.plugins.extras.lang.nix" },
-    { import = "lazyvim.plugins.extras.lang.python" },
-    { import = "lazyvim.plugins.extras.lang.rust" },
-    { import = "lazyvim.plugins.extras.lang.scala" },
-    { import = "lazyvim.plugins.extras.lang.sql" },
-    { import = "lazyvim.plugins.extras.lang.terraform" },
-    { import = "lazyvim.plugins.extras.lang.toml" },
-    { import = "lazyvim.plugins.extras.lang.typescript" },
-    { import = "lazyvim.plugins.extras.lang.yaml" },
-    { import = "lazyvim.plugins.extras.ui.mini-animate" },
-    { import = "lazyvim.plugins.extras.ui.mini-indentscope" },
-    { import = "lazyvim.plugins.extras.ui.treesitter-context" },
-    { import = "plugins.catppuccin" },
-    { import = "plugins.lang.shell" },
-    { import = "plugins.misc.tmux-navigator" },
-  },
-  defaults = {
-    -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
-    -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
-    lazy = false,
-    -- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
-    -- have outdated releases, which may break your Neovim install.
-    version = nil, -- always use the latest git commit
-    -- version = "*", -- try installing the latest stable version for plugins that support semver
-  },
-  install = { colorscheme = { "catppuccin-macchiato" } },
-  checker = { enabled = true, frequency = 60 * 60 * 24 }, -- automatically check for plugin updates once per day
-  performance = {
-    cache = {
-      enabled = true,
-    },
-  },
-})

config/src/nvim/lua/config/options.lua

@@ -1,7 +0,0 @@
--- Options are automatically loaded before lazy.nvim startup
--- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
--- Add any additional options here
-vim.g.mapleader = ","
-
-vim.opt.number = true
-vim.opt.relativenumber = false

config/src/nvim/lua/plugins/catppuccin.lua

@@ -1,62 +0,0 @@
-return {
-  "catppuccin/nvim",
-  lazy = true,
-  name = "catppuccin",
-  opts = {
-    flavour = "macchiato",
-    transparent_background = false,
-    integrations = {
-      aerial = true,
-      alpha = true,
-      cmp = true,
-      dashboard = true,
-      flash = true,
-      grug_far = true,
-      gitsigns = true,
-      headlines = true,
-      illuminate = true,
-      indent_blankline = { enabled = true },
-      leap = true,
-      lsp_trouble = true,
-      mason = true,
-      markdown = true,
-      mini = true,
-      native_lsp = {
-        enabled = true,
-        underlines = {
-          errors = { "undercurl" },
-          hints = { "undercurl" },
-          warnings = { "undercurl" },
-          information = { "undercurl" },
-        },
-      },
-      navic = { enabled = true, custom_bg = "lualine" },
-      neotest = true,
-      neotree = true,
-      noice = true,
-      notify = true,
-      semantic_tokens = true,
-      telescope = true,
-      treesitter = true,
-      treesitter_context = true,
-      which_key = true,
-    },
-  },
-  specs = {
-    {
-      "akinsho/bufferline.nvim",
-      optional = true,
-      opts = function(_, opts)
-        if (vim.g.colors_name or ""):find("catppuccin") then
-          opts.highlights = require("catppuccin.groups.integrations.bufferline").get()
-        end
-      end,
-    },
-  },
-  {
-    "LazyVim/LazyVim",
-    opts = {
-      colorscheme = "catppuccin-macchiato",
-    },
-  },
-}

config/src/nvim/lua/plugins/lang/nix.lua

@@ -1,41 +0,0 @@
-return {
-  {
-    "stevearc/conform.nvim",
-    optional = true,
-    opts = {
-      formatters_by_ft = {
-        ["nix"] = { "alejandra" },
-      },
-    },
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        nixd = {},
-      },
-    },
-  },
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, {
-          "nix",
-        })
-      end
-    end,
-  },
-  {
-    "nvimtools/none-ls.nvim",
-    optional = true,
-    opts = function(_, opts)
-      local null_ls = require("null-ls")
-      opts.sources = vim.list_extend(opts.sources or {}, {
-        null_ls.builtins.code_actions.statix,
-        null_ls.builtins.diagnostics.statix,
-        null_ls.builtins.formatting.alejandra,
-      })
-    end,
-  },
-}

config/src/nvim/lua/plugins/lang/shell.lua

@@ -1,47 +0,0 @@
-return {
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, {
-        "shfmt",
-        "shellcheck",
-        "bash-language-server",
-      })
-    end,
-  },
-  {
-    "stevearc/conform.nvim",
-    event = { "BufWritePre" },
-    cmd = { "ConformInfo" },
-    opts = {
-      formatters_by_ft = {
-        ["sh"] = { "shfmt" },
-        ["command"] = { "shfmt" },
-      },
-      formatters = {
-        shfmt = {
-          prepend_args = { "-i", "2", "-ci" },
-        },
-      },
-    },
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        bashls = {},
-      },
-    },
-  },
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, {
-          "bash",
-        })
-      end
-    end,
-  },
-}

config/src/nvim/lua/plugins/misc/bigfile.lua

@@ -1,9 +0,0 @@
-return {
-  -- Disable certain features if file is big
-  {
-    "LunarVim/bigfile.nvim",
-    opts = {
-      filesize = 0.5,
-    },
-  },
-}

config/src/nvim/lua/plugins/misc/tmux-navigator.lua

@@ -1,17 +0,0 @@
-return {
-  "christoomey/vim-tmux-navigator",
-  cmd = {
-    "TmuxNavigateLeft",
-    "TmuxNavigateDown",
-    "TmuxNavigateUp",
-    "TmuxNavigateRight",
-    "TmuxNavigatePrevious",
-  },
-  keys = {
-    { "<c-h>", "<cmd><C-U>TmuxNavigateLeft<cr>" },
-    { "<c-j>", "<cmd><C-U>TmuxNavigateDown<cr>" },
-    { "<c-k>", "<cmd><C-U>TmuxNavigateUp<cr>" },
-    { "<c-l>", "<cmd><C-U>TmuxNavigateRight<cr>" },
-    { "<c-\\>", "<cmd><C-U>TmuxNavigatePrevious<cr>" },
-  },
-}

config/src/nvim/lua/plugins/telescope.lua

@@ -1,31 +0,0 @@
-return {
-  "nvim-telescope/telescope.nvim",
-  dependencies = {
-    "nvim-telescope/telescope-fzf-native.nvim",
-    build = "make",
-    config = function()
-      require("telescope").load_extension("fzf")
-    end,
-  },
-  opts = {
-    defaults = {
-      file_ignore_patterns = {
-        ".git/",
-        "^node_modules/",
-        ".cache",
-      },
-    },
-    pickers = {
-      live_grep = {
-        additional_args = { "-L" },
-      },
-      grep_string = {
-        additional_args = { "-L" },
-      },
-      find_files = {
-        hidden = true,
-        follow = true,
-      },
-    },
-  },
-}

config/src/nvim/lua/plugins/tokyonight.lua

@@ -1,10 +0,0 @@
-return {
-  "folke/tokyonight.nvim",
-  opts = {
-    transparent = true,
-    styles = {
-      sidebars = "transparent",
-      floats = "transparent",
-    },
-  },
-}

config/src/nvim/lua/plugins/ui/colorizer.lua

@@ -1,6 +0,0 @@
-return {
-  "chrisbra/Colorizer",
-  keys = {
-    { "<leader>uR", "<cmd>ColorToggle<cr>", desc = "Toggle Colorizer" },
-  },
-}

config/src/nvim/lua/plugins/undotree.lua

@@ -1,6 +0,0 @@
-return {
-  "mbbill/undotree",
-  keys = {
-    { "<leader>u", "<cmd> UndotreeToggle <CR>", desc = "Toggle undotree", mode = { "n" } },
-  },
-}

config/src/nvim/stylua.toml

@@ -1,3 +0,0 @@
-indent_type = "Spaces"
-indent_width = 2
-column_width = 120

flake.lock

@@ -1,50 +1,15 @@
 {
   "nodes": {
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732722421,
-        "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
-        "nixpkgs-lib": [
-          "neovim-nightly-overlay",
-          "nixpkgs"
-        ]
+        "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1730504689,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "lastModified": 1760948891,
+        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
         "type": "github"
       },
       "original": {
@@ -56,22 +21,22 @@
     "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": [
-          "neovim-nightly-overlay",
-          "hercules-ci-effects",
+          "nixvim",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1712014858,
-        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
+        "lastModified": 1759362264,
+        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
+        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
         "type": "github"
       },
       "original": {
-        "id": "flake-parts",
-        "type": "indirect"
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
       }
     },
     "flake-utils": {
@@ -92,139 +57,118 @@
         "type": "github"
       }
     },
-    "git-hooks": {
+    "ixx": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "neovim-nightly-overlay",
-          "nixpkgs"
+        "flake-utils": [
+          "nixvim",
+          "nuschtosSearch",
+          "flake-utils"
         ],
-        "nixpkgs-stable": [
-          "neovim-nightly-overlay",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1732021966,
-        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
         "nixpkgs": [
-          "neovim-nightly-overlay",
-          "git-hooks",
+          "nixvim",
+          "nuschtosSearch",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "lastModified": 1754860581,
+        "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
+        "owner": "NuschtOS",
+        "repo": "ixx",
+        "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
         "type": "github"
       },
       "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "hercules-ci-effects": {
-      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": [
-          "neovim-nightly-overlay",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1730903510,
-        "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=",
-        "owner": "hercules-ci",
-        "repo": "hercules-ci-effects",
-        "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "hercules-ci-effects",
-        "type": "github"
-      }
-    },
-    "neovim-nightly-overlay": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
-        "git-hooks": "git-hooks",
-        "hercules-ci-effects": "hercules-ci-effects",
-        "neovim-src": "neovim-src",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733098025,
-        "narHash": "sha256-HOzahkMv67wtSYcudRpGqNXjFwFoc2lwq0+Ev6h8T3k=",
-        "owner": "nix-community",
-        "repo": "neovim-nightly-overlay",
-        "rev": "73ec92a4c2773ead4af1c657ea81142d4a27fe78",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "neovim-nightly-overlay",
-        "type": "github"
-      }
-    },
-    "neovim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733090308,
-        "narHash": "sha256-oIbVYa5y0lgXDRaZUn0MdAKC2Vf9OakbtIFmbhL8K1k=",
-        "owner": "neovim",
-        "repo": "neovim",
-        "rev": "feb62d5429680278c1353c565db6bb3ecb3b7c24",
-        "type": "github"
-      },
-      "original": {
-        "owner": "neovim",
-        "repo": "neovim",
+        "owner": "NuschtOS",
+        "ref": "v0.1.1",
+        "repo": "ixx",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732981179,
-        "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
+        "lastModified": 1761016216,
+        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
+        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1754788789,
+        "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixvim": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nuschtosSearch": "nuschtosSearch",
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1760795571,
+        "narHash": "sha256-gi+tWWAknKuTNso3yMeKsT9nj0jx+tuYF7g7nmLUWT8=",
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "rev": "6c945865ba5de87fa2d0dd8a0e66ca572ddf9043",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "nixos-25.05",
+        "repo": "nixvim",
+        "type": "github"
+      }
+    },
+    "nuschtosSearch": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "ixx": "ixx",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1760652422,
+        "narHash": "sha256-C88Pgz38QIl9JxQceexqL2G7sw9vodHWx1Uaq+NRJrw=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "3ebeebe8b6a49dfb11f771f761e0310f7c48d726",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "repo": "search",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
-        "neovim-nightly-overlay": "neovim-nightly-overlay",
-        "nixpkgs": "nixpkgs"
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs",
+        "nixvim": "nixvim",
+        "systems": "systems_3"
       }
     },
     "systems": {
@@ -241,6 +185,36 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -1,59 +1,55 @@
 {
-  description = "NVIM Configuration";
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
-    flake-utils.url = "github:numtide/flake-utils";
-    neovim-nightly-overlay = {
-      url = "github:nix-community/neovim-nightly-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
+  description = "Neovim configuration, declaratively written using nix";
 
-  nixConfig = {
-    trusted-substituters = [
-      "https://nix-community.cachix.org"
-      "https://palkx.cachix.org"
-    ];
-    extra-trusted-public-keys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "palkx.cachix.org-1:qaQoL5CXpGzUbqsIvxUEL7wUhoIrjV0Q8M4HbJ8/8S4="
-    ];
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+
+    nixvim.url = "github:nix-community/nixvim/nixos-25.05";
+    nixvim.inputs.nixpkgs.follows = "nixpkgs";
+
+    flake-parts.url = "github:hercules-ci/flake-parts";
+
+    systems.url = "github:nix-systems/default";
   };
 
   outputs =
-    inputs@{
-      nixpkgs,
-      flake-utils,
-      neovim-nightly-overlay,
+    {
+      nixvim,
+      flake-parts,
       ...
-    }:
-    flake-utils.lib.eachDefaultSystem (
-      system:
-      let
-        overlayFlakeInputs = prev: final: {
-          neovim = neovim-nightly-overlay.packages.${system}.default.overrideAttrs (oa: {
-            nativeBuildInputs = oa.nativeBuildInputs ++ [ final.libtermkey ];
-          });
-        };
+    }@inputs:
+    flake-parts.lib.mkFlake { inherit inputs; } {
+      systems = import inputs.systems;
 
-        overlayLazyVim = prev: final: { lazyVim = import ./packages/lazyVim.nix { pkgs = final; }; };
+      perSystem =
+        {
+          pkgs,
+          system,
+          ...
+        }:
+        let
+          nixvimLib = nixvim.lib.${system};
+          nixvimPkgs = nixvim.legacyPackages.${system};
+          nixvimModule = {
+            inherit pkgs;
+            module = import ./config; # import the module directly
+            # You can use `extraSpecialArgs` to pass additional arguments to your module files
+            extraSpecialArgs = {
+              # inherit (inputs) foo;
+            };
+          };
+          nvim = nixvimPkgs.makeNixvimWithModule nixvimModule;
+        in
+        {
+          checks = {
+            # Run `nix flake check .` to verify that your config is not broken
+            default = nixvimLib.check.mkTestDerivationFromNixvimModule nixvimModule;
+          };
 
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [
-            overlayFlakeInputs
-            overlayLazyVim
-          ];
+          packages = {
+            # Lets you run `nix run .` to start nixvim
+            default = nvim;
+          };
         };
-      in
-      rec {
-        packages.lazyVim = pkgs.lazyVim;
-        apps.lazyVim = {
-          type = "app";
-          program = "${packages.default}/bin/nvim";
-        };
-        packages.default = packages.lazyVim;
-        apps.default = apps.lazyVim;
-      }
-    );
+    };
 }

packages/lazyVim.nix

@@ -1,13 +0,0 @@
-{ pkgs }:
-let
-  config = import ../config { inherit pkgs; };
-  runtimeDeps = import ../runtimeDeps.nix { inherit pkgs; };
-in
-pkgs.wrapNeovim pkgs.neovim {
-  viAlias = true;
-  vimAlias = true;
-  withNodeJs = true;
-  withPython3 = true;
-  withRuby = false;
-  extraMakeWrapperArgs = ''--prefix PATH : "${pkgs.lib.makeBinPath runtimeDeps.dependencies}" --set XDG_CONFIG_HOME "${config}"'';
-}

renovate.json5

@@ -1,7 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["local>local/renovate"],
-  "nix": {
-    "enabled": true
-  }
-}

runtimeDeps.nix

@@ -1,34 +0,0 @@
-{ pkgs }:
-{
-  dependencies =
-    with pkgs;
-    [
-      nixfmt-rfc-style # nix formatter
-      (terraform.overrideAttrs (oldAttrs: {
-        meta.license = lib.licenses.mpl20;
-      })) # terraform fmt
-      ripgrep
-      fd
-      git
-      curl # needed to fetch titles from urls
-      wget
-      cargo
-      php82
-      php82Packages.composer
-      go
-      ruby
-      luarocks
-      zulu # java11
-      fish
-      fzf
-      perl540
-      perl540Packages.CPAN
-      unzip
-      tree-sitter
-      gnumake
-      lazygit
-      python312
-      python312Packages.pip
-    ]
-    ++ (if pkgs.stdenv.hostPlatform.isDarwin then [ ] else [ gcc ]);
-}