plumjam/nixos - Change 526CRD2QD6NF6N6PQUNWZT6UUGNLMC25UYNIO7ZFUCPQCUALYN4QC

move most of neovim to nvf

Created by James Plummer on July 30, 2025

526CRD2QD6NF6N6PQUNWZT6UUGNLMC25UYNIO7ZFUCPQCUALYN4QC

Dependencies

In channels

main

Change contents

Replacement in home/modules/programs/zellij.nix at line 19 [6.18874]
B:BD[2.967] → [2.967:994]
```
      theme = light_theme;
```
[2.967]
[2.994]
```
      theme = dark_theme;
```

Replacement in home/modules/programs/nvf/themes.nix at line 2 [7.34]

B:BD[7.37] → [7.37:170]

  # programs.nvf.settings.vim = {
  #   theme = {
  #     enable = false;
  #     name = "gruvbox";
  #     style = "dark";
  #   };

[7.37]

[7.170]

  programs.nvf.settings.vim = {
    theme = {
      enable = true;
      name = "gruvbox";
      style = "dark";
    };

Replacement in home/modules/programs/nvf/themes.nix at line 9 [7.34]

B:BD[7.171] → [7.171:307]

  # colorscheme settings can be configured here
  # luaConfigRC.theme = /* lua */ ''
  #   -- custom theme configuration
  # '';
  # };

[7.171]

[7.307]

    luaConfigRC.theme = # lua
      ''
        -- custom theme configuration
      '';
  };

Deletion in home/modules/programs/nvf/themes.nix at line 15 [7.34]
B:BD[7.309] → [7.309:310]
Insertion in home/modules/programs/nvf/plugins.nix at line 1 [7.347]
[7.347]
[7.348]
```
{ pkgs, ... }:
```

Replacement in home/modules/programs/nvf/plugins.nix at line 3 [7.347]

B:BD[7.350] → [7.350:574]

  # programs.nvf.settings.vim = {
  # lsp configuration
  # lsp = {
  # enable = false; # disabled initially
  # servers you want to enable can be configured here
  # rust.enable = true;
  # typescript.enable = true;
  # };

[7.350]

[7.574]

  programs.nvf.settings.vim = {
    assistant = {
      supermaven-nvim = {
        enable = true;
      };
    };
    lsp = {
      trouble = {
        enable = true;
        mappings = {
          quickfix = "<leader>tq";
          documentDiagnostics = "<leader>tr";
          workspaceDiagnostics = "<leader>te";
        };
        setupOpts = {
          auto_close = true;
          modes = {
            diagnostics = {
              win = {
                size = 0.3;
              };
            };
          };
        };
      };
    };
    # treesitter
    treesitter = {
      enable = true;
      grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
        javascript
        typescript
        svelte
        markdown
        css
        html
        lua
        vim
        json
        yaml
        vimdoc
        go
        http
        rust
      ];
      fold = true;
      indent.enable = true;
      highlight.enable = true;
      textobjects.enable = true;
      # autoTagHtml = true;
      context = {
        enable = true;
        setupOpts = {
          max_lines = 3;
          separator = "-";
        };
      };
    };
    languages = {
      rust = {
        crates.enable = true;
        dap.enable = true;
      };
      markdown.extensions.render-markdown-nvim = {
        enable = true;
        setupOpts = {
          completions = {
            blink = {
              enabled = true;
            };
          };
          file_types = [ "markdown" ];
        };
      };
    };
    autopairs = {
      nvim-autopairs = {
        enable = true;
        setupOpts = {
          disable_filetype = [ "typr" ];
        };
      };
    };
    autocomplete = {
      blink-cmp = {
        enable = true;
        setupOpts = {
          keymap = {
            preset = "enter";
          };
          completion = {
            documentation = {
              auto_show = true;
              auto_show_delay_ms = 250;
            };
            # menu = {
            # draw = {
            # columns = {
            # { "kind" };
            # { "label", gap = 1 };
            # };
            # };
            # };
          };
          cmdline = {
            enabled = false;
          };
          signature = {
            enabled = true;
          };
          sources = {
            default = [
              "lsp"
              "path"
              "snippets"
              "buffer"
            ];
            providers = {
              buffer = {
                opts = {
                  # get_bufnrs = function()
                  # 	return vim.tbl_filter(function(bufnr)
                  # 		return vim.bo[bufnr].buftype == ""
                  # 	end, vim.api.nvim_list_bufs())
                  # end,
                };
              };
            };
          };
        };
      };
    };
    mini = {
      ai.enable = true;
      diff = {
        enable = true;
        setupOpts = {
          view = {
            style = "number";
          };
          mappings = {
            apply = "";
            reset = "";
            textobject = "";
            goto_first = "";
            goto_prev = "";
            goto_next = "";
            goto_last = "";
          };
        };
      };
      surround.enable = true;
      bufremove.enable = true;
    };
    git = {
      neogit = {
        enable = true;
        mappings.open = "<leader>g";
        setupOpts = {
          integrations = {
            telescope = true;
            diffview = true;
          };
          commit_editor = {
            staged_diff_split_kind = "vsplit";
          };
          commit_select_view = {
            kind = "vsplit";
          };
        };
      };
    };
    navigation = {
      harpoon = {
        enable = false;
        mappings = {
          file1 = "<leader>h";
          file2 = "<leader>j";
          file3 = "<leader>k";
          file4 = "<leader>l";
        };
        setupOpts = {
          defaults = {
            save_on_toggle = true;
            save_on_ui_close = true;
          };
        };
      };
    };
    utility = {
      ccc.enable = true;
      diffview-nvim.enable = true; # for neogit
      undotree.enable = true;
      nvim-biscuits = {
        enable = true;
        setupOpts = {
          cursor_line_only = true;
          prefix_string = " ";
          toggle_keybind = "<leader>bi";
          show_on_start = false;
        };
      };
    };
    visuals = {
      nvim-web-devicons.enable = true;
      fidget-nvim = {
        enable = true;
        setupOpts = {
          progress = {
            display = {
              done_ttl = 10;
            };
          };
          notification = {
            override_vim_notify = true;
            window = {
              winblend = 0;
              zindex = 1000;
              max_width = 60;
            };
          };
        };
      };
    };
    telescope = {
      enable = true;
      setupOpts = {
        defaults = {
          color_devicons = true;
          layout_config = {
            horizontal = {
              prompt_position = "top";
              preview_width = 0.6;
            };
          };
          path_display = [ "truncate" ];
          sorting_strategy = "ascending";
          dynamic_preview_title = true;
        };
        extensions = {
          workspaces = { };
        };
      };
      mappings = {
        findFiles = "<leader>ff";
        liveGrep = "<leader>fg";
        buffers = "<leader>fb";
      };
    };
    notes = {
      todo-comments = {
        enable = true;
        setupOpts = {
          signs = false;
          highlight = {
            before = "";
            keyword = "wide";
            after = "";
          };
        };
        mappings = {
          telescope = "<leader>td";
        };
      };
    };
    formatter.conform-nvim = {
      enable = true;
      setupOpts = {
        formatters_by_ft = {
          astro = [
            "prettierd"
            "prettier"
          ];
          go = [
            "gofumpt"
            "goimports"
          ];
          javascript = [
            "prettierd"
            "prettier"
          ];
          javascriptreact = [
            "prettierd"
            "prettier"
          ];
          typescript = [
            "prettierd"
            "prettier"
          ];
          typescriptreact = [
            "prettierd"
            "prettier"
          ];
          json = [
            "prettierd"
            "prettier"
          ];
          svelte = [
            "prettierd"
            "prettier"
          ];
          vue = [
            "prettierd"
            "prettier"
          ];
          yaml = [
            "prettierd"
            "prettier"
          ];
          md = [ "dprint" ];
          toml = [ "dprint" ];
          lua = [ "stylua" ];
          sql = [ "sql_formatter" ];
          python = [ "ruff_format" ];
          rust = [ "rustfmt" ];
          # nu = [ "nufmt" ];
          nix = [ "nixfmt" ];
        };
        format_after_save = {
          async = true;
          # lsp_format = "fallback"
        };
      };
    };
    # git integration
    # git = {
    # enable = false; # disabled initially
    # gitsigns.enable = true;
    # };
    # statusline
    # statusline = {
    # enable = false; # disabled initially
    # lualine.enable = true;
    # };
    lazy.plugins = {
      "SchemaStore.nvim" = {
        package = pkgs.vimPlugins.SchemaStore-nvim;
      };
      "dirbuf.nvim" = {
        package = pkgs.vimPlugins.dirbuf-nvim;
        cmd = "Dirbuf";
        setupModule = "dirbuf";
        setupOpts = {
          sort_order = "directories_first";
          write_cmd = "DirbufSync -confirm";
          show_hidden = true;
        };
        keys = [
          {
            mode = "n";
            key = "-";
            action = ":Dirbuf<CR>";
            desc = "Open dirbuf";
          }
          {
            mode = "n";
            key = "<C-s>";
            action = ":lua ToggleDirbuf()<CR>";
            desc = "Open dirbuf";
          }
        ];
      };
      "no-neck-pain.nvim" = {
        # doesnt load on startup idk why
        package = pkgs.vimPlugins.no-neck-pain-nvim;
        lazy = false;
        priority = 1001;
        setupOpts = {
          width = 110;
          autocmds = {
            enableOnVimEnter = true;
            skipEnteringNoNeckPainBuffer = true;
          };
          buffers = {
            wo = {
              fillchars = "eob: ";
            };
          };
        };
      };
      "vimplugin-pomo.nvim" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "pomo.nvim";
          src = pkgs.fetchFromGitHub {
            owner = "epwalsh";
            repo = "pomo.nvim";
            rev = "aa8decc421d89be0f10b1fc6a602cdd269f350ff";
            sha256 = "sha256-tJ2TrypKnCnQm+6FDjX0KDr+UNoBBVvGIm+uWJtpNLc=";
          };
        };
        cmd = [
          "TimerStart"
          "TimerRepeat"
          "TimerSession"
        ];
        setupModule = "pomo";
        setupOpts = {
          update_interval = 500;
          sessions = {
            pomodoro = [
              {
                name = "Work";
                duration = "25m";
              }
              {
                name = "Break";
                duration = "5m";
              }
              {
                name = "Work";
                duration = "25m";
              }
              {
                name = "Break";
                duration = "5m";
              }
              {
                name = "Work";
                duration = "25m";
              }
              {
                name = "Break";
                duration = "15m";
              }
            ];
          };
          notifiers = [
            {
              name = "Default";
              opts = {
                sticky = false;
              };
            }
          ];
        };
      };
      "vimplugin-scrolleof.nvim" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "scrolleof.nvim";
          src = pkgs.fetchFromGitHub {
            owner = "Aasim-A";
            repo = "scrollEOF.nvim";
            rev = "master";
            sha256 = "sha256-hHoS5WgIsbuVEOUbUBpDRxIwdNoR/cAfD+hlBWzaxug=";
          };
        };
        event = [ "WinScrolled" ];
        setupModule = "scrollEOF";
        setupOpts = { };
      };
      "vimplugin-tiny-inline-diagnostic.nvim" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "tiny-inline-diagnostic.nvim";
          src = pkgs.fetchFromGitHub {
            owner = "rachartier";
            repo = "tiny-inline-diagnostic.nvim";
            rev = "7dcf8542059fb15c978de845fc8665428ae13a04";
            sha256 = "sha256-BGmGYYNweelepgFQ58X2PhafAHNyb0N+nNqncHU0Kbc=";
          };
        };
        event = [ "BufReadPost" ];
        setupModule = "tiny-inline-diagnostic";
        setupOpts = {
          preset = "minimal";
          transparent_bg = true;
          transparent_cursorline = false;
          signs = {
            arrow = "";
            up_arrow = "";
          };
          options = {
            show_source = {
              enabled = true;
            };
            multilines = {
              enabled = true;
              always_show = true;
            };
            throttle = 100;
          };
        };
      };

Replacement in home/modules/programs/nvf/plugins.nix at line 510 [7.347]

B:BD[7.575] → [7.575:709]

  # treesitter
  # treesitter = {
  # enable = false; # disabled initially
  # grammars = [ "rust" "typescript" "lua" "nix" ];
  # };

[7.575]

[7.709]

      "vimplugin-package-info.nvim" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "package-info.nvim";
          src = pkgs.fetchFromGitHub {
            owner = "vuki656";
            repo = "package-info.nvim";
            rev = "4f1b8287dde221153ec9f2acd46e8237d2d0881e";
            sha256 = "sha256-vrRcWSPfWTDs0r7LvqJVMIPFSZTlLJQG1/dU5or6xLs=";
          };
          doCheck = false;
        };
        event = [ "BufRead package.json" ];
        setupModule = "package-info";
        setupOpts = {
          autostart = true;
          hide_unstable_versions = true;
          notifications = false;
          icons = {
            enable = true;
            style = {
              up_to_date = "   ";
              outdated = "   ";
              invalid = "   ";
            };
          };
        };
        after = ''
          vim.api.nvim_set_hl(0, "PackageInfoUpToDateVersion", { fg = "#3c4048" })
          vim.api.nvim_set_hl(0, "PackageInfoOutdatedVersion", { fg = "#d19a66" })
          vim.api.nvim_set_hl(0, "PackageInfoInvalidVersion", { fg = "#ee4b2b" })
          vim.cmd("lua require('package-info').show({ force = true })")
        '';
      };
      "nui.nvim" = {
        package = pkgs.vimPlugins.nui-nvim;
        lazy = true;
      };

Replacement in home/modules/programs/nvf/plugins.nix at line 549 [7.347]

B:BD[7.710] → [7.710:819]

  # autocomplete
  # autocomplete = {
  # enable = false; # disabled initially
  # type = "nvim-cmp";
  # };

[7.710]

[7.819]

      "vimplugin-ts-context-commentstring.nvim" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "ts-context-commentstring.nvim";
          src = pkgs.fetchFromGitHub {
            owner = "JoosepAlviste";
            repo = "nvim-ts-context-commentstring";
            rev = "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f";
            sha256 = "sha256-AjDM3+n4+lNBQi8P2Yrh0Ab06uYCndBQT9TX36rDbOM=";
          };
        };
        event = [ "BufRead" ];
        setupModule = "ts_context_commentstring";
        setupOpts = { };
      };
      "vimplugin-vimwiki" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "vimwiki";
          src = pkgs.fetchFromGitHub {
            owner = "vimwiki";
            repo = "vimwiki";
            rev = "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8";
            sha256 = "sha256-O85nZUWxIKm0gFILAkWH9WqfVcEbnbxR56grqMmum3A=";
          };
        };
        keys = [
          {
            mode = "n";
            key = "<leader>ww";
            action = "<Plug>VimwikiIndex";
            desc = "Open vimwiki index";
          }
          {
            mode = "n";
            key = "<leader>wi";
            action = "<Plug>VimwikiDiaryIndex";
            desc = "Open vimwiki diary";
          }
        ];
        beforeAll = ''
          vim.g.vimwiki_option_diary_path = "./diary/"
          vim.g.vimwiki_global_ext = 0
          vim.g.vimwiki_option_nested_syntaxes = { svelte = "svelte", typescript = "ts" }
          vim.g.vimwiki_list = {
            { path = "~/vimwiki/james/", syntax = "markdown", ext = ".md" },
            { path = "~/vimwiki/healgorithms/", syntax = "markdown", ext = ".md" }
          }
        '';
      };

Replacement in home/modules/programs/nvf/plugins.nix at line 599 [7.347]

B:BD[7.820] → [7.820:900]

  # telescope
  # telescope = {
  # enable = false; # disabled initially
  # };

[7.820]

[7.900]

      "vimplugin-workspaces.nvim" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "workspaces.nvim";
          src = pkgs.fetchFromGitHub {
            owner = "natecraddock";
            repo = "workspaces.nvim";
            rev = "55a1eb6f5b72e07ee8333898254e113e927180ca";
            sha256 = "sha256-a3f0NUYooMxrZEqLer+Duv6/ktq5MH2qUoFHD8z7fZA=";
          };
        };
        cmd = [ "Telescope workspaces" ];
        setupModule = "workspaces";
        setupOpts = {
          auto_open = true;
        };
        keys = [
          {
            mode = "n";
            key = "<leader>fp";
            action = ":Telescope workspaces<CR>";
            desc = "Open workspaces";
          }
        ];
        after = ''
          require("telescope").load_extension("workspaces")
        '';
      };

Replacement in home/modules/programs/nvf/plugins.nix at line 627 [7.347]

B:BD[7.901] → [7.901:1009]

  # git integration
  # git = {
  # enable = false; # disabled initially
  # gitsigns.enable = true;
  # };

[7.901]

[7.1009]

      "vimplugin-zen-mode.nvim" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "zen-mode.nvim";
          src = pkgs.fetchFromGitHub {
            owner = "folke";
            repo = "zen-mode.nvim";
            rev = "main";
            sha256 = "sha256-TofQ1o5+LH3/1aoLr90oLbBaXFFtu62SXifH5oyj2/k=";
          };
        };
        cmd = [ "ZenMode" ];
        setupModule = "zen-mode";
        setupOpts = {
          window = {
            backdrop = 0.95;
            width = 80;
            height = 1;
            options = {
              signcolumn = "no";
              number = false;
              relativenumber = false;
              cursorline = false;
              cursorcolumn = false;
              foldcolumn = "0";
              list = false;
            };
          };
          plugins = {
            options = {
              enabled = true;
              ruler = false;
              showcmd = true;
              laststatus = 0;
            };
            twilight = {
              enabled = true;
            };
            gitsigns = {
              enabled = false;
            };
          };
          on_open = "function() vim.opt.colorcolumn = '' end";
        };
      };

Replacement in home/modules/programs/nvf/plugins.nix at line 672 [7.347]

B:BD[7.1010] → [7.1010:1119]

  # statusline
  # statusline = {
  # enable = false; # disabled initially
  # lualine.enable = true;
  # };

[7.1010]

[7.1119]

      "vimplugin-twilight.nvim" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "twilight.nvim";
          src = pkgs.fetchFromGitHub {
            owner = "folke";
            repo = "twilight.nvim";
            rev = "main";
            sha256 = "sha256-sC9DSgkQw+jHvi+xUP+iWSSLV0kIWWmrom2Mq5q+RJo=";
          };
        };
        cmd = [ "Twilight" ];
        setupModule = "twilight";
        setupOpts = {
          dimming = {
            alpha = 0.4;
          };
        };
      };

Replacement in home/modules/programs/nvf/plugins.nix at line 691 [7.347]

B:BD[7.1120] → [7.1120:1258]

  # additional plugin configuration via lua
  # luaConfigRC.plugins = /* lua */ ''
  #   -- custom plugin configurations
  # '';
  # };
}

[7.1120]

[7.1258]

      "vimplugin-typr" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "typr";
          src = pkgs.fetchFromGitHub {
            owner = "nvzone";
            repo = "typr";
            rev = "main";
            sha256 = "sha256-ULjrPOYaWCk8G5B37p+aYD0jI2vngc0LxQIxQduaEWo=";
          };
          doCheck = false;
        };
        cmd = [
          "Typr"
          "TyprStats"
        ];
        setupModule = "typr";
        setupOpts = {
          on_attach = "function() vim.opt_local.wrap = false; vim.opt_local.complete = '' end";
        };
      };
      "vimplugin-screenkey.nvim" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "screenkey.nvim";
          src = pkgs.fetchFromGitHub {
            owner = "NStefan002";
            repo = "screenkey.nvim";
            rev = "main";
            sha256 = "sha256-94bafW0DP4Q9jfE4voiEvUy13JVTs6UP5qgLG2SbeZk=";
          };
        };
        cmd = [ "Screenkey" ];
        setupModule = "screenkey";
        setupOpts = {
          win_opts = {
            row = "vim.o.lines - 3";
            col = "vim.o.columns - 25";
            relative = "editor";
            anchor = "SE";
            width = 25;
            height = 1;
            border = "single";
            title = "Key";
            title_pos = "center";
            style = "minimal";
            focusable = false;
            noautocmd = true;
          };
          compress_after = 3;
          clear_after = 5;
          disable = {
            filetypes = [ ];
            buftypes = [ ];
          };
          show_leader = true;
          group_mappings = true;
          display_infront = [ ];
          display_behind = [ ];
          filter = "function(keys) return keys end";
          keys = {
            "<TAB>" = "󰌒";
            "<CR>" = "󰌑";
            "<ESC>" = "Esc";
            "<SPACE>" = "󱁐";
            "<BS>" = "󰁮";
            "<DEL>" = "󰁮";
            "<LEFT>" = "";
            "<RIGHT>" = "";
            "<UP>" = "";
            "<DOWN>" = "";
            "<HOME>" = "Home";
            "<END>" = "End";
            "<PAGEUP>" = "PgUp";
            "<PAGEDOWN>" = "PgDn";
            "<INSERT>" = "Ins";
            "<F1>" = "󱊫";
            "<F2>" = "󱊬";
            "<F3>" = "󱊭";
            "<F4>" = "󱊮";
            "<F5>" = "󱊯";
            "<F6>" = "󱊰";
            "<F7>" = "󱊱";
            "<F8>" = "󱊲";
            "<F9>" = "󱊳";
            "<F10>" = "󱊴";
            "<F11>" = "󱊵";
            "<F12>" = "󱊶";
          };
        };
        after = ''
          vim.cmd("Screenkey")
        '';
      };

Insertion in home/modules/programs/nvf/plugins.nix at line 785 [7.347]

[7.1259]

      "vimplugin-quicksnip.vim" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "quicksnip.vim";
          src = pkgs.fetchFromGitHub {
            owner = "jamesukiyo";
            repo = "quicksnip.vim";
            rev = "5b9ccd6937f1172817c5e3054ec58d7f5281b94d";
            sha256 = "sha256-QMLEqx6PH4m0c0eYhLspjGin+UrdgwcV7a/MzfRPMtM=";
          };
        };
        cmd = [
          "SnipCurrent"
          "SnipPick"
        ];
        keys = [
          {
            mode = "n";
            key = "<leader>sp";
            action = ":SnipPick<CR>";
            desc = "Pick snippet";
          }
          {
            mode = "n";
            key = "<leader>sc";
            action = ":SnipCurrent<CR>";
            desc = "Current snippet";
          }
        ];
        beforeAll = ''
          vim.g.miniSnip_dirs = { "~/.vim/snippets" }
          vim.g.miniSnip_trigger = "<C-c>"
          vim.g.miniSnip_extends = {
            html = { "html", "javascript" },
            svelte = { "html", "javascript" },
            javascript = { "html" },
            typescript = { "html", "javascript" }
          }
        '';
      };
      "vimplugin-minisnip" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "minisnip";
          src = pkgs.fetchFromGitHub {
            owner = "Jorenar";
            repo = "miniSnip";
            rev = "79d863e1f8d5313ea36d045c3c067a55f3814ecd";
            sha256 = "sha256-OkF1COC3FykTYd3P/WpRAS0n0nxAPPazOytr698+6TI=";
          };
        };
        event = [ "InsertEnter" ];
      };
      "vimplugin-ferris.nvim" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "ferris.nvim";
          src = pkgs.fetchFromGitHub {
            owner = "vxpm";
            repo = "ferris.nvim";
            rev = "main";
            sha256 = "sha256-spi5Fk7HghMyhi+TqcgxRj9ME6HyJnVGyFkP+mPM010=";
          };
        };
        ft = [ "rust" ];
        setupModule = "ferris";
        setupOpts = {
          create_commands = true;
          url_handler = "start";
        };
      };
      "vimplugin-darklight.nvim" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "darklight.nvim";
          src = pkgs.fetchFromGitHub {
            owner = "eliseshaffer";
            repo = "darklight.nvim";
            rev = "main";
            sha256 = "sha256-/MdGhcZ0kQsAzDl02lJK4zMf/5fC5Md0iuvWrz0ZR6Q=";
          };
        };
        lazy = false;
        priority = 1000;
        setupModule = "darklight";
        setupOpts = {
          mode = "custom";
          light = "function() ColorMyPencils('light') end";
          dark = "function() ColorMyPencils('dark') end";
        };
      };
      "vimplugin-compile-mode.nvim" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "compile-mode.nvim";
          src = pkgs.fetchFromGitHub {
            owner = "ej-shafran";
            repo = "compile-mode.nvim";
            rev = "main";
            sha256 = "sha256-T2l/lEOiO+X5TfAT1mcsyg307nktT+YxxlpbCloNLp4=";
          };
          doCheck = false;
        };
        cmd = [ "Compile" ];
        keys = [
          {
            mode = "n";
            key = "<leader>co";
            action = ":vert Compile<cr>";
            desc = "Compile";
          }
          {
            mode = "n";
            key = "<leader>cr";
            action = ":vert Recompile<cr>";
            desc = "Recompile";
          }
        ];
        beforeAll = ''
          vim.g.compile_mode = {
            baleia_setup = true,
            default_command = "",
            recompile_no_fail = true
          }
        '';
      };
      "plenary.nvim" = {
        package = pkgs.vimPlugins.plenary-nvim;
        lazy = true;
      };
      "vimplugin-baleia.nvim" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "baleia.nvim";
          src = pkgs.fetchFromGitHub {
            owner = "m00qek";
            repo = "baleia.nvim";
            rev = "v1.3.0";
            sha256 = "sha256-8wG9Oh5Ff7XXOjZ3rPvThCF5QYOyCXxiIcJjgT89RDU=";
          };
        };
        lazy = true;
      };
      "vimplugin-volt" = {
        package = pkgs.vimUtils.buildVimPlugin {
          name = "volt";
          src = pkgs.fetchFromGitHub {
            owner = "nvzone";
            repo = "volt";
            rev = "main";
            sha256 = "sha256-szq/QBI2Y6DKeqBuJ8qA4LlGYnarLT6D/fvwepIgSVc=";
          };
        };
        lazy = true;
      };
    };
  };
}

Replacement in home/modules/programs/nvf/options.nix at line 11 [7.1297]

B:BD[5.189] → [5.189:219]

        name = "globals.lua";

[5.189]

[5.219]

      })
      (builtins.path {
        path = ./helpers.lua;
      })
      (builtins.path {
        path = ./lsp.lua;
      })
      (builtins.path {
        path = ./lsp/bacon_ls.lua;
      })
      (builtins.path {
        path = ./lsp/json_ls.lua;

Insertion in home/modules/programs/nvf/options.nix at line 25 [7.1297]
[5.235]
[5.235]
Insertion in home/modules/programs/nvf/options.nix at line 30 [7.1297]
[5.314]
[5.314]
Deletion in home/modules/programs/nvf/options.nix at line 39 [7.1297]
B:BD[5.480] → [5.480:481]

File addition: lsp.nix (----------)

[7.17]

{
  programs.nvf.settings.vim = {
    languages = {
      enableTreesitter = true;
      html = {
        enable = true;
        # treesitter.autoTagHtml = true;
      };
      # commented ones don't have builtins
      astro.enable = true;
      # bacon-ls.enable = true;
      go.enable = true;
      # json.enable = true;
      lua.enable = true;
      nix.enable = true;
      nu.enable = true;
      rust.enable = true;
      svelte.enable = true;
      tailwind.enable = true;
      ts.enable = true;
      yaml.enable = true;
    };
  };
}

File addition: lsp.lua (----------)

[7.17]

local lsp = vim.lsp
lsp.set_log_level("off")
local c = vim.tbl_deep_extend(
	"force",
	{},
	vim.lsp.protocol.make_client_capabilities(),
	require("blink.cmp").get_lsp_capabilities()
)
lsp.config["*"] = {
	capabilities = c,
	root_markers = { ".git" },
}
lsp.enable({
	"astro",
	-- "bacon-ls",
	"gopls",
	"json_ls",
	"lua_ls",
	"nixd",
	"nushell",
	"rust_analyzer",
	"svelteserver",
	"tailwindcss",
	"ts_ls",
	"yamlls",
})
local orig_util_open_floating_preview = lsp.util.open_floating_preview
function lsp.util.open_floating_preview(contents, syntax, opts, ...)
	opts = opts or {}
	opts.border = opts.border or "single"
	opts.max_width = opts.max_width or 60
	opts.focusable = opts.focusable or false
	return orig_util_open_floating_preview(contents, syntax, opts, ...)
end
-- trying tiny-inline-diagnostic.nvim for a while
-- AUTOCMD("CursorHold", {
-- 	callback = function()
-- 		vim.diagnostic.open_float()
-- 	end,
-- })
local function reload_lsp()
	CMD("lua vim.lsp.stop_client(vim.lsp.get_clients())")
	local function check_and_reload()
		if not lsp.buf_is_attached(0) then
			CMD.edit()
		else
			vim.defer_fn(check_and_reload, 50)
		end
	end
	vim.defer_fn(check_and_reload, 50)
end
CREATE_CMD("LspReload", reload_lsp, { desc = "Reload attached LSP" })
AUTOCMD("LspAttach", {
	callback = function(args)
		vim.diagnostic.config({
			update_in_insert = false,
			virtual_text = false,
			float = {
				focusable = false,
				border = "rounded",
				source = "always",
				header = "",
				prefix = "",
			},
		})
		local client = lsp.get_client_by_id(args.data.client_id)
		MAP("n", "<leader>ih", function()
			if vim.lsp.inlay_hint.is_enabled() then
				vim.lsp.inlay_hint.enable(false)
			else
				vim.lsp.inlay_hint.enable(true)
			end
		end)
		if client:supports_method("textDocument/foldingRange") then
			vim.wo.foldmethod = "expr"
			vim.wo.foldexpr = "v:lua.vim.lsp.foldexpr()"
		else
			vim.wo.foldmethod = "indent"
		end
		MAP("n", "gd", function()
			lsp.buf.definition()
		end, { desc = "Go to definition" })
		MAP("n", "gr", function()
			lsp.buf.references()
		end, { desc = "Show references" })
		MAP("n", "grn", function()
			lsp.buf.rename()
		end, { desc = "vim.lsp rename" })
		MAP("n", "gi", function()
			lsp.buf.implementation()
		end, { desc = "vim.lsp implementation" })
		MAP({ "n", "v" }, "ga", function()
			lsp.buf.code_action()
		end, { desc = "vim.lsp code action" })
		MAP("n", "K", function()
			lsp.buf.hover()
		end, { desc = "Hover" })
	end,
})
return {}

File addition: lsp (d--x------)
[7.17]

File addition: yamlls.lua (----------)

[0.27928]

return {
	filetypes = { "yaml" },
	settings = {
		yaml = {
			schemaStore = {
				-- You must disable built-in schemaStore support if you want to use
				-- this plugin and its advanced options like `ignore`.
				enable = false,
				-- Avoid TypeError: Cannot read properties of undefined (reading 'length')
				url = "",
			},
			schemas = require("schemastore").yaml.schemas(),
		},
	},
}

File addition: ts_ls.lua (----------)

[0.27928]

return {
	cmd = { "bunx", "--bun", "typescript-language-server", "--stdio" },
	root_markers = { "package.json", "bun.lock", "package-lock.json" },
	init_options = {
		plugins = {
			{
				name = "@vue/typescript-plugin",
				location = vim.fn.exepath("vue-language-server"),
				languages = { "vue" },
			},
		},
	},
	filetypes = {
		"typescript",
		"javascript",
		"javascriptreact",
		"typescriptreact",
		"vue",
	},
}

File addition: tailwindcss.lua (----------)

[0.27928]

return {
	cmd = { "tailwindcss-language-server", "--stdio" },
	filetypes = { "astro", "svelte", "tsx", "jsx", "html", "vue" },
	root_markers = { "package.json", "bun.lock" },
	settings = {},
}

File addition: svelteserver.lua (----------)

[0.27928]

return {
	cmd = { "svelteserver", "--stdio" },
	filetypes = { "svelte" },
	root_markers = { "package.json", "bun.lock" },
	settings = {},
}

File addition: rust_analyzer.lua (----------)

[0.27928]

return {
	cmd = { "rust-analyzer" },
	filetypes = { "rust" },
	root_markers = { "Cargo.toml", "Cargo.lock" },
	settings = {
		["rust-analyzer"] = {
			assist = {
				preferSelf = true,
			},
			lens = {
				references = {
					adt = {
						enable = true,
					},
					enumVariant = {
						enable = true,
					},
					method = {
						enable = true,
					},
					trait = {
						enable = true,
						all = true,
					},
				},
			},
			semanticHighlighting = {
				operator = {
					specialization = {
						enable = true,
					},
				},
				punctuation = {
					enable = true,
					separate = {
						macro = {
							enable = true,
						},
					},
					specialization = {
						enable = true,
					},
				},
			},
			inlayHints = {
				bindingModeHints = {
					enable = true,
				},
				closureCaptureHints = {
					enable = true,
				},
				closureReturnTypeHints = {
					enable = true,
				},
				discriminantHints = {
					enable = true,
				},
				expressionAdjustmentHints = {
					enable = true,
				},
				genericParameterHints = {
					lifetime = {
						enable = true,
					},
					type = {
						enable = true,
					},
				},
				implicitDrops = {
					enable = true,
				},
				implicitSizedBoundHints = {
					enable = true,
				},
				lifetimeElisionHints = {
					useParameterNames = true,
					enable = true,
				},
				rangeExclusiveHints = {
					enable = true,
				},
			},
			-- checkOnSave and diagnostics must be disabled for bacon-ls
			checkOnSave = {
				command = "clippy",
				enable = true,
			},
			diagnostics = {
				enable = true,
				experimental = {
					enable = true,
				},
				styleLints = {
					enable = true,
				},
			},
			hover = {
				actions = {
					references = {
						enable = true,
					},
				},
				show = {
					enumVariants = 10,
					fields = 10,
					traitAssocItems = 10,
				},
			},
			interpret = {
				tests = true,
			},
			cargo = {
				features = "all",
			},
			completion = {
				hideDeprecated = true,
				fullFunctionSignatures = {
					enable = true,
				},
			},
		},
	},
}

File addition: nushell.lua (----------)

[0.27928]

return {
	cmd = { "nu", "--lsp" },
	filetypes = { "nu" },
	settings = {},
}

File addition: nixd.lua (----------)

[0.27928]

return {
	cmd = { "nixd" },
	filetypes = { "nix" },
	root_markers = { "flake.nix", ".git" },
}

File addition: lua_ls.lua (----------)

[0.27928]

return {
	cmd = { "lua-language-server" },
	filetypes = { "lua" },
	settings = {
		Lua = {
			diagnostics = {
				globals = { "vim" },
			},
			workspace = {
				checkThirdParty = true,
				library = vim.api.nvim_get_runtime_file("", true),
			},
		},
	},
}

File addition: json_ls.lua (----------)

[0.27928]

return {
	filetypes = { "json", "jsonc" },
	settings = {
		json = {
			schemas = require("schemastore").json.schemas(),
			validate = { enable = true },
		},
	},
}

File addition: gopls.lua (----------)

[0.27928]

return {
	capabilities = capabilities,
	cmd = { "gopls" },
	root_markers = { "go.mod", "go.sum" },
	filetypes = { "go" },
	-- init_options = {
	-- 	usePlaceholders = true,
	-- },
	settings = {
		experimentalPostfixCompletions = true,
		gofumpt = true,
		staticcheck = true,
		completeUnimported = true,
		usePlaceholders = true,
		semanticTokens = true,
				-- stylua: ignore start
				analyses = { -- all good analyses are enabled
					shadow = true, QF1005 = true, QF1006 = true, QF1007 = true, QF1011 = true, S1002 = true, S1005 = true, S1006 = true, S1008 = true, S1009 = true, S1011 = true, S1016 = true, S1021 = true, S1029 = true, SA1000 = true, SA1002 = true, SA1003 = true, SA1007 = true, SA1010 = true, SA1011 = true, SA1014 = true, SA1015 = true, SA1017 = true, SA1018 = true, SA1020 = true, SA1021 = true, SA1023 = true, SA1024 = true, SA1025 = true, SA1026 = true, SA1027 = true, SA1028 = true, SA1030 = true, SA1031 = true, SA1032 = true, SA2002 = true, SA2003 = true, SA4005 = true, SA4006 = true, SA4008 = true, SA4009 = true, SA4010 = true, SA4012 = true, SA4015 = true, SA4017 = true, SA4018 = true, SA4023 = true, SA4031 = true, SA5000 = true, SA5002 = true, SA5005 = true, SA5007 = true, SA5010 = true, SA5011 = true, SA5012 = true, SA6000 = true, SA6001 = true, SA6002 = true, SA6003 = true, SA9001 = true, SA9003 = true, SA9005 = true, SA9007 = true, SA9008 = true,
				},
		-- stylua: ignore end
		codelenses = {
			run_govulncheck = true,
		},
		vulncheck = "Imports",
	},
}

File addition: bacon_ls.lua (----------)

[0.27928]

return {
	cmd = { "bacon-ls" },
	filetypes = { "rust" },
	root_markers = { "Cargo.toml", "Cargo.lock", ".bacon-locations" },
	settings = {
		init_options = {
			locationsFile = ".bacon-locations",
			updateOnSave = true,
			updateOnSaveWaitMillis = 100,
			runBaconInBackground = true,
			synchronizeAllOpenFilesWaitMillis = 1000,
		},
	},
}

File addition: astro.lua (----------)

[0.27928]

return {
	cmd = { "astro-ls", "--stdio" },
	filetypes = { "astro" },
	root_markers = { "package.json", "bun.lock", "tsconfig.json" },
	settings = {},
	init_options = {
		typescript = {
			tsdk = "node_modules/typescript/lib",
		},
	},
}

File addition: helpers.lua (----------)

[7.17]

function ToggleDirbuf()
	if vim.bo.filetype == "dirbuf" then
		vim.cmd("DirbufQuit")
	else
		vim.cmd("Dirbuf")
	end
end
return {}

Replacement in home/modules/programs/nvf/globals.lua at line 13 [5.6462]

B:BD[5.6815] → [5.6815:6953]

	require("fidget").notify(
		"background: "
			.. vim.o.background
			.. "\n theme: "
			.. theme
			.. "\n colorscheme: "
			.. color
	)

[5.6815]

[5.6953]

	require("fidget").notify("background: " .. vim.o.background .. "\n theme: " .. theme .. "\n colorscheme: " .. color)

Replacement in home/modules/programs/nvf/globals.lua at line 31 [5.6462]

B:BD[5.7405] → [5.7405:7499]

	if color == "rusticated" then FixRusticated() end
	if color == "rasmus" then FixRasmus() end

[5.7405]

[5.7499]

	if color == "rusticated" then
		FixRusticated()
	end
	if color == "rasmus" then
		FixRasmus()
	end

File move: lualine.lua → TODOlualine.lua
BF:BFD[6.44244] → [6.60111:60146]
BF:BF[6.60146] → [6.58026:58026]
[7.17]
[6.58026]
Insertion in home/modules/programs/neovim.nix at line 6 [6.19339]
[7.2935]
[7.2935]
```
    ./nvf/lsp.nix
```
Replacement in home/modules/programs/neovim.nix at line 17 [6.19339]
B:BD[7.2983] → [7.2983:3045]
```
    enable = true; # disabled initially for gradual migration
```
[7.2983]
[7.3045]
```
    enable = true;
```
Replacement in home/modules/packages/development.nix at line 7 [6.22468]
B:BD[6.22565] → [6.22565:22609]
```
    nodePackages.typescript-language-server
```
[6.22565]
[6.22609]
```
    typescript-language-server
```
Replacement in home/modules/packages/development.nix at line 10 [6.22468]
B:BD[6.22668] → [6.22668:22712]
```
    nodePackages."@astrojs/language-server"
```
[6.22668]
[4.28]
```
    astro-language-server
```
Insertion in home/modules/packages/development.nix at line 12 [6.22468]
[4.37]
[6.22712]
```
    gopls
    vscode-json-languageserver
    yaml-language-server
```
Replacement in home/modules/packages/development.nix at line 28 [6.22468]
B:BD[6.22846] → [6.22846:22863]
```
    # gemini-cli
```
[6.22846]
[6.22863]
```
    gemini-cli
```
Replacement in dotfiles/nvim/lua/set_colorscheme.lua at line 3 [6.40488]
B:BD[6.40550] → [3.62:96]
```
local current_theme = light_theme
```
[6.40550]
[6.40583]
```
local current_theme = dark_theme
```

File deletion: zen-mode.lua

BF:BFD[6.44244] → [6.44628:44664]

BF:BFD[6.44664] → [6.44265:44265]

B:BD[6.44265] → [6.44266:44627]

return {
	"folke/zen-mode.nvim",
	cmd = "ZenMode",
	opts = {
		on_open = function()
			vim.wo.colorcolumn = "0"
		end,
		window = {
			width = 80,
			height = 1,
		},
		plugins = {
			options = {
				enabled = true,
				showcmd = true,
				ruler = false,
				laststatus = 0,
			},
			twilight = { enabled = true },
			gitsigns = { enabled = false },
		},
	},
}

File deletion: workspaces.lua

BF:BFD[6.44244] → [6.44959:44997]

BF:BFD[6.44997] → [6.44666:44666]

B:BD[6.44666] → [6.44667:44958]

return {
	"natecraddock/workspaces.nvim",
	cmd = "Telescope workspaces",
	keys = {
		{
			"<leader>fp",
			":Telescope workspaces<CR>",
			desc = "open project list",
		},
	},
	opts = {
		auto_open = true,
	},
	config = function()
		require("telescope").load_extension("workspaces")
	end,
}

File deletion: vimwiki.lua

BF:BFD[6.44244] → [6.45524:45559]

BF:BFD[6.45559] → [6.44999:44999]

B:BD[6.44999] → [6.45000:45523]

return {
	"vimwiki/vimwiki",
	keys = { "<leader>ww", "<leader>wi" },
	init = function()
		vim.g.vimwiki_option_diary_path = "./diary/"
		vim.g.vimwiki_global_ext = 0
		vim.g.vimwiki_option_nested_syntaxes = { svelte = "svelte", typescript = "ts" }
		vim.g.vimwiki_list = {
			{
				path = "~/vimwiki/james/",
				name = "james",
				syntax = "markdown",
				ext = "md",
			},
			{
				path = "~/vimwiki/healgorithms/",
				name = "healgorithms",
				syntax = "markdown",
				ext = "md",
				auto_toc = 1,
			},
		}
	end,
}

File deletion: typr.lua

BF:BFD[6.44244] → [6.46327:46359]

BF:BFD[6.46359] → [6.46115:46115]

B:BD[6.46115] → [6.46116:46326]

return {
	"nvzone/typr",
	dependencies = "nvzone/volt",
	opts = {
		config = {
			on_attach = function()
				vim.bo.wrap = false
				vim.bo.completion = false
			end,
		},
	},
	cmd = { "Typr", "TyprStats" },
}

File deletion: twilight.lua
BF:BFD[6.44244] → [6.46466:46502]
BF:BFD[6.46502] → [6.46361:46361]
B:BD[6.46361] → [6.46362:46465]
```
return {
	"folke/twilight.nvim",
	cmd = "Twilight",
	opts = {
		dimming = {
			alpha = 0.4,
		},
	},
}
```
File deletion: ts-autotag.lua
BF:BFD[6.44244] → [6.46766:46804]
BF:BFD[6.46804] → [6.46639:46639]
B:BD[6.46639] → [6.46640:46765]
```
return {
	"windwp/nvim-ts-autotag",
	event = "InsertEnter",
	opts = {
		opts = {
			enable_close_on_slash = true,
		},
	},
}
```

File deletion: trouble.lua

BF:BFD[6.44244] → [6.47627:47662]

BF:BFD[6.47662] → [6.46806:46806]

B:BD[6.46806] → [6.46807:47626]

return {
	"folke/trouble.nvim",
	event = "LspAttach",
	keys = {
		{
			"<leader>tr",
			"<cmd>Trouble diagnostics toggle focus=true filter.buf=0<cr>",
			desc = "Trouble diagonostics current file",
		},
		{
			"<leader>te",
			"<cmd>Trouble diagnostics toggle focus=true<cr>",
			desc = "Trouble diagonostics all files",
		},
		{
			"<leader>tq",
			"<cmd>Trouble qflist toggle<cr>",
			desc = "Trouble quickfix list",
		},
	},
	opts = {
		auto_close = true,
		modes = {
			diagnostics = { -- Configure symbols mode
				win = {
					size = 0.3, -- 30% of the window})
					-- },
					--preview = {
					--    type = "float",
					--    relative = "win",
					--    title = "Preview",
					--    border = "single",
					--size = { width = 0.25, height = 0.4 },
					--    zindex = 200,
					--},
				},
			},
		},
	},
}

File deletion: treesitter.lua

BF:BFD[6.44244] → [6.48087:48125]

BF:BFD[6.48125] → [6.47664:47664]

B:BD[6.47664] → [6.47665:48086]

return {
	"nvim-treesitter/nvim-treesitter",
	build = ":TSUpdate",
	event = "BufRead",
	main = "nvim-treesitter.configs",
	opts = {
		ensure_installed = {
			"javascript",
			"typescript",
			"svelte",
			"markdown",
			"css",
			"html",
			"lua",
			"vim",
			"json",
			"yaml",
			"vimdoc",
			"go",
			"http",
			"rust",
		},
		highlight = { enable = true },
		auto_install = true,
		indent = { enable = true },
	},
}

File deletion: treesitter-textobjects.lua
BF:BFD[6.44244] → [6.48208:48258]
BF:BFD[6.48258] → [6.48127:48127]
B:BD[6.48127] → [6.48128:48207]
```
return {
	"nvim-treesitter/nvim-treesitter-textobjects",
	event = "BufRead",
}
```

File deletion: todo-comments.lua

BF:BFD[6.44244] → [6.48903:48944]

BF:BFD[6.48944] → [6.48605:48605]

B:BD[6.48605] → [6.48606:48902]

return {
	"folke/todo-comments.nvim",
	event = "BufRead",
	-- cmd = "TodoTelescope",
	keys = {
		{
			"<leader>td",
			"<cmd>TodoTelescope<CR>",
			desc = "todo list in telescope",
		},
	},
	opts = {
		signs = false,
		highlight = {
			before = "",
			keyword = "wide",
			after = "",
		},
	},
}

File deletion: tiny-inline-diagnostic.lua

BF:BFD[6.44244] → [6.49302:49352]

BF:BFD[6.49352] → [6.48946:48946]

B:BD[6.48946] → [6.48947:49301]

return {
	"rachartier/tiny-inline-diagnostic.nvim",
	event = "BufReadPost",
	opts = {
		preset = "minimal",
		transparent_bg = true,
		transparent_cursorline = false,
		signs = {
			arrow = "",
			up_arrow = "",
		},
		options = {
			show_source = { enabled = true },
			multilines = { enabled = true, always_show = true },
			throttle = 100,
		},
	},
}

File deletion: supermaven.lua
BF:BFD[6.44244] → [6.51088:51126]
BF:BFD[6.51126] → [6.51004:51004]
B:BD[6.51004] → [6.51005:51087]
```
return {
	"supermaven-inc/supermaven-nvim",
	event = "InsertEnter",
	opts = {},
}
```

File deletion: search-this.lua

BF:BFD[6.44244] → [6.51631:51670]

BF:BFD[6.51670] → [6.51456:51456]

B:BD[6.51456] → [6.51457:51630]

return {
	"jamesukiyo/search-this.nvim",
	name = "search-this",
	cmd = { "SearchThis", "SearchThisNormal" },
	keys = "<leader>st",
	opts = {
		default_engine = "ddg",
	},
}

File deletion: scrolleof.lua
BF:BFD[6.44244] → [6.51752:51789]
BF:BFD[6.51789] → [6.51672:51672]
B:BD[6.51672] → [6.51673:51751]
```
return {
	"Aasim-A/scrollEOF.nvim",
	event = { "WinScrolled" },
	opts = {},
}
```

File deletion: screenkey.lua

BF:BFD[6.44244] → [6.52832:52869]

BF:BFD[6.52869] → [6.51791:51791]

B:BD[6.51791] → [6.51792:52831]

return {
	"NStefan002/screenkey.nvim",
	cmd = { "Screenkey" },
	branch = "main",
	opts = {
		win_opts = {
			title = "",
			width = 25,
			height = 1,
			border = "single",
		},
		clear_after = 5,
		group_mappings = true,
		filter = function(keys)
			return keys
		end,
		keys = {
			["<TAB>"] = "󰌒",
			["<CR>"] = "󰌑",
			["<ESC>"] = "Esc",
			["<SPACE>"] = "␣",
			["<BS>"] = "󰌥",
			["<DEL>"] = "Del",
			["<LEFT>"] = "",
			["<RIGHT>"] = "",
			["<UP>"] = "",
			["<DOWN>"] = "",
			["<HOME>"] = "Home",
			["<END>"] = "End",
			["<PAGEUP>"] = "PgUp",
			["<PAGEDOWN>"] = "PgDn",
			["<INSERT>"] = "Ins",
			["<F1>"] = "󱊫",
			["<F2>"] = "󱊬",
			["<F3>"] = "󱊭",
			["<F4>"] = "󱊮",
			["<F5>"] = "󱊯",
			["<F6>"] = "󱊰",
			["<F7>"] = "󱊱",
			["<F8>"] = "󱊲",
			["<F9>"] = "󱊳",
			["<F10>"] = "󱊴",
			["<F11>"] = "󱊵",
			["<F12>"] = "󱊶",
			["CTRL"] = "Ctrl",
			["ALT"] = "Alt",
			["SUPER"] = "󰘳",
			["<leader>"] = "<leader>",
		},
	},
	config = function()
		CMD("Screenkey")
	end,
}

File deletion: render-markdown.lua
BF:BFD[6.44244] → [6.54211:54254]
BF:BFD[6.54254] → [6.54076:54076]
B:BD[6.54076] → [6.54077:54210]
```
return {
	"MeanderingProgrammer/render-markdown.nvim",
	ft = "markdown",
	opts = { completions = { blink = { enabled = true } } },
}
```

File deletion: quicksnip.lua

BF:BFD[6.44244] → [6.54721:54758]

BF:BFD[6.54758] → [6.54256:54256]

B:BD[6.54256] → [6.54257:54720]

return {
	"jamesukiyo/quicksnip.vim",
	cmd = { "SnipCurrent", "SnipPick" },
	keys = { { "<leader>sp", ":SnipPick<CR>" }, { "<leader>sc", ":SnipCurrent<CR>" } },
	init = function()
		vim.g.miniSnip_dirs = { "~/.vim/snippets" }
		vim.g.miniSnip_trigger = "<C-c>"
		vim.g.miniSnip_complkey = ""
		vim.g.miniSnip_extends = {
			html = { "svelte" },
			svelte = { "typescript", "html" },
			javascript = { "typescript" },
			typescript = { "javascript" },
		}
	end,
}

File deletion: pomo.lua

BF:BFD[6.44244] → [6.55376:55408]

BF:BFD[6.55408] → [6.54760:54760]

B:BD[6.54760] → [6.54761:55375]

return {
	"epwalsh/pomo.nvim",
	version = "*",
	lazy = true,
	cmd = { "TimerStart", "TimerRepeat", "TimerSession" },
	opts = {
		update_interval = 500,
		sessions = {
			pomodoro = {
				{ name = "Work", duration = "25m" },
				{ name = "Break", duration = "5m" },
				{ name = "Work", duration = "25m" },
				{ name = "Break", duration = "5m" },
				{ name = "Work", duration = "25m" },
				{ name = "Break", duration = "15m" },
			},
		},
		notifiers = {
			{
				name = "Default",
				opts = {
					sticky = false,
				},
			},
			-- {
			-- 	name = "System", -- Doesn't work on Windows yet
			-- },
		},
	},
}

File deletion: pipeline.lua
BF:BFD[6.44244] → [6.55506:55542]
BF:BFD[6.55542] → [6.55410:55410]
B:BD[6.55410] → [6.55411:55505]
```
return {
	"topaxi/pipeline.nvim",
	cmd = "Pipeline",
	opts = {
		split = { size = 80 },
	},
}
```

File deletion: package-info.lua

BF:BFD[6.44244] → [6.56226:56266]

BF:BFD[6.56266] → [6.55544:55544]

B:BD[6.55544] → [6.55545:56225]

return {
	"vuki656/package-info.nvim",
	event = "BufRead package.json",
	opts = {
		autostart = true,
		hide_unstable_versions = true,
		notifications = false,
		icons = {
			enable = true,
			style = {
				up_to_date = "   ",
				outdated = "   ",
				invalid = "   ",
			},
		},
	},
	config = function()
		-- only working way to set the colors https://github.com/vuki656/package-info.nvim/issues/155#issuecomment-2270572104
		SET_HL(0, "PackageInfoUpToDateVersion", { fg = "#3c4048" })
		SET_HL(0, "PackageInfoOutdatedVersion", { fg = "#d19a66" })
		SET_HL(0, "PackageInfoInvalidVersion", { fg = "#ee4b2b" })
		CMD("lua require('package-info').show({ force = true })")
	end,
}

File deletion: neogit.lua

BF:BFD[6.44244] → [6.57128:57162]

BF:BFD[6.57162] → [6.56763:56763]

B:BD[6.56763] → [6.56764:57127]

return {
	"NeogitOrg/neogit",
	dependencies = { "sindrets/diffview.nvim" },
	cmd = "Neogit",
	keys = {
		{
			"<leader>g",
			":Neogit<CR>",
			desc = "open neogit",
		},
	},
	opts = {
		integrations = {
			telescope = true,
			diffview = true,
		},
		commit_editor = {
			staged_diff_split_kind = "vsplit",
		},
		commit_select_view = { kind = "vsplit" },
	},
}

File deletion: minisnip.lua
BF:BFD[6.44244] → [6.57222:57258]
BF:BFD[6.57258] → [6.57164:57164]
B:BD[6.57164] → [6.57165:57221]
```
return {
	"Jorenar/miniSnip",
	event = "InsertEnter",
}
```
File deletion: mini_surround.lua
BF:BFD[6.44244] → [6.57335:57376]
BF:BFD[6.57376] → [6.57260:57260]
B:BD[6.57260] → [6.57261:57334]
```
return {
	"echasnovski/mini.surround",
	event = "BufRead",
	opts = {},
}
```

File deletion: mini_diff.lua

BF:BFD[6.44244] → [6.57635:57672]

BF:BFD[6.57672] → [6.57378:57378]

B:BD[6.57378] → [6.57379:57634]

return {
	"echasnovski/mini.diff",
	event = "BufRead",
	opts = {
		view = {
			style = "number",
		},
		mappings = {
			apply = "",
			reset = "",
			textobject = "",
			goto_first = "",
			goto_prev = "",
			goto_next = "",
			goto_last = "",
		},
	},
}

File deletion: mini_ai.lua
BF:BFD[6.44244] → [6.57989:58024]
BF:BFD[6.58024] → [6.57920:57920]
B:BD[6.57920] → [6.57921:57988]
```
return {
	"echasnovski/mini.ai",
	event = "BufRead",
	opts = {},
}
```

File deletion: harpoon.lua

BF:BFD[6.44244] → [6.61920:61955]

BF:BFD[6.61955] → [6.61012:61012]

B:BD[6.61012] → [6.61013:61919]

return {
	-- "ThePrimeagen/harpoon",
	-- branch = "harpoon2",
	-- init = function()
	-- 	require("harpoon"):setup()
	-- end,
	-- keys = {
	-- 	{
	-- 		"<leader>a",
	-- 		function()
	-- 			require("harpoon"):list():add()
	-- 		end,
	-- 	},
	-- 	{
	-- 		"<C-e>",
	-- 		function()
	-- 			require("harpoon").ui:toggle_quick_menu(require("harpoon"):list())
	-- 		end,
	-- 	},
	-- 	{
	-- 		"<leader>h",
	-- 		function()
	-- 			require("harpoon"):list():select(1)
	-- 		end,
	-- 	},
	-- 	{
	-- 		"<leader>j",
	-- 		function()
	-- 			require("harpoon"):list():select(2)
	-- 		end,
	-- 	},
	-- 	{
	-- 		"<leader>k",
	-- 		function()
	-- 			require("harpoon"):list():select(3)
	-- 		end,
	-- 	},
	-- 	{
	-- 		"<leader>l",
	-- 		function()
	-- 			require("harpoon"):list():select(4)
	-- 		end,
	-- 	},
	-- },
	-- opts = {
	-- 	settings = {
	-- 		save_on_toggle = true,
	-- 		save_on_ui_close = true,
	-- 	},
	-- },
}

File deletion: fidget.lua

BF:BFD[6.44244] → [6.62296:62330]

BF:BFD[6.62330] → [6.62034:62034]

B:BD[6.62034] → [6.62035:62295]

return {
	"j-hui/fidget.nvim",
	event = "VeryLazy",
	opts = {
		progress = {
			display = {
				done_ttl = 10,
			},
		},
		notification = {
			override_vim_notify = true,
			window = {
				winblend = 0,
				zindex = 1000,
				max_width = 60,
			},
		},
	},
}

File deletion: ferris.lua
BF:BFD[6.44244] → [6.62445:62479]
BF:BFD[6.62479] → [6.62332:62332]
B:BD[6.62332] → [6.62333:62444]
```
return {
	"vxpm/ferris.nvim",
	ft = "rust",
	opts = {
		create_commands = true,
		url_handler = "start",
	},
}
```

File deletion: darklight.lua

BF:BFD[6.44244] → [6.64020:64057]

BF:BFD[6.64057] → [6.63698:63698]

B:BD[6.63698] → [6.63699:64019]

return {
	"eliseshaffer/darklight.nvim",
	opts = {
		mode = "custom",
		light_mode_callback = function()
			ColorMyPencils("rusticated", "light", true)
			DisableBold()
			DisableItalic()
		end,
		dark_mode_callback = function()
			ColorMyPencils("rasmus", "dark", true)
			DisableBold()
			DisableItalic()
		end,
	},
}

File deletion: crates.lua
BF:BFD[6.44244] → [6.64142:64176]
BF:BFD[6.64176] → [6.64059:64059]
B:BD[6.64059] → [6.64060:64141]
```
return {
	"saecki/crates.nvim",
	event = { "BufRead Cargo.toml" },
	opts = {},
}
```

File deletion: conform.lua

BF:BFD[6.44244] → [6.65400:65435]

BF:BFD[6.65435] → [6.64178:64178]

B:BD[6.64178] → [6.64179:65399]

return {
	"stevearc/conform.nvim",
	event = "BufRead",
	opts = {
		formatters = {
			-- Use system binaries without .exe extension
			prettier = {
				command = "prettier",
			},
			prettierd = {
				command = "prettierd",
			},
		},
		formatters_by_ft = {
			astro = { "prettierd", "prettier", stop_after_first = true },
			go = { "gofumpt", "goimports", stop_after_first = true },
			javascript = { "prettierd", "prettier", stop_after_first = true },
			javascriptreact = { "prettierd", "prettier", stop_after_first = true },
			typescript = { "prettierd", "prettier", stop_after_first = true },
			typescriptreact = { "prettierd", "prettier", stop_after_first = true },
			json = { "prettierd", "prettier", stop_after_first = true },
			svelte = { "prettierd", "prettier", stop_after_first = true },
			vue = { "prettierd", "prettier", stop_after_first = true },
			yaml = { "prettierd", "prettier", stop_after_first = true },
			md = { "dprint" },
			toml = { "dprint" },
			lua = { "stylua" },
			sql = { "sql_formatter" },
			python = { "ruff_format" },
			rust = { "rustfmt" },
			-- nu = { "nufmt" },
			nix = { "nixfmt" },
		},
		format_after_save = {
			async = true,
			-- lsp_format = "fallback",
		},
	},
}

File deletion: compile-mode.lua

BF:BFD[6.44244] → [6.65909:65949]

BF:BFD[6.65949] → [6.65437:65437]

B:BD[6.65437] → [6.65438:65908]

return {
	"ej-shafran/compile-mode.nvim",
	cmd = "Compile",
	init = function()
		vim.g.compile_mode = {
			baleia_setup = true,
			default_command = "",
			recompile_no_fail = true,
		}
	end,
	keys = {
		{
			"<leader>co",
			":vert Compile<cr>",
			desc = "run a compile cmd",
		},
		{
			"<leader>cr",
			":vert Recompile<cr>",
			desc = "rerun last compile cmd",
		},
	},
	dependencies = {
		"nvim-lua/plenary.nvim",
		{ "m00qek/baleia.nvim", tag = "v1.3.0" },
	},
}

File deletion: blink_cmp.lua

BF:BFD[6.44244] → [6.67263:67300]

BF:BFD[6.67300] → [6.66245:66245]

B:BD[6.66245] → [6.66246:67262]

return {
	"saghen/blink.cmp",
	event = "BufRead",
	enabled = true,
	version = "1.4", -- NOTE: 1.4 until fixed: https://github.com/LazyVim/LazyVim/pull/6183
	build = "cargo build --release",
	opts = {
		keymap = { preset = "enter" },
		completion = {
			documentation = { auto_show = true, auto_show_delay_ms = 250 },
			menu = {
				draw = {
					columns = {
						{ "kind" },
						{ "label", gap = 1 },
					},
				},
			},
		},
		cmdline = { enabled = false },
		-- 	completion = {
		-- 		menu = {
		-- 			auto_show = false,
		-- 			draw = {
		-- 				columns = {
		-- 					{ "label", "label_description", gap = 1 },
		-- 				},
		-- 			},
		-- 		},
		-- 	},
		-- },
		signature = { enabled = true },
		sources = {
			default = { "lsp", "path", "snippets", "buffer" },
			providers = {
				buffer = {
					opts = {
						get_bufnrs = function()
							return vim.tbl_filter(function(bufnr)
								return vim.bo[bufnr].buftype == ""
							end, vim.api.nvim_list_bufs())
						end,
					},
				},
			},
		},
	},
}

File deletion: biscuits.lua

BF:BFD[6.44244] → [6.67524:67560]

BF:BFD[6.67560] → [6.67302:67302]

B:BD[6.67302] → [6.67303:67523]

return {
	"code-biscuits/nvim-biscuits",
	ft = { "rust", "javascript", "typescript", "shell" },
	opts = {
		cursor_line_only = true,
		prefix_string = " ",
		toggle_keybind = "<leader>bi",
		show_on_start = false,
	},
}

File deletion: autopairs.lua
BF:BFD[6.44244] → [6.67668:67705]
BF:BFD[6.67705] → [6.67562:67562]
B:BD[6.67562] → [6.67563:67667]
```
return {
	"windwp/nvim-autopairs",
	event = "InsertEnter",
	opts = { disable_filetype = { "typr" } },
}
```
File move: jabs.lua → NOTONVIMPKGSjabs.lua
BF:BFD[6.44244] → [6.60978:61010]
BF:BF[6.61010] → [6.60148:60148]
[6.44244]
[6.60148]
File move: ccc.lua → NEEDSREMAPOPTSccc.lua
BF:BFD[6.44244] → [6.66212:66243]
BF:BF[6.66243] → [6.65951:65951]
[6.44244]
[6.65951]
File move: undotree.lua → NEEDSREMAP-undotree.lua
BF:BFD[6.44244] → [6.46077:46113]
BF:BF[6.46113] → [6.45926:45926]
[6.44244]
[6.45926]
File move: telescope.lua → NEEDSREMAP-telescope.lua
BF:BFD[6.44244] → [6.50965:51002]
BF:BF[6.51002] → [6.49354:49354]
[6.44244]
[6.49354]
File move: mini_bufremove.lua → NEEDSREMAP-mini_bufremove.lua
BF:BFD[6.44244] → [6.57876:57918]
BF:BF[6.57918] → [6.57674:57674]
[6.44244]
[6.57674]
File move: dirbuf.lua → NEEDSREMAP-dirbuf.lua
BF:BFD[6.44244] → [6.63422:63456]
BF:BF[6.63456] → [6.63038:63038]
[6.44244]
[6.63038]
File move: treesitter-context.lua → NEEDSHIGHLIGHTS-treesitter-context.lua
BF:BFD[6.44244] → [6.48557:48603]
BF:BF[6.48603] → [6.48260:48260]
[6.44244]
[6.48260]
File move: no-neck-pain.lua → NEEDSFASTERLOADno-neck-pain.lua
BF:BFD[6.44244] → [6.56721:56761]
BF:BF[6.56761] → [6.56466:56466]
[6.44244]
[6.56466]

move most of neovim to nvf

Dependencies

In channels

Change contents

Replacement in home/modules/programs/zellij.nix at line 19 [6.18874]

Replacement in home/modules/programs/nvf/themes.nix at line 2 [7.34]

Replacement in home/modules/programs/nvf/themes.nix at line 9 [7.34]

Deletion in home/modules/programs/nvf/themes.nix at line 15 [7.34]

Insertion in home/modules/programs/nvf/plugins.nix at line 1 [7.347]

Replacement in home/modules/programs/nvf/plugins.nix at line 3 [7.347]

Replacement in home/modules/programs/nvf/plugins.nix at line 510 [7.347]

Replacement in home/modules/programs/nvf/plugins.nix at line 549 [7.347]

Replacement in home/modules/programs/nvf/plugins.nix at line 599 [7.347]

Replacement in home/modules/programs/nvf/plugins.nix at line 627 [7.347]

Replacement in home/modules/programs/nvf/plugins.nix at line 672 [7.347]

Replacement in home/modules/programs/nvf/plugins.nix at line 691 [7.347]

Insertion in home/modules/programs/nvf/plugins.nix at line 785 [7.347]

Replacement in home/modules/programs/nvf/options.nix at line 11 [7.1297]

Insertion in home/modules/programs/nvf/options.nix at line 25 [7.1297]

Insertion in home/modules/programs/nvf/options.nix at line 30 [7.1297]

Deletion in home/modules/programs/nvf/options.nix at line 39 [7.1297]

File addition: lsp.nix (----------)

File addition: lsp.lua (----------)

File addition: lsp (d--x------)

File addition: yamlls.lua (----------)

File addition: ts_ls.lua (----------)

File addition: tailwindcss.lua (----------)

File addition: svelteserver.lua (----------)

File addition: rust_analyzer.lua (----------)

File addition: nushell.lua (----------)

File addition: nixd.lua (----------)

File addition: lua_ls.lua (----------)

File addition: json_ls.lua (----------)

File addition: gopls.lua (----------)

File addition: bacon_ls.lua (----------)

File addition: astro.lua (----------)

File addition: helpers.lua (----------)

Replacement in home/modules/programs/nvf/globals.lua at line 13 [5.6462]

Replacement in home/modules/programs/nvf/globals.lua at line 31 [5.6462]

File move: lualine.lua → TODOlualine.lua

Insertion in home/modules/programs/neovim.nix at line 6 [6.19339]

Replacement in home/modules/programs/neovim.nix at line 17 [6.19339]

Replacement in home/modules/packages/development.nix at line 7 [6.22468]

Replacement in home/modules/packages/development.nix at line 10 [6.22468]

Insertion in home/modules/packages/development.nix at line 12 [6.22468]

Replacement in home/modules/packages/development.nix at line 28 [6.22468]

Replacement in dotfiles/nvim/lua/set_colorscheme.lua at line 3 [6.40488]

File deletion: zen-mode.lua

File deletion: workspaces.lua

File deletion: vimwiki.lua

File deletion: typr.lua

File deletion: twilight.lua

File deletion: ts-autotag.lua

File deletion: trouble.lua

File deletion: treesitter.lua

File deletion: treesitter-textobjects.lua

File deletion: todo-comments.lua

File deletion: tiny-inline-diagnostic.lua

File deletion: supermaven.lua

File deletion: search-this.lua

File deletion: scrolleof.lua

File deletion: screenkey.lua

File deletion: render-markdown.lua

File deletion: quicksnip.lua

File deletion: pomo.lua

File deletion: pipeline.lua

File deletion: package-info.lua

File deletion: neogit.lua

File deletion: minisnip.lua

File deletion: mini_surround.lua

File deletion: mini_diff.lua

File deletion: mini_ai.lua

File deletion: harpoon.lua

File deletion: fidget.lua

File deletion: ferris.lua

File deletion: darklight.lua

File deletion: crates.lua

File deletion: conform.lua

File deletion: compile-mode.lua

File deletion: blink_cmp.lua