End of year update

.github/workflows/ci.yml

@@ -9,19 +9,19 @@ jobs:
   stylua:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: JohnnyMorganz/stylua-action@v3
+      - uses: actions/checkout@v4
+      - uses: JohnnyMorganz/stylua-action@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          version: v0.17.1
+          version: v2.0.2
           args: --check .
 
   selene:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: NTBBloodbath/selene-action@v1.0.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          version: 0.25.0
+          version: 0.27.1
           args: --display-style=quiet .

Makefile

@@ -1,6 +1,6 @@
 MAKEFLAGS += --no-print-directory
 
-BANNER = \n \e[38;5;21m███\e[38;5;239m╗   \e[38;5;21m██\e[38;5;239m╗\e[38;5;21m███████\e[38;5;239m╗ \e[38;5;21m██████\e[38;5;239m╗ \e[38;5;46m██\e[38;5;239m╗   \e[38;5;46m██\e[38;5;239m╗\e[38;5;46m██\e[38;5;239m╗\e[38;5;46m███\e[38;5;239m╗   \e[38;5;46m███\e[38;5;239m╗\n \e[38;5;20m████\e[38;5;238m╗  \e[38;5;20m██\e[38;5;238m║\e[38;5;20m██\e[38;5;238m╔════╝\e[38;5;20m██\e[38;5;238m╔═══\e[38;5;20m██\e[38;5;238m╗\e[38;5;40m██\e[38;5;238m║   \e[38;5;40m██\e[38;5;238m║\e[38;5;40m██\e[38;5;238m║\e[38;5;40m████\e[38;5;238m╗ \e[38;5;40m████\e[38;5;238m║\n \e[38;5;19m██\e[38;5;237m╔\e[38;5;19m██\e[38;5;237m╗ \e[38;5;19m██\e[38;5;237m║\e[38;5;19m█████\e[38;5;237m╗  \e[38;5;19m██\e[38;5;237m║   \e[38;5;19m██\e[38;5;237m║\e[38;5;34m██\e[38;5;237m║   \e[38;5;34m██\e[38;5;237m║\e[38;5;34m██\e[38;5;237m║\e[38;5;34m██\e[38;5;237m╔\e[38;5;34m████\e[38;5;237m╔\e[38;5;34m██\e[38;5;237m║\n \e[38;5;18m██\e[38;5;236m║╚\e[38;5;18m██\e[38;5;236m╗\e[38;5;18m██\e[38;5;236m║\e[38;5;18m██\e[38;5;236m╔══╝  \e[38;5;18m██\e[38;5;236m║   \e[38;5;18m██\e[38;5;236m║╚\e[38;5;28m██\e[38;5;236m╗ \e[38;5;28m██\e[38;5;236m╔╝\e[38;5;28m██\e[38;5;236m║\e[38;5;28m██\e[38;5;236m║╚\e[38;5;28m██\e[38;5;236m╔╝\e[38;5;28m██\e[38;5;236m║\n \e[38;5;17m██\e[38;5;235m║ ╚\e[38;5;17m████\e[38;5;235m║\e[38;5;17m███████\e[38;5;235m╗╚\e[38;5;17m██████\e[38;5;235m╔╝ ╚\e[38;5;22m████\e[38;5;235m╔╝ \e[38;5;22m██\e[38;5;235m║\e[38;5;22m██\e[38;5;235m║ ╚═╝ \e[38;5;22m██\e[38;5;235m║\n \e[38;5;234m╚═╝  ╚═══╝╚══════╝ ╚═════╝   ╚═══╝  ╚═╝╚═╝     ╚═╝\e[0m
+BANNER = \n \e[38;2;4;116;179m███\e[38;5;239m╗   \e[38;2;4;116;179m██\e[38;5;239m╗\e[38;2;4;116;179m███████\e[38;5;239m╗ \e[38;2;4;116;179m██████\e[38;5;239m╗ \e[38;2;104;161;61m██\e[38;5;239m╗   \e[38;2;104;161;61m██\e[38;5;239m╗\e[38;2;104;161;61m██\e[38;5;239m╗\e[38;2;104;161;61m███\e[38;5;239m╗   \e[38;2;104;161;61m███\e[38;5;239m╗\n \e[38;2;4;104;161m████\e[38;5;238m╗  \e[38;2;4;104;161m██\e[38;5;238m║\e[38;2;4;104;161m██\e[38;5;238m╔════╝\e[38;2;4;104;161m██\e[38;5;238m╔═══\e[38;2;4;104;161m██\e[38;5;238m╗\e[38;2;94;145;55m██\e[38;5;238m║   \e[38;2;94;145;55m██\e[38;5;238m║\e[38;2;94;145;55m██\e[38;5;238m║\e[38;2;94;145;55m████\e[38;5;238m╗ \e[38;2;94;145;55m████\e[38;5;238m║\n \e[38;2;3;93;143m██\e[38;5;237m╔\e[38;2;3;93;143m██\e[38;5;237m╗ \e[38;2;3;93;143m██\e[38;5;237m║\e[38;2;3;93;143m█████\e[38;5;237m╗  \e[38;2;3;93;143m██\e[38;5;237m║   \e[38;2;3;93;143m██\e[38;5;237m║\e[38;2;83;129;49m██\e[38;5;237m║   \e[38;2;83;129;49m██\e[38;5;237m║\e[38;2;83;129;49m██\e[38;5;237m║\e[38;2;83;129;49m██\e[38;5;237m╔\e[38;2;83;129;49m████\e[38;5;237m╔\e[38;2;83;129;49m██\e[38;5;237m║\n \e[38;2;3;81;125m██\e[38;5;236m║╚\e[38;2;3;81;125m██\e[38;5;236m╗\e[38;2;3;81;125m██\e[38;5;236m║\e[38;2;3;81;125m██\e[38;5;236m╔══╝  \e[38;2;3;81;125m██\e[38;5;236m║   \e[38;2;3;81;125m██\e[38;5;236m║╚\e[38;2;73;113;43m██\e[38;5;236m╗ \e[38;2;73;113;43m██\e[38;5;236m╔╝\e[38;2;73;113;43m██\e[38;5;236m║\e[38;2;73;113;43m██\e[38;5;236m║╚\e[38;2;73;113;43m██\e[38;5;236m╔╝\e[38;2;73;113;43m██\e[38;5;236m║\n \e[38;2;2;70;107m██\e[38;5;235m║ ╚\e[38;2;2;70;107m████\e[38;5;235m║\e[38;2;2;70;107m███████\e[38;5;235m╗╚\e[38;2;2;70;107m██████\e[38;5;235m╔╝ ╚\e[38;2;62;97;37m████\e[38;5;235m╔╝ \e[38;2;62;97;37m██\e[38;5;235m║\e[38;2;62;97;37m██\e[38;5;235m║ ╚═╝ \e[38;2;62;97;37m██\e[38;5;235m║\n \e[38;5;234m╚═╝  ╚═══╝╚══════╝ ╚═════╝   ╚═══╝  ╚═╝╚═╝     ╚═╝\e[0m
 VERSION = $(shell nvim --version | head -n 1 | cut -d ' ' -f2)
 
 ROOT_DIR := $(shell dirname $(realpath $(firstword ${MAKEFILE_LIST})))
@@ -38,12 +38,13 @@ endif
 	@export MYVIMRC="${ROOT_DIR}/init.lua" && \
 	export XDG_CACHE_HOME="${TEMP_DIR}/.cache" && \
 	export XDG_CONFIG_HOME="${TEMP_DIR}/.config" && \
-	export XDG_LOCAL_HOME="${TEMP_DIR}/.local" && \
 	export XDG_DATA_HOME="${TEMP_DIR}/.local/share" && \
+	export XDG_LOCAL_HOME="${TEMP_DIR}/.local" && \
+	export XDG_STATE_HOME="${TEMP_DIR}/.local/state" && \
 	nvim # Launch nvim with patched xdg_dirs
 
 format: ## Run formatter: stylua
-	@stylua after/ lua/ init.lua
+	@stylua -v after/ lua/ init.lua
 
 lint: ## Run linter: selene
 	@selene after/ lua/ init.lua

after/colors/blue.lua

@@ -1,15 +1,59 @@
-local M = {}
+-- Define colors for builtin colorscheme: blue
 
-M.colors = {
+---@type config.Highlights
+return {
+  CursorLine = { ctermbg = 25, bg = "#003562" },
+  CursorLineFold = { link = "FoldColumn" },
+  CursorLineNr = { ctermfg = 87, fg = "#5fffff", bold = true },
+  CursorLineSign = { ctermbg = "none", bg = "none" },
+  EndOfBuffer = { ctermfg = 220, fg = "#ffd700" },
+  FloatBorder = { link = "WinSeparator" },
+  Folded = { ctermbg = 234, bg = "Grey11" },
+  LineNr = { ctermfg = 59, fg = "Grey37" },
+  MatchParen = { bg = "Grey37" },
+  MsgSeparator = { link = "WinSeparator" },
+  Normal = { ctermbg = "none", bg = "none" },
   NormalFloat = { link = "Normal" },
-  FloatBorder = { link = "VertSplit" },
-  CursorLinrNr = { bg = "none" },
-  EndOfBuffer = { fg = "DodgerBlue3" },
-  VertSplit = { bg = "none" },
-
-  DiffAdd = { bg = "none" },
-  DiffChange = { bg = "none" },
-  DiffDelete = { bg = "none" },
-}
+  PmenuSel = { ctermbg = 231, bg = "Turquoise4" },
+  Statement = { ctermfg = 177, fg = "Violet" },
+  VertSplit = { link = "WinSeparator" },
+  Visual = { ctermfg = 231, ctermbg = 30, fg = "none", bg = "Turquoise4" },
+  WinSeparator = { ctermfg = 30, fg = "#008787" },
+
+  -- Search
+  CurSearch = { link = "IncSearch" },
+
+  -- Diagnostics
+  DiagnosticError = { link = "Error" },
+  DiagnosticWarn = { link = "WarningMsg" },
+  Error = { ctermfg = 196, fg = "#bb4c4c" },
+  ErrorMsg = { link = "Error" },
+  NvimInternalError = { link = "Error" },
+  WarningMsg = { ctermfg = 209, fg = "#ff7f50" },
+
+  -- Git
+  Added = { ctermfg = 40, fg = "Green3" },
+  Changed = { ctermfg = 75, fg = "SteelBlue2" },
+  Removed = { ctermfg = 196, fg = "Red" },
 
-return M
+  -- Diff
+  DiffAdd = { ctermbg = 4, ctermfg = 40, fg = "none", bg = "#0a300a" },
+  DiffChange = { ctermbg = 5, ctermfg = 75, fg = "none", bg = "#002a4c" },
+  DiffDelete = { ctermbg = 131, ctermfg = 196, fg = "#bb4c4c", bg = "#301414" },
+  DiffText = { ctermfg = 16, ctermbg = 23, fg = "none", bg = "#005498" },
+
+  -- Rainbow Delimiter
+  RainbowDelimiterBlue = { ctermfg = 5, fg = "Blue", nocombine = true },
+  RainbowDelimiterCyan = { ctermfg = 6, fg = "Cyan", nocombine = true },
+  RainbowDelimiterGreen = { ctermfg = 2, fg = "Green", nocombine = true },
+  RainbowDelimiterOrange = { ctermfg = 214, fg = "Orange", nocombine = true },
+  RainbowDelimiterPink = { ctermfg = 218, fg = "Pink", nocombine = true },
+  RainbowDelimiterRed = { ctermfg = 1, fg = "Red", nocombine = true },
+  RainbowDelimiterViolet = { ctermfg = 5, fg = "Magenta", nocombine = true },
+  RainbowDelimiterYellow = { ctermfg = 3, fg = "Yellow", nocombine = true },
+
+  -- Neogit
+  NeogitDiffAdd = { ctermbg = 236, ctermfg = 40, bg = "#0a300a", fg = "Green3" },
+  NeogitDiffChange = { ctermbg = 236, ctermfg = 75, bg = "#002a4c" },
+  NeogitDiffDelete = { ctermbg = 234, ctermfg = 131, fg = "#bb4c4c", bg = "#301414" },
+}

after/colors/darkblue.lua

@@ -0,0 +1,62 @@
+-- Define colors for builtin colorscheme: darkblue
+
+---@type config.Highlights
+return {
+  CurSearch = { link = "IncSearch" },
+  CursorLine = { ctermbg = 236, bg = "Grey19" },
+  CursorLineFold = { ctermbg = "none", bg = "none" },
+  CursorLineNr = { ctermfg = 3, fg = "Yellow" },
+  CursorLineSign = { ctermbg = "none", bg = "none" },
+  Folded = { ctermbg = 234, bg = "Grey11" },
+  IncSearch = { ctermfg = 40, bg = "Green" },
+  LineNr = { ctermfg = 239, fg = "Grey30" },
+  MatchParen = { ctermbg = 241, bg = "Grey39" },
+  MsgSeparator = { link = "WinSeparator" },
+  NonText = { ctermfg = 27, fg = "DodgerBlue3" },
+  Normal = { ctermbg = "none", bg = "none" },
+  NormalFloat = { link = "Normal" },
+  Pmenu = { ctermbg = 105, bg = "#00004d" },
+  PmenuSel = { ctermbg = 59, bg = "Grey32" },
+  Statement = { ctermfg = 177, fg = "Violet" },
+  StatusLine = { ctermfg = 233, ctermbg = 18, fg = "Grey30", bg = "#000040" },
+  StatusLineNC = { ctermbg = 18, ctermfg = 239, fg = "Grey30", bg = "DarkBlue" },
+  VertSplit = { link = "WinSeparator" },
+  Visual = { ctermbg = 105, bg = "#000080" },
+  WinSeparator = { ctermfg = 239, fg = "Grey30" },
+
+  -- Diagnostics
+  DiagnosticError = { link = "Error" },
+  DiagnosticInfo = { ctermfg = 75, fg = "SteelBlue2" },
+  DiagnosticOk = { ctermfg = 40, fg = "Green3" },
+  DiagnosticWarn = { link = "WarningMsg" },
+  Error = { ctermfg = 196, fg = "#bb4c4c" },
+  ErrorMsg = { link = "Error" },
+  NvimInternalError = { link = "Error" },
+  WarningMsg = { ctermfg = 209, fg = "#ff7f50" },
+
+  -- Git
+  Added = { ctermfg = 40, fg = "Green3" },
+  Changed = { ctermfg = 75, fg = "SteelBlue2" },
+  Removed = { ctermfg = 196, fg = "Red" },
+
+  -- Diff
+  DiffAdd = { ctermbg = 4, ctermfg = 40, bg = "#0a300a" },
+  DiffChange = { ctermbg = 5, ctermfg = 75, bg = "#002a4c" },
+  DiffDelete = { ctermbg = 131, ctermfg = 196, fg = "#bb4c4c" },
+  DiffText = { ctermbg = 23, bg = "#005498" },
+
+  -- Rainbow Delimiter
+  RainbowDelimiterBlue = { ctermfg = 5, fg = "Blue", nocombine = true },
+  RainbowDelimiterCyan = { ctermfg = 6, fg = "Cyan", nocombine = true },
+  RainbowDelimiterGreen = { ctermfg = 2, fg = "Green", nocombine = true },
+  RainbowDelimiterOrange = { ctermfg = 214, fg = "Orange", nocombine = true },
+  RainbowDelimiterPink = { ctermfg = 218, fg = "Pink", nocombine = true },
+  RainbowDelimiterRed = { ctermfg = 1, fg = "Red", nocombine = true },
+  RainbowDelimiterViolet = { ctermfg = 5, fg = "Magenta", nocombine = true },
+  RainbowDelimiterYellow = { ctermfg = 3, fg = "Yellow", nocombine = true },
+
+  -- Neogit
+  NeogitDiffAdd = { ctermbg = 236, ctermfg = 40, bg = "#0a300a", fg = "Green3" },
+  NeogitDiffChange = { ctermbg = 236, ctermfg = 75, bg = "#002a4c" },
+  NeogitDiffDelete = { ctermbg = 234, ctermfg = 131, fg = "#bb4c4c", bg = "#301414" },
+}

after/colors/default.lua

@@ -1,34 +1,69 @@
-local M = {}
-
-M.colors = {
-  Normal = { bg = "none", fg = "Grey93" },
-  ColorColumn = { bg = "Gray10" },
-  CursorLineNr = { fg = "Gold", underline = false },
-  CursorLine = { bg = "Gray15" },
-  LineNr = { fg = "Gray30" },
-  NonText = { fg = "Gray15" },
-  SignColumn = { bg = "none" },
-  VertSplit = { fg = "Gray27" },
-  FloatBorder = { fg = "Gray" },
-  Visual = { bg = "Gray20" },
-
-  DiffAdd = { link = "Type" },
-  DiffChange = { link = "Statement" },
-  DiffDelete = { fg = "Red", bg = "none" },
-
-  -- Telescope
-  TelescopeNormal = { link = "Normal" },
-  TelescopePreviewBorder = { fg = "Gray" },
-  TelescopePromptBorder = { fg = "Gray" },
-  TelescopeResultsBorder = { fg = "Gray" },
-  TelescopeSelection = { bg = "Gray23" },
-
-  -- Indent Blankline
-  IndentBlanklineChar = { link = "LineNr" },
-
-  -- Whichkey
-  WhichKey = { link = "Define" },
-  -- WhichKeyFloat = { bg = "none" },
+-- Define colors for builtin colorscheme: default
+
+---@type config.Highlights
+local colors = {
+  ColorColumn = { ctermbg = 24, bg = "NvimDarkBlue" },
+  Constant = { ctermfg = 217, fg = "NvimLightRed" },
+  CursorLineNr = { ctermfg = 222, fg = "NvimLightYellow", bold = true },
+  Error = { ctermfg = 217, fg = "NvimLightRed" },
+  ErrorMsg = { ctermfg = 217, ctermbg = 9, fg = "NvimLightRed", bg = "NvimDarkRed" },
+  FloatBorder = { link = "WinSeparator" },
+  Folded = { ctermbg = 234, bg = "NvimDarkGrey2" },
+  MsgSeparator = { link = "WinSeparator" },
+  Normal = { ctermfg = 253, fg = "NvimLightGrey2" },
+  PmenuSel = { ctermbg = 254, ctermfg = 16, bg = "Grey15", fg = "none" },
+  Statement = { ctermfg = 177, fg = "Violet" },
+  StatusLine = { ctermbg = "none", bg = "none" },
+  Title = { link = "Special" },
+  Type = { ctermfg = 153, fg = "NvimLightBlue" },
+  VertSplit = { link = "WinSeparator" },
+  WinBar = { link = "Normal" },
+  WinBarNC = { link = "Normal" },
+  WinSeparator = { ctermfg = 237, fg = "NvimDarkGrey4" },
+  QuickfixLine = { link = "PmenuSel" },
+
+  -- Git
+  Added = { ctermfg = 157, fg = "NvimLightGreen", bold = true },
+  Changed = { ctermfg = 222, fg = "NvimLightYellow", bold = true },
+  Removed = { ctermfg = 217, fg = "NvimLightRed", bold = true },
+
+  -- Diff
+  DiffAdd = { ctermbg = 236, ctermfg = 40, bg = "NvimDarkGreen" },
+  DiffChange = { ctermbg = 236, ctermfg = 75, bg = "NvimDarkBlue" },
+  DiffDelete = { ctermbg = 236, ctermfg = 196, fg = "NvimLightRed" },
+  DiffText = { ctermbg = 236, bg = "Grey19" },
+
+  -- LSP
+  ["@lsp.mod.defaultLibrary.lua"] = { link = "@namespace" },
+  ["@lsp.mod.global.lua"] = { ctermfg = 217, fg = "NvimLightRed" },
+
+  -- Treesitter
+  ["@string.special.url"] = { ctermfg = 153, fg = "NvimLightBlue", underline = true },
+  ["@variable"] = { link = "Identifier" },
+
+  -- Rainbow Delimiters
+  RainbowDelimiterBlue = { ctermfg = 153, fg = "NvimLightBlue", nocombine = true },
+  RainbowDelimiterCyan = { ctermfg = 123, fg = "NvimLightCyan", nocombine = true },
+  RainbowDelimiterGreen = { ctermfg = 157, fg = "NvimLightGreen", nocombine = true },
+  RainbowDelimiterOrange = { ctermfg = 214, fg = "Orange", nocombine = true },
+  RainbowDelimiterPink = { ctermfg = 209, fg = "Salmon", nocombine = true },
+  RainbowDelimiterRed = { ctermfg = 217, fg = "NvimLightRed", nocombine = true },
+  RainbowDelimiterViolet = { ctermfg = 211, fg = "PaleVioletRed1", nocombine = true },
+  RainbowDelimiterYellow = { ctermfg = 222, fg = "NvimLightYellow", nocombine = true },
 }
 
-return M
+-- Neovim 0.10+ introduces a new default colorscheme.
+-- In older versions, `default` refers to the old scheme, now renamed `vim` in newer versions.
+-- Support older versions by loading the appropriate color definitions.
+if vim.fn.has("nvim-0.10") == 0 then
+  colors = require("after.colors.vim")
+end
+
+-- Don't modify Normal if background is set to light mode.
+if vim.o.background == "light" then
+  colors.Constant = { fg = "NvimDarkRed" }
+  colors.Normal = nil
+  colors.Statement = { fg = "DarkViolet", bold = true }
+end
+
+return colors

after/colors/delek.lua

@@ -1,17 +1,18 @@
-local M = {}
+-- Define colors for builtin colorscheme: delek
 
-M.colors = {
-  FloatBorder = { link = "VertSplit" },
+---@type config.Highlights
+return {
+  FloatBorder = { link = "WinSeparator" },
   NonText = { fg = "Gray15" },
   SignColumn = { bg = "none" },
-  VertSplit = { fg = "Gray" },
+  WinSeparator = { fg = "Gray" },
+  VertSplit = { link = "WinSeparator" },
 
+  -- Git
   DiffAdd = { fg = "Green", bg = "none" },
   DiffChange = { fg = "Yellow", bg = "none" },
   DiffDelete = { fg = "Red", bg = "none" },
 
   -- Telescope
   TelescopeNormal = { bg = "none" },
 }
-
-return M