plumjam/nixos - Change VDQT5YV3DCAGV2O6NHN6AM4P4G5O3BITRGKP5EA342YWTXVMAPTQC

better use of nvf built-ins for simplicity

lsp, treesitter, completion, formatters
kept some LSP settings for special cases where nvf doesn't cover
also removed highlight.nix because it wasn't used

Created by James Plummer on August 24, 2025

VDQT5YV3DCAGV2O6NHN6AM4P4G5O3BITRGKP5EA342YWTXVMAPTQC

Dependencies

In channels

main

Change contents

File deletion: highlights.nix, highlights.nix, highlights.nix
BFD:BFD[6.214] → [6.698:736]
BF:BFD[6.736] → [8.24855:24855]
BF:BFD[7.4536] → [7.5439:5477]
BF:BFD[7.5477] → [8.24855:24855]
BFD:BFD[9.17] → [8.25044:25082]
BF:BFD[8.25082] → [8.24855:24855]
B:BD[8.24855] → [8.24856:25043]
```
{
  programs.nvf.settings.vim.highlight = {
    TreeSitterContextLineNumberBottom = {
      fg = "#FFFFFF";
    };
    TreeSitterContextSeparator = {
      fg = "#363636";
    };
  };
}
```
Insertion in home/modules/editor/nvim/plugins-nvf.nix at line 2 [9.347]
[10.46]
[9.348]
```
let
  inherit (lib) enabled;
in
```

Insertion in home/modules/editor/nvim/plugins-nvf.nix at line 20 [9.347]

[11.393]

[8.7126]

    autocomplete.blink-cmp = enabled {
      mappings = {
        next = null;
        previous = null;
        scrollDocsDown = "<C-d>";
        scrollDocsUp = "<C-u>";
      };
      setupOpts = {
        keymap = {
          preset = "enter";
        };
        completion = {
          list = {
            selection = {
              preselect = false;
            };
          };
          documentation = {
            window = {
              border = "single";
              winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:CursorLine,Search:None";
            };
            auto_show = true;
            auto_show_delay_ms = 250;
          };
          menu = {
            border = "single";
            winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:CursorLine,Search:None";
            draw = {
              columns = lib.generators.mkLuaInline ''
                {
                  { "kind" },
                  { "label", gap = 1 }
                }
              '';
            };
          };
        };
        cmdline = {
          enabled = false;
        };
        signature = {
          enabled = true;
        };
        sources = {
          default = [
            "lsp"
            "path"
            "snippets"
            "buffer"
          ];
          providers = {
            buffer = {
              opts = lib.generators.mkLuaInline ''
                {
                  get_bufnrs = function()
                    return vim.tbl_filter(function(bufnr)
                      return vim.bo[bufnr].buftype == ""
                    end, vim.api.nvim_list_bufs())
                  end,
                }
              '';
            };
          };
        };
      };
    };

Replacement in home/modules/editor/nvim/plugins-nvf.nix at line 110 [9.347]
∅:D[10.371] → [12.426:450]
B:BD[12.426] → [12.426:450]
```
        theme = "auto";
```
[10.371]
[12.450]
```
        theme = "gruvbox";
```

Deletion in home/modules/editor/nvim/plugins-nvf.nix at line 148 [9.347]

B:BD[12.1628] → [12.1628:1648]

∅:D[12.1648] → [8.7145:7153]

B:BD[8.7145] → [8.7145:7153]

B:BD[11.828] → [11.828:1140]

B:BD[11.1140] → [8.7154:7165]

∅:D[8.7165] → [11.1140:1153]

B:BD[11.1140] → [11.1140:1153]

B:BD[11.1153] → [3.47:72]

∅:D[3.72] → [11.1153:1462]

B:BD[11.1153] → [11.1153:1462]

B:BD[11.1462] → [8.7166:7255]

∅:D[8.7255] → [11.1543:1785]

B:BD[11.1543] → [11.1543:1785]

        };
      };
    };
    # treesitter
    treesitter = {
      enable = true;
      grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
        javascript
        typescript
        svelte
        markdown
        css
        html
        lua
        vim
        json
        yaml
        vimdoc
        go
        http
        nu
        rust
        nasm
        asm
      ];
      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" ];

Replacement in home/modules/editor/nvim/plugins-custom.nix at line 1 [13.85]
B:BD[13.85] → [13.86:157]
```
{ pkgs, lib, ... }:
let
  mkLuaInline = lib.generators.mkLuaInline;
in
```
[13.85]
[13.157]
```
{ pkgs, ... }:
```

Replacement in home/modules/editor/nvim/plugins-custom.nix at line 483 [13.85]

B:BD[13.12171] → [13.12171:12289]

          light = "function() ColorMyPencils('light') end";
          dark = "function() ColorMyPencils('dark') end";

[13.12171]

[13.12289]

          light = "function() ColorMyPencils('gruvbox-material', 'light', false) end";
          dark = "function() ColorMyPencils('gruvbox-material', 'dark', false) end";

Deletion in home/modules/editor/nvim/plugins-custom.nix at line 558 [13.85]

B:BD[13.13569] → [13.13569:13951]

B:BD[13.13951] → [2.27:210]

∅:D[2.210] → [13.13951:14059]

B:BD[13.13951] → [13.13951:14059]

B:BD[13.14059] → [2.211:349]

∅:D[2.349] → [13.14059:15045]

B:BD[13.14059] → [13.14059:15045]

∅:D[14.516] → [10.2593:2604]

B:BD[10.2593] → [10.2593:2604]

∅:D[10.2785] → [13.15895:15904]

B:BD[13.15895] → [13.15895:15904]


      "blink.cmp" = {
        package = pkgs.vimPlugins.blink-cmp;
        lazy = false;
        setupModule = "blink-cmp";
        setupOpts = {
          keymap = {
            preset = "enter";
          };
          completion = {
            list = {
              selection = {
                preselect = false;
              };
            };
            documentation = {
              window = {
                border = "single";
                winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:CursorLine,Search:None";
              };
              auto_show = true;
              auto_show_delay_ms = 250;
            };
            menu = {
              border = "single";
              winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:CursorLine,Search:None";
              draw = {
                columns = lib.generators.mkLuaInline ''
                  {
                    { "kind" },
                    { "label", gap = 1 }
                  }
                '';
              };
            };
          };
          cmdline = {
            enabled = false;
          };
          signature = {
            enabled = true;
          };
          sources = {
            default = [
              "lsp"
              "path"
              "snippets"
              "buffer"
            ];
            providers = {
              buffer = {
                opts = lib.generators.mkLuaInline ''
                  {
                    get_bufnrs = function()
                      return vim.tbl_filter(function(bufnr)
                        return vim.bo[bufnr].buftype == ""
                      end, vim.api.nvim_list_bufs())
                    end,
                  }
                '';
              };
            };
          };
        };
      };

File move: lsp.nix → langs.nix
BF:BFD[7.4536] → [7.5029:5060]
BF:BF[7.5060] → [11.24800:24800]
[7.4536]
[11.24800]
Insertion in home/modules/editor/nvim/langs.nix at line 4 [11.24800]
[15.77]
[15.77]
```
  inherit (lib) enabled;
```

Deletion in home/modules/editor/nvim/langs.nix at line 8 [11.24800]

B:BD[7.5102] → [7.5102:5296]

    pkgs.lua-language-server
    pkgs.typescript-language-server
    pkgs.svelte-language-server
    pkgs.tailwindcss-language-server
    pkgs.astro-language-server
    pkgs.nixd
    pkgs.gopls

Insertion in home/modules/editor/nvim/langs.nix at line 134 [11.24800]

[8.19683]

[11.24973]


    #==============#
    # LANG SUPPORT #
    #==============#
    languages = {
      html = enabled {
        treesitter = enabled;
      };
      css = enabled {
        treesitter = enabled;
        lsp = enabled;
        format = enabled {
          type = "prettierd";
        };
      };
      rust = enabled {
        treesitter = enabled;
        dap = enabled;
        # lsp handled in ./langs.nix
        crates = enabled;
        format = enabled;
      };
      assembly = enabled {
        treesitter = enabled;
        lsp = enabled;
      };

Insertion in home/modules/editor/nvim/langs.nix at line 164 [11.24800]

[11.24974]

[8.19684]

      astro = enabled {
        treesitter = enabled;
        lsp = enabled;
        format = enabled {
          type = "prettierd";
        };
      };
      ts = enabled {
        treesitter = enabled;
        lsp = enabled {
          server = "denols";
        };
        format = enabled {
          type = "prettierd";
        };
      };
      lua = enabled {
        treesitter = enabled;
        lsp = enabled;
        format = enabled;
      };
      nix = enabled {
        treesitter = enabled;
        lsp = enabled {
          server = "nixd";
        };
        format = enabled {
          type = "nixfmt";
        };
      };
      nu = enabled {
        treesitter = enabled;
        lsp = enabled;
      };
      svelte = enabled {
        treesitter = enabled;
        lsp = enabled;
        format = enabled {
          type = "prettier";
        };
      };
      tailwind = enabled {
        lsp = enabled;
      };
      yaml = enabled {
        treesitter = enabled;
        # lsp handled in ./langs.nix
      };
      go = enabled {
        treesitter = enabled;
        lsp = enabled;
        dap = enabled;
        format = enabled {
          type = "gofumpt";
        };
      };
      markdown = enabled {
        treesitter = enabled;
        lsp = enabled;
        extensions.render-markdown-nvim = enabled {
          setupOpts = {
            completions = {
              blink = {
                enabled = true;
              };
            };
            file_types = [
              "markdown"
              "md"
            ];
          };
        };
      };
    };
    #============#
    # TREESITTER #
    #============#
    treesitter = {
      enable = true;
      grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
        vim
        json
        vimdoc
        http
        nasm
        asm
      ];
      fold = true;
      indent.enable = true;
      highlight.enable = true;
      textobjects.enable = true;
      autotagHtml = true;
      context = {
        enable = true;
        setupOpts = {
          max_lines = 3;
          separator = "▁";
        };
      };
    };
    #============#
    # OTHER LSPs #
    #============#

Deletion in home/modules/editor/nvim/langs.nix at line 290 [11.24800]

B:BD[8.20052] → [8.20052:20329]

B:BD[8.20329] → [10.2816:2889]

B:BD[10.2889] → [4.50:136]

∅:D[16.125] → [8.20379:20412]

∅:D[4.136] → [8.20379:20412]

∅:D[10.2942] → [8.20379:20412]

B:BD[8.20379] → [8.20379:20412]

      "astro" = {
        cmd = [
          "astro-ls"
          "--stdio"
        ];
        filetypes = [ "astro" ];
        root_markers = [
          "package.json"
          "bun.lock"
          "tsconfig.json"
        ];
        init_options = {
          typescript = {
            # should make this dynamic but now only care about 1 project
            tsdk = mkLuaInline ''vim.fn.getcwd() .. "/node_modules/typescript/lib"'';
          };
        };
      };

Deletion in home/modules/editor/nvim/langs.nix at line 310 [11.24800]

B:BD[8.20904] → [8.20904:21409]

      gopls = {
        root_markers = [
          "go.mod"
          "go.sum"
        ];
        filetypes = [ "go" ];
        cmd = [ "gopls" ];
        settings = {
          experimentalPostfixCompletions = true;
          gofumpt = true;
          staticcheck = true;
          completeUnimported = true;
          usePlaceholders = true;
          semanticTokens = true;
          codelenses = {
            run_govulncheck = true;
          };
          vulncheck = "Imports";
        };
      };

Deletion in home/modules/editor/nvim/langs.nix at line 320 [11.24800]

B:BD[8.21680] → [8.21680:22056]

B:BD[8.22056] → [15.242:323]

            };
          };
        };
      };
      lua_ls = {
        filetypes = [ "lua" ];
        cmd = [ "lua-language-server" ];
        settings = {
          Lua = {
            diagnostics = {
              globals = [
                "vim"
                "wezterm"
              ];
            };
            workspaces = {
              checkThirdParty = true;
              library = mkLuaInline ''vim.api.nvim_get_runtime_file("", true)'';

Deletion in home/modules/editor/nvim/langs.nix at line 323 [11.24800]

B:BD[8.22191] → [8.22191:22477]

∅:D[8.22477] → [11.25336:25337]

B:BD[11.25336] → [11.25336:25337]

B:BD[11.25337] → [8.22478:22960]

      };
      "nixd" = {
        root_markers = [
          "flake.nix"
          ".git"
        ];
        filetypes = [ "nix" ];
        cmd = [ "nixd" ];
      };
      nushell = {
        filetypes = [ "nu" ];
        cmd = [
          "nu"
          "--lsp"
        ];
      };
      # now handled by rustaceanvim
      # "rust_analyzer" = {
      #   root_markers = [
      #     "Cargo.toml"
      #     "Cargo.lock"
      #   ];
      #   filetypes = [ "rust" ];
      #   cmd = [ "rust-analyzer" ];
      # settings = {};
      # };
      "svelteserver" = {
        root_markers = [
          "package.json"
          "bun.lock"
        ];
        filetypes = [ "svelte" ];
        cmd = [
          "svelteserver"
          "--stdio"
        ];
      };

Deletion in home/modules/editor/nvim/langs.nix at line 324 [11.24800]

B:BD[8.22961] → [8.22961:23701]

B:BD[8.23701] → [10.2943:3246]

      "tailwindcss" = {
        root_markers = [
          "package.json"
          "bun.lock"
        ];
        filetypes = [
          "astro"
          "svelte"
          "tsx"
          "jsx"
          "html"
          "vue"
        ];
        cmd = [
          "tailwindcss-language-server"
          "--stdio"
        ];
      };
      "ts_ls" = {
        root_markers = [
          "package.json"
          "bun.lock"
          "package-lock.json"
        ];
        filetypes = [
          "typescript"
          "javascript"
          "javascriptreact"
          "typescriptreact"
          "vue"
        ];
        cmd = [
          "bunx"
          "--bun"
          "typescript-language-server"
          "--stdio"
        ];
        # init_options = {
        # plugins = mkLuaInline ''
        #   {
        #     {
        #       name = "@vue/typescript-plugin",
        #       location = vim.fn.exepath("vue-language-server"),
        #       languages = { "vue" },
        #     }
        #   }
        # '';
        # };

Deletion in home/modules/editor/nvim/langs.nix at line 341 [11.24800]

B:BD[17.38] → [17.38:59]

B:BD[17.59] → [3.76:159]

∅:D[3.159] → [17.90:154]

B:BD[17.90] → [17.90:154]

∅:D[17.154] → [8.24566:24575]

B:BD[8.24566] → [8.24566:24575]


      "asm_lsp" = {
        filetypes = [
          "asm"
          "fasm"
          "nasm"
        ];
        cmd = [ "asm-lsp" ];
        root_markers = [ ".git" ];
      };

Deletion in home/modules/editor/nvim/langs.nix at line 342 [11.24800]
B:BD[11.25344] → [11.25344:25345]
B:BD[11.25345] → [8.24576:24632]
```
    languages = {
      enableTreesitter = true;
    };
```
Deletion in home/modules/editor/nvim/formatter.nix at line 4 [7.5553]
B:BD[7.5591] → [7.5591:5607]
```
    pkgs.stylua
```
Deletion in home/modules/editor/nvim/formatter.nix at line 6 [7.5553]
B:BD[7.5657] → [7.5657:5714]
```
    pkgs.nixfmt-rfc-style
    pkgs.nufmt
    pkgs.dprint
```

Deletion in home/modules/editor/nvim/formatter.nix at line 26 [7.5553]

B:BD[7.5882] → [7.5882:6388]

          astro = [
            "prettierd"
            "prettier"
          ];
          go = [
            "gofumpt"
            "goimports"
          ];
          javascript = [
            "prettierd"
            "prettier"
          ];
          javascriptreact = [
            "prettierd"
            "prettier"
          ];
          typescript = [
            "prettierd"
            "prettier"
          ];
          typescriptreact = [
            "prettierd"
            "prettier"
          ];

Deletion in home/modules/editor/nvim/formatter.nix at line 30 [7.5553]

B:BD[7.6467] → [7.6467:6548]

          svelte = [
            "prettierd"
            "prettier"
          ];

Deletion in home/modules/editor/nvim/formatter.nix at line 40 [7.5553]
∅:D[5.103] → [7.6765:6795]
B:BD[7.6765] → [7.6765:6795]
```
          lua = [ "stylua" ];
```

Deletion in home/modules/editor/nvim/formatter.nix at line 42 [7.5553]

B:BD[7.6862] → [7.6862:6954]

          rust = [ "rustfmt" ];
          # nu = [ "nufmt" ];
          nix = [ "nixfmt" ];

Replacement in home/modules/editor/nvim/default.nix at line 9 [7.7129]
B:BD[7.7265] → [7.7265:7300]
```
    ./lsp.nix
    ./highlights.nix
```
[7.7265]
[7.7300]
```
    ./langs.nix
```

better use of nvf built-ins for simplicity

Dependencies

In channels

Change contents

File deletion: highlights.nix, highlights.nix, highlights.nix

Insertion in home/modules/editor/nvim/plugins-nvf.nix at line 2 [9.347]

Insertion in home/modules/editor/nvim/plugins-nvf.nix at line 20 [9.347]

Replacement in home/modules/editor/nvim/plugins-nvf.nix at line 110 [9.347]

Deletion in home/modules/editor/nvim/plugins-nvf.nix at line 148 [9.347]

Replacement in home/modules/editor/nvim/plugins-custom.nix at line 1 [13.85]

Replacement in home/modules/editor/nvim/plugins-custom.nix at line 483 [13.85]

Deletion in home/modules/editor/nvim/plugins-custom.nix at line 558 [13.85]

File move: lsp.nix → langs.nix

Insertion in home/modules/editor/nvim/langs.nix at line 4 [11.24800]