Skip to content

Commit 35883e4

Browse files
aparkerdavidaparkerdavid
committed
more emacs
1 parent f7a0906 commit 35883e4

File tree

1 file changed

+71
-17
lines changed

1 file changed

+71
-17
lines changed

‎lua/zenbones/shipwright/runners/emacs.lua

Lines changed: 71 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ local face_mappings = {
2424
match = specs.Search,
2525
isearch = specs.CurSearch,
2626
warning = specs.WarningMsg,
27+
["completions-common-part"] = specs.Search,
28+
["corfu-current"] = specs.Visual,
2729
["mode-line"] = specs.StatusLine,
30+
["header-line"] = specs.StatusLineNC,
2831
["mode-line-inactive"] = specs.StatusLineNC,
2932
["ansi-color-bright-red"] = {fg = term.bright_red, bg = term.bright_red},
3033
["ansi-color-bright-blue"] = {fg = term.bright_blue, bg = term.bright_blue},
@@ -34,6 +37,57 @@ local face_mappings = {
3437
["ansi-color-bright-yellow"] = {fg = term.bright_yellow, bg = term.bright_yellow},
3538
["ansi-color-bright-white"] = {fg = term.bright_white, bg = term.bright_white},
3639
["ansi-color-bright-black"] = {fg = term.bright_black, bg = term.bright_black},
40+
41+
["eshell-ls-backup"] = {fg = term.green},
42+
["eshell-ls-archive"] = {fg = term.bright_blue},
43+
["eshell-ls-clutter"] = {fg = term.cyan},
44+
["eshell-ls-missing"] = {fg = term.red},
45+
["eshell-ls-product"] = {fg = term.bright_yellow},
46+
["eshell-ls-special"] = {fg = term.yellow},
47+
["eshell-ls-symlink"] = {fg = term.bright_cyan},
48+
["eshell-ls-readonly"] = {fg = term.bright_red},
49+
["eshell-ls-directory"] = {fg = term.blue},
50+
["eshell-ls-executable"] = {fg = term.bright_green},
51+
["eshell-ls-unreadable"] = {fg = term.magenta},
52+
53+
["nerd-icons-red"] = { fg = term.red },
54+
["nerd-icons-blue"] = { fg = term.blue },
55+
["nerd-icons-cyan"] = { fg = term.cyan },
56+
["nerd-icons-dred"] = { fg = term.red },
57+
["nerd-icons-lred"] = { fg = term.red },
58+
["nerd-icons-pink"] = { fg = term.magenta },
59+
["nerd-icons-dblue"] = { fg = term.bright_blue },
60+
["nerd-icons-dcyan"] = { fg = term.bright_cyan },
61+
["nerd-icons-dpink"] = { fg = term.magenta },
62+
["nerd-icons-green"] = { fg = term.green },
63+
["nerd-icons-lblue"] = { fg = term.blue },
64+
["nerd-icons-lcyan"] = { fg = term.cyan },
65+
["nerd-icons-lpink"] = { fg = term.magenta },
66+
["nerd-icons-dgreen"] = { fg = term.bright_green },
67+
["nerd-icons-lgreen"] = { fg = term.green },
68+
["nerd-icons-maroon"] = { fg = term.magenta },
69+
["nerd-icons-orange"] = { fg = term.yellow },
70+
["nerd-icons-purple"] = { fg = term.magenta },
71+
["nerd-icons-silver"] = { fg = term.white },
72+
["nerd-icons-yellow"] = { fg = term.yellow },
73+
["nerd-icons-dmaroon"] = { fg = term.magenta },
74+
["nerd-icons-dorange"] = { fg = term.yellow },
75+
["nerd-icons-dpurple"] = { fg = term.magenta },
76+
["nerd-icons-dsilver"] = { fg = term.bright_white },
77+
["nerd-icons-dyellow"] = { fg = term.bright_yellow },
78+
["nerd-icons-lmaroon"] = { fg = term.magenta },
79+
["nerd-icons-lorange"] = { fg = term.yellow },
80+
["nerd-icons-lpurple"] = { fg = term.magenta },
81+
["nerd-icons-lsilver"] = { fg = term.white },
82+
["nerd-icons-lyellow"] = { fg = term.yellow },
83+
["nerd-icons-red-alt"] = { fg = term.red },
84+
["nerd-icons-blue-alt"] = { fg = term.blue },
85+
["nerd-icons-cyan-alt"] = { fg = term.cyan },
86+
["nerd-icons-purple-alt"] = { fg = term.magenta },
87+
88+
["sh-heredoc"] = specs.String,
89+
["sh-quoted-exec"] = specs.Normal,
90+
3791
["ansi-color-red"] = {fg = term.red, bg = term.red},
3892
["ansi-color-blue"] = {fg = term.blue, bg = term.blue},
3993
["ansi-color-green"] = {fg = term.green, bg = term.green},
@@ -88,26 +142,26 @@ local face_mappings = {
88142
["font-lock-type-face"] = specs.Type,
89143
["font-lock-preprocessor-face"] = specs.PreProc,
90144
["rainbow-delimiters-base-face"] = specs.Delimiter,
91-
["rainbow-delimiters-depth-1-face"] = {fg = specs.Comment.fg},
92-
["rainbow-delimiters-depth-2-face"] = {fg = term.blue},
93-
["rainbow-delimiters-depth-3-face"] = {fg = term.bright_magenta},
94-
["rainbow-delimiters-depth-4-face"] = {fg = term.bright_cyan},
95-
["rainbow-delimiters-depth-5-face"] = {fg = term.yellow},
96-
["rainbow-delimiters-depth-8-face"] = {fg = term.cyan},
97-
["rainbow-delimiters-depth-7-face"] = {fg = term.red},
98-
["rainbow-delimiters-depth-9-face"] = {fg = term.magenta},
99-
["rainbow-delimiters-depth-6-face"] = {fg = term.green},
145+
["rainbow-delimiters-depth-1-face"] = {fg = specs.LineNr.fg.mix(specs.Normal.fg, 50)},
146+
["rainbow-delimiters-depth-2-face"] = {fg = term.bright_magenta},
147+
["rainbow-delimiters-depth-3-face"] = {fg = term.blue},
148+
["rainbow-delimiters-depth-4-face"] = {fg = term.yellow},
149+
["rainbow-delimiters-depth-5-face"] = {fg = term.red},
150+
["rainbow-delimiters-depth-6-face"] = {fg = term.cyan},
151+
["rainbow-delimiters-depth-7-face"] = {fg = term.magenta},
152+
["rainbow-delimiters-depth-8-face"] = {fg = term.green},
153+
["rainbow-delimiters-depth-9-face"] = {fg = term.bright_red},
100154
["rainbow-delimiters-base-error-face"] = specs.DiagnosticVirtualTextError,
101155
["magit-section-highlight"] = specs.CursorLine,
102-
["diff-hl-delete"] = { fg = specs.DiffDelete.bg, bg = specs.DiffDelete.bg },
103-
["diff-hl-insert"] = { fg = specs.DiffAdd.bg, bg = specs.DiffAdd.bg },
104-
["diff-hl-change"] = { fg = specs.DiffChange.bg, bg = specs.DiffChange.bg },
156+
["diff-hl-delete"] = { fg = specs.DiffDelete.bg.mix(specs.GitSignsDelete.fg, 50), bg = specs.DiffDelete.bg.mix(specs.GitSignsDelete.fg, 50) },
157+
["diff-hl-insert"] = { fg = specs.DiffAdd.bg.mix(specs.GitSignsAdd.fg, 50), bg = specs.DiffAdd.bg.mix(specs.GitSignsAdd.fg, 50) },
158+
["diff-hl-change"] = { fg = specs.DiffChange.bg.mix(specs.GitSignsChange.fg, 50), bg = specs.DiffChange.bg.mix(specs.GitSignsChange.fg, 50) },
105159
["magit-diff-removed"] = specs.DiffDelete,
106-
["magit-diff-removed-highlight"] = {bg = specs.DiffDelete.bg, fg = term.red},
160+
["magit-diff-removed-highlight"] = {bg = specs.DiffDelete.bg, fg = specs.GitSignsDelete.fg},
107161
["magit-diff-added"] = specs.DiffAdd,
108-
["magit-diff-added-highlight"] = {bg = specs.DiffAdd.bg, fg = term.green},
162+
["magit-diff-added-highlight"] = {bg = specs.DiffAdd.bg, fg = specs.GitSignsAdd.fg},
109163
["magit-diff-base"] = specs.DiffChange,
110-
["magit-diff-base-highlight"] = {bg = specs.DiffChange.bg, fg = term.blue},
164+
["magit-diff-base-highlight"] = {bg = specs.DiffChange.bg, fg = specs.GitSignsChange.fg},
111165
["magit-diff-whitespace-warning"] = {bg = term.bright_red},
112166
["magit-diff-hunk-heading"] = specs.StatusLineNC,
113167
["magit-diff-hunk-heading-highlight"] = specs.StatusLine,
@@ -134,7 +188,7 @@ local function create_face(name)
134188
return face
135189
end
136190

137-
local function create_emacs_theme(name)
191+
local function create_emacs_theme(name)
138192
return function(colorscheme)
139193
local specs, term = unpack(colorscheme)
140194
local appearance = "light"
@@ -143,7 +197,7 @@ local function create_emacs_theme(name)
143197
end
144198

145199
spec_str = ""
146-
200+
147201
for k, v in pairs(specs) do
148202
spec_str = spec_str .. ";; "
149203
spec_str = spec_str .. k

0 commit comments

Comments
 (0)