From 2702caf35222e6824f02e08a29415a6f1618c979 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Tue, 3 Feb 2026 21:46:43 -0500 Subject: [PATCH 01/13] fix: add deprecation warning for setup() --- lua/midnight/init.lua | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lua/midnight/init.lua b/lua/midnight/init.lua index 50a83ba..1ed25ca 100644 --- a/lua/midnight/init.lua +++ b/lua/midnight/init.lua @@ -17,4 +17,17 @@ function M.load() theme.apply() end +---@deprecated Use `vim.cmd('colorscheme midnight')` instead +function M.setup(opts) + vim.deprecate( + 'require("midnight").setup()', + 'vim.cmd("colorscheme midnight")', + 'v0.1.0', + 'midnight.nvim', + false + ) + + M.load() +end + return M From 94a373f416f2b9ff3a720fbbc59e1229414e5cab Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Tue, 3 Feb 2026 21:51:55 -0500 Subject: [PATCH 02/13] fix: mark opts as intentionally unused --- lua/midnight/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/midnight/init.lua b/lua/midnight/init.lua index 1ed25ca..1055fda 100644 --- a/lua/midnight/init.lua +++ b/lua/midnight/init.lua @@ -18,7 +18,7 @@ function M.load() end ---@deprecated Use `vim.cmd('colorscheme midnight')` instead -function M.setup(opts) +function M.setup(_opts) vim.deprecate( 'require("midnight").setup()', 'vim.cmd("colorscheme midnight")', From 517837c9d36c5ab5c4b22e695359f9b9a4ad0879 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 4 Feb 2026 15:58:07 -0500 Subject: [PATCH 03/13] feat: add treesitter highlights for diff files Adds support for treesitter-based diff syntax highlighting: - @diff.minus (red) and @diff.plus (green) for changed lines - @attribute.diff (blue) for hunk headers - @string.special.path and @variable.parameter linked to Normal --- lua/midnight/theme.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lua/midnight/theme.lua b/lua/midnight/theme.lua index 25a7a15..d4dffb7 100644 --- a/lua/midnight/theme.lua +++ b/lua/midnight/theme.lua @@ -145,7 +145,10 @@ function M.apply() hi('gitCommitSummary', { fg = cs.background }) - hi('@attribute.diff', { fg = cs.background }) + hi('@attribute.diff', { fg = cs.blue }) + hi('@diff.minus', { fg = cs.red }) + hi('@diff.plus', { fg = cs.green }) + link('Normal', { '@string.special.path', '@variable.parameter' }) hi('DiffAdd', { bg = cs.diff_add, fg = cs.green }, { '@text.diff.add', 'diffAdded' }) hi('DiffDelete', { bg = cs.diff_delete, fg = cs.red }, { '@text.diff.delete', 'diffRemoved' }) hi('DiffChange', { bg = cs.diff_change, fg = cs.blue }) From f28ffed8d94db0ea3e708b510f8c1c131e45d9c4 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 4 Feb 2026 16:01:18 -0500 Subject: [PATCH 04/13] fix(ci): remove python --- .github/workflows/quality.yaml | 47 ---------------------------------- .pre-commit-config.yaml | 20 --------------- 2 files changed, 67 deletions(-) diff --git a/.github/workflows/quality.yaml b/.github/workflows/quality.yaml index d7be890..dcf74d2 100644 --- a/.github/workflows/quality.yaml +++ b/.github/workflows/quality.yaml @@ -11,7 +11,6 @@ jobs: runs-on: ubuntu-latest outputs: lua: ${{ steps.changes.outputs.lua }} - python: ${{ steps.changes.outputs.python }} markdown: ${{ steps.changes.outputs.markdown }} steps: - uses: actions/checkout@v4 @@ -25,10 +24,6 @@ jobs: - '*.lua' - '.luarc.json' - '*.toml' - python: - - 'scripts/**/*.py' - - 'pyproject.toml' - - 'uv.lock' markdown: - '*.md' @@ -72,48 +67,6 @@ jobs: directories: lua configpath: .luarc.json - python-format: - name: Python Format Check - runs-on: ubuntu-latest - needs: changes - if: ${{ needs.changes.outputs.python == 'true' }} - steps: - - uses: actions/checkout@v4 - - name: Install uv - uses: astral-sh/setup-uv@v4 - - name: Install ruff - run: uv tool install ruff - - name: Check Python formatting with ruff - run: ruff format --check . - - python-lint: - name: Python Lint Check - runs-on: ubuntu-latest - needs: changes - if: ${{ needs.changes.outputs.python == 'true' }} - steps: - - uses: actions/checkout@v4 - - name: Install uv - uses: astral-sh/setup-uv@v4 - - name: Install ruff - run: uv tool install ruff - - name: Lint Python files with ruff - run: ruff check . - - python-typecheck: - name: Python Type Check - runs-on: ubuntu-latest - needs: changes - if: ${{ needs.changes.outputs.python == 'true' }} - steps: - - uses: actions/checkout@v4 - - name: Install uv - uses: astral-sh/setup-uv@v4 - - name: Install dependencies with mypy - run: uv sync --dev - - name: Type check Python files with mypy - run: uv run mypy . - markdown-format: name: Markdown Format Check runs-on: ubuntu-latest diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4706ce4..3477598 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,26 +9,6 @@ repos: files: \.lua$ pass_filenames: true - - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.14.3 - hooks: - - id: ruff-format - name: ruff (format) - files: \.py$ - - id: ruff - name: ruff (lint imports) - args: ['--fix', '--select=I'] - files: \.py$ - - - repo: local - hooks: - - id: mypy - name: mypy (type check) - entry: uv run mypy - language: system - args: ['.'] - pass_filenames: false - - repo: https://github.com/pre-commit/mirrors-prettier rev: v4.0.0-alpha.8 hooks: From 9ff64a7b89d01579b2edd11047e0f586188d2283 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Thu, 5 Feb 2026 00:39:22 -0500 Subject: [PATCH 05/13] misc highlight fixes --- lua/midnight/theme.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lua/midnight/theme.lua b/lua/midnight/theme.lua index d4dffb7..c32d23c 100644 --- a/lua/midnight/theme.lua +++ b/lua/midnight/theme.lua @@ -148,6 +148,9 @@ function M.apply() hi('@attribute.diff', { fg = cs.blue }) hi('@diff.minus', { fg = cs.red }) hi('@diff.plus', { fg = cs.green }) + hi('@diff.delta', { fg = cs.blue }) + hi('@punctuation.special.diff', { fg = cs.blue }) + link('Normal', { '@string.special.path', '@variable.parameter' }) hi('DiffAdd', { bg = cs.diff_add, fg = cs.green }, { '@text.diff.add', 'diffAdded' }) hi('DiffDelete', { bg = cs.diff_delete, fg = cs.red }, { '@text.diff.delete', 'diffRemoved' }) From 130a1899c2d5a0af431f3e41eeac429e90ea1d09 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Tue, 10 Feb 2026 13:44:36 -0500 Subject: [PATCH 06/13] fix: recursion loading random issue --- lua/midnight/init.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lua/midnight/init.lua b/lua/midnight/init.lua index 1055fda..670aaeb 100644 --- a/lua/midnight/init.lua +++ b/lua/midnight/init.lua @@ -1,7 +1,12 @@ local M = {} +local loading = false + ---@return nil function M.load() + if loading then return end + loading = true + if vim.g.colors_name then vim.cmd('hi clear') end @@ -15,6 +20,8 @@ function M.load() local theme = require('midnight.theme') theme.apply() + + loading = false end ---@deprecated Use `vim.cmd('colorscheme midnight')` instead From fc03b940ded5682665278894b45c23559221264a Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Tue, 17 Feb 2026 19:24:25 -0500 Subject: [PATCH 07/13] fix: format lua and highlight latex functions --- lua/midnight/init.lua | 4 +++- lua/midnight/theme.lua | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lua/midnight/init.lua b/lua/midnight/init.lua index 670aaeb..41d066f 100644 --- a/lua/midnight/init.lua +++ b/lua/midnight/init.lua @@ -4,7 +4,9 @@ local loading = false ---@return nil function M.load() - if loading then return end + if loading then + return + end loading = true if vim.g.colors_name then diff --git a/lua/midnight/theme.lua b/lua/midnight/theme.lua index c32d23c..a4d786f 100644 --- a/lua/midnight/theme.lua +++ b/lua/midnight/theme.lua @@ -165,6 +165,8 @@ function M.apply() hi('@constructor.lua', { fg = cs.background }) hi('@markup.heading.gitcommit', { none = true }) + hi('@function.latex', { fg = cs.blue }) + hi('GitSignsCurrentLineBlame', { italic = true, fg = cs.light_black }) link('DiffAdd', 'GitSignsAdd') link('DiffChange', 'GitSignsChange') From 638a9e65f30e2d49a9fec231bef91a34aca9f0a2 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 18 Feb 2026 11:21:58 -0500 Subject: [PATCH 08/13] fix: use plain background for gitsigns highlights Problem: gitsigns groups were linked to DiffAdd/DiffChange/DiffDelete, which have tinted backgrounds that look out of place in the sign column. Solution: define GitSignsAdd, GitSignsChange, and GitSignsDelete with foreground-only highlights so they inherit the normal background. --- lua/midnight/theme.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/midnight/theme.lua b/lua/midnight/theme.lua index a4d786f..e039454 100644 --- a/lua/midnight/theme.lua +++ b/lua/midnight/theme.lua @@ -168,9 +168,9 @@ function M.apply() hi('@function.latex', { fg = cs.blue }) hi('GitSignsCurrentLineBlame', { italic = true, fg = cs.light_black }) - link('DiffAdd', 'GitSignsAdd') - link('DiffChange', 'GitSignsChange') - link('DiffDelete', 'GitSignsDelete') + hi('GitSignsAdd', { fg = cs.green }) + hi('GitSignsChange', { fg = cs.blue }) + hi('GitSignsDelete', { fg = cs.red }) link('Search', 'HighlightUndo') From 7891879b4e7ba183f377369beb094450d115bb4b Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Fri, 20 Feb 2026 20:18:23 -0500 Subject: [PATCH 09/13] feat: blink-cmp-git integration --- lua/midnight/theme.lua | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/lua/midnight/theme.lua b/lua/midnight/theme.lua index e039454..1fbfa02 100644 --- a/lua/midnight/theme.lua +++ b/lua/midnight/theme.lua @@ -121,9 +121,13 @@ function M.apply() hi('@variable', { none = true }) - hi('Pmenu', { bg = cs.dark_grey }, { 'PmenuSbar' }) + hi('Pmenu', { fg = cs.background, bg = cs.foreground }, { 'PmenuSbar' }) hi('PmenuSel', { bg = cs.med_grey }) hi('PmenuThumb', { bg = cs.grey }) + hi('BlinkCmpMenu', { fg = cs.background, bg = cs.foreground }) + hi('BlinkCmpMenuBorder', { fg = cs.background, bg = cs.foreground }) + hi('BlinkCmpDoc', { fg = cs.background, bg = cs.foreground }) + hi('BlinkCmpDocBorder', { fg = cs.background, bg = cs.foreground }) hi('LspInlayHint', { fg = cs.light_black }) hi('LspSignatureActiveParameter', { underline = true, italic = true }) @@ -179,6 +183,23 @@ function M.apply() hi('CmpItemAbbr', { fg = cs.background }) hi('CmpItemAbbrMatch', { fg = cs.background, bold = true }) hi('CmpItemAbbrMatchFuzzy', { fg = cs.background, bold = true }) + hi('BlinkCmpLabelMatch', { fg = cs.green }) + hi('BlinkCmpGhostText', { fg = cs.light_black }) + hi('BlinkCmpGitKindMR', { fg = cs.magenta }) + hi('BlinkCmpGitKindPR', { fg = cs.magenta }) + hi('BlinkCmpGitKindIssue', { fg = cs.magenta }) + hi('BlinkCmpGitKindCommit', { fg = cs.magenta }) + hi('BlinkCmpGitKindMention', { fg = cs.magenta }) + hi('BlinkCmpGitKindIconMR', { fg = cs.magenta }) + hi('BlinkCmpGitKindIconPR', { fg = cs.magenta }) + hi('BlinkCmpGitKindIconIssue', { fg = cs.magenta }) + hi('BlinkCmpGitKindIconCommit', { fg = cs.magenta }) + hi('BlinkCmpGitKindIconMention', { fg = cs.magenta }) + hi('BlinkCmpGitLabelMRId', { fg = cs.magenta }) + hi('BlinkCmpGitLabelPRId', { fg = cs.magenta }) + hi('BlinkCmpGitLabelIssueId', { fg = cs.magenta }) + hi('BlinkCmpGitLabelCommitId', { fg = cs.magenta }) + hi('BlinkCmpGitLabelMentionId', { fg = cs.magenta }) hi('CmpItemAbbrDeprecated', { fg = cs.light_black, strikethrough = true }) hi('CmpItemMenu', { fg = cs.light_black }) From f52dd06c2660ef66ee8c5aef59f08411410e55b9 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Mon, 23 Feb 2026 17:35:26 -0500 Subject: [PATCH 10/13] build(flake): add nix devShell Problem: no nix dev shell existed, making it harder to get local tooling for formatting, linting, and type checking. Solution: add a flake with a devShell providing prettier, stylua, selene, and lua-language-server. --- flake.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 flake.nix diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..8589f5a --- /dev/null +++ b/flake.nix @@ -0,0 +1,30 @@ +{ + description = "midnight.nvim — a dark colorscheme for Neovim"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + systems.url = "github:nix-systems/default"; + }; + + outputs = + { + nixpkgs, + systems, + ... + }: + let + forEachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system}); + in + { + devShells = forEachSystem (pkgs: { + default = pkgs.mkShell { + packages = [ + pkgs.prettier + pkgs.stylua + pkgs.selene + pkgs.lua-language-server + ]; + }; + }); + }; +} From af0a44bec80ed1fb1ff0dbcd3f3336ef8750ec8a Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Mon, 23 Feb 2026 18:14:20 -0500 Subject: [PATCH 11/13] ci: migrate to nix --- .github/workflows/quality.yaml | 29 ++++++----------------- .gitignore | 3 +++ .luarc.json | 2 +- flake.lock | 43 ++++++++++++++++++++++++++++++++++ selene.toml | 3 +++ vim.toml | 30 ------------------------ vim.yaml | 24 +++++++++++++++++++ 7 files changed, 81 insertions(+), 53 deletions(-) create mode 100644 flake.lock delete mode 100644 vim.toml create mode 100644 vim.yaml diff --git a/.github/workflows/quality.yaml b/.github/workflows/quality.yaml index dcf74d2..e43f71c 100644 --- a/.github/workflows/quality.yaml +++ b/.github/workflows/quality.yaml @@ -24,6 +24,7 @@ jobs: - '*.lua' - '.luarc.json' - '*.toml' + - 'vim.yaml' markdown: - '*.md' @@ -34,11 +35,8 @@ jobs: if: ${{ needs.changes.outputs.lua == 'true' }} steps: - uses: actions/checkout@v4 - - uses: JohnnyMorganz/stylua-action@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - version: 2.1.0 - args: --check . + - uses: cachix/install-nix-action@v31 + - run: nix develop --command stylua --check . lua-lint: name: Lua Lint Check @@ -47,11 +45,8 @@ jobs: if: ${{ needs.changes.outputs.lua == 'true' }} steps: - uses: actions/checkout@v4 - - name: Lint with Selene - uses: NTBBloodbath/selene-action@v1.0.0 - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --display-style quiet . + - uses: cachix/install-nix-action@v31 + - run: nix develop --command selene --display-style quiet . lua-typecheck: name: Lua Type Check @@ -74,15 +69,5 @@ jobs: if: ${{ needs.changes.outputs.markdown == 'true' }} steps: - uses: actions/checkout@v4 - - name: Setup pnpm - uses: pnpm/action-setup@v4 - with: - version: 8 - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: '20' - - name: Install prettier - run: pnpm add -g prettier@3.1.0 - - name: Check markdown formatting with prettier - run: prettier --check . + - uses: cachix/install-nix-action@v31 + - run: nix develop --command prettier --check . diff --git a/.gitignore b/.gitignore index 7451084..d13bcc9 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ venv/ CLAUDE.md __pycache__ node_modules/ + +.direnv/ +.envrc diff --git a/.luarc.json b/.luarc.json index 3ccfeda..19558f6 100644 --- a/.luarc.json +++ b/.luarc.json @@ -1,5 +1,5 @@ { - "runtime.version": "Lua 5.1", + "runtime.version": "LuaJIT", "runtime.path": ["lua/?.lua", "lua/?/init.lua"], "diagnostics.globals": ["vim"], "workspace.library": ["$VIMRUNTIME/lua", "${3rd}/luv/library"], diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..b6f667a --- /dev/null +++ b/flake.lock @@ -0,0 +1,43 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1771423170, + "narHash": "sha256-K7Dg9TQ0mOcAtWTO/FX/FaprtWQ8BmEXTpLIaNRhEwU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bcc4a9d9533c033d806a46b37dc444f9b0da49dd", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs", + "systems": "systems" + } + }, + "systems": { + "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", + "version": 7 +} diff --git a/selene.toml b/selene.toml index 96cf5ab..f2ada4b 100644 --- a/selene.toml +++ b/selene.toml @@ -1 +1,4 @@ std = 'vim' + +[lints] +bad_string_escape = 'allow' diff --git a/vim.toml b/vim.toml deleted file mode 100644 index 8bf26ea..0000000 --- a/vim.toml +++ /dev/null @@ -1,30 +0,0 @@ -[selene] -base = "lua51" -name = "vim" - -[vim] -any = true - -[jit] -any = true - -[assert] -any = true - -[describe] -any = true - -[it] -any = true - -[before_each] -any = true - -[after_each] -any = true - -[spy] -any = true - -[stub] -any = true diff --git a/vim.yaml b/vim.yaml new file mode 100644 index 0000000..401fce6 --- /dev/null +++ b/vim.yaml @@ -0,0 +1,24 @@ +--- +base: lua51 +name: vim +lua_versions: + - luajit +globals: + vim: + any: true + jit: + any: true + assert: + any: true + describe: + any: true + it: + any: true + before_each: + any: true + after_each: + any: true + spy: + any: true + stub: + any: true From 6b1ba1f056743c91812c770da7086e69001ac9a3 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 4 Mar 2026 13:50:44 -0500 Subject: [PATCH 12/13] ci: scripts + format --- .luarc.json | 1 + .styluaignore | 1 + scripts/ci.sh | 7 +++++++ vim.yaml | 2 ++ 4 files changed, 11 insertions(+) create mode 100644 .styluaignore create mode 100755 scripts/ci.sh diff --git a/.luarc.json b/.luarc.json index 19558f6..e240dd5 100644 --- a/.luarc.json +++ b/.luarc.json @@ -4,5 +4,6 @@ "diagnostics.globals": ["vim"], "workspace.library": ["$VIMRUNTIME/lua", "${3rd}/luv/library"], "workspace.checkThirdParty": false, + "workspace.ignoreDir": [".direnv"], "completion.callSnippet": "Replace" } diff --git a/.styluaignore b/.styluaignore new file mode 100644 index 0000000..9b42106 --- /dev/null +++ b/.styluaignore @@ -0,0 +1 @@ +.direnv/ diff --git a/scripts/ci.sh b/scripts/ci.sh new file mode 100755 index 0000000..7b5f52b --- /dev/null +++ b/scripts/ci.sh @@ -0,0 +1,7 @@ +#!/bin/sh +set -eu + +nix develop --command stylua --check . +git ls-files '*.lua' | xargs nix develop --command selene --display-style quiet +nix develop --command prettier --check . +nix develop --command lua-language-server --check . --checklevel=Warning diff --git a/vim.yaml b/vim.yaml index 401fce6..3821d25 100644 --- a/vim.yaml +++ b/vim.yaml @@ -22,3 +22,5 @@ globals: any: true stub: any: true + bit: + any: true From 26fb9ca518cc0353bc1f967bfc34ebcc51e0d076 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 4 Mar 2026 14:12:41 -0500 Subject: [PATCH 13/13] ci: nix --- flake.nix | 5 ++++- scripts/ci.sh | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 8589f5a..18752aa 100644 --- a/flake.nix +++ b/flake.nix @@ -13,9 +13,12 @@ ... }: let - forEachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system}); + forEachSystem = + f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system}); in { + formatter = forEachSystem (pkgs: pkgs.nixfmt-tree); + devShells = forEachSystem (pkgs: { default = pkgs.mkShell { packages = [ diff --git a/scripts/ci.sh b/scripts/ci.sh index 7b5f52b..18dc321 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -4,4 +4,6 @@ set -eu nix develop --command stylua --check . git ls-files '*.lua' | xargs nix develop --command selene --display-style quiet nix develop --command prettier --check . +nix fmt +git diff --exit-code -- '*.nix' nix develop --command lua-language-server --check . --checklevel=Warning