cleaned up and simplified theming

This commit is contained in:
Chris Kruining 2024-09-01 22:29:05 +02:00
parent 39939714b7
commit d531fb9c59
12 changed files with 249 additions and 452 deletions

View file

@ -85,78 +85,78 @@ in
}
];
syntaxHighlighting = let
inherit (config.modules.themes) active;
in
mkIf (active != null) {
enable = true;
highlighters = ["main" "brackets" "pattern" "cursor" "regexp" "root" "line"];
patterns = {
"sudo " = "fg=red,bold";
"rm -rf *" = "fg=red,bold";
};
styles = {
# -------===[ Comments ]===------- #
comment = "fg=black";
# -------===[ Functions/Methods ]===------- #
alias = "fg=magenta";
"suffix-alias" = "fg=magenta";
"global-alias" = "fg=magenta";
function = "fg=blue";
command = "fg=green";
precommand = "fg=green,italic";
autodirectory = "fg=yellow,italic";
"single-hyphen-option" = "fg=yellow";
"double-hyphen-option" = "fg=yellow";
"back-quoted-argument" = "fg=magenta";
# -------===[ Built-ins ]===------- #
builtin = "fg=blue";
"reserved-word" = "fg=green";
"hashed-command" = "fg=green";
# -------===[ Punctuation ]===------- #
commandseparator = "fg=brightRed";
"command-substitution-delimiter" = "fg=border";
"command-substitution-delimiter-unquoted" = "fg=border";
"process-substitution-delimiter" = "fg=border";
"back-quoted-argument-delimiter" = "fg=brightRed";
"back-double-quoted-argument" = "fg=brightRed";
"back-dollar-quoted-argument" = "fg=brightRed";
# -------===[ Strings ]===------- #
"command-substitution-quoted" = "fg=brightYellow";
"command-substitution-delimiter-quoted" = "fg=brightYellow";
"single-quoted-argument" = "fg=brightYellow";
"single-quoted-argument-unclosed" = "fg=red";
"double-quoted-argument" = "fg=brightYellow";
"double-quoted-argument-unclosed" = "fg=red";
"rc-quote" = "fg=brightYellow";
# -------===[ Variables ]===------- #
"dollar-quoted-argument" = "fg=highlight";
"dollar-quoted-argument-unclosed" = "fg=brightRed";
"dollar-double-quoted-argument" = "fg=highlight";
assign = "fg=highlight";
"named-fd" = "fg=highlight";
"numeric-fd" = "fg=highlight";
# -------===[ Non-Exclusive ]===------- #
"unknown-token" = "fg=red";
path = "fg=highlight,underline";
path_pathseparator = "fg=brightRed,underline";
path_prefix = "fg=highlight,underline";
path_prefix_pathseparator = "fg=brightRed,underline";
globbing = "fg=highlight";
"history-expansion" = "fg=magenta";
"back-quoted-argument-unclosed" = "fg=red";
redirection = "fg=highlight";
arg0 = "fg=highlight";
default = "fg=highlight";
cursor = "fg=highlight";
};
};
# syntaxHighlighting = let
# inherit (config.modules.themes) active;
# in
# mkIf (active != null) {
# enable = true;
# highlighters = ["main" "brackets" "pattern" "cursor" "regexp" "root" "line"];
# patterns = {
# "sudo " = "fg=red,bold";
# "rm -rf *" = "fg=red,bold";
# };
# styles = {
# # -------===[ Comments ]===------- #
# comment = "fg=black";
#
# # -------===[ Functions/Methods ]===------- #
# alias = "fg=magenta";
# "suffix-alias" = "fg=magenta";
# "global-alias" = "fg=magenta";
# function = "fg=blue";
# command = "fg=green";
# precommand = "fg=green,italic";
# autodirectory = "fg=yellow,italic";
# "single-hyphen-option" = "fg=yellow";
# "double-hyphen-option" = "fg=yellow";
# "back-quoted-argument" = "fg=magenta";
#
# # -------===[ Built-ins ]===------- #
# builtin = "fg=blue";
# "reserved-word" = "fg=green";
# "hashed-command" = "fg=green";
#
# # -------===[ Punctuation ]===------- #
# commandseparator = "fg=brightRed";
# "command-substitution-delimiter" = "fg=border";
# "command-substitution-delimiter-unquoted" = "fg=border";
# "process-substitution-delimiter" = "fg=border";
# "back-quoted-argument-delimiter" = "fg=brightRed";
# "back-double-quoted-argument" = "fg=brightRed";
# "back-dollar-quoted-argument" = "fg=brightRed";
#
# # -------===[ Strings ]===------- #
# "command-substitution-quoted" = "fg=brightYellow";
# "command-substitution-delimiter-quoted" = "fg=brightYellow";
# "single-quoted-argument" = "fg=brightYellow";
# "single-quoted-argument-unclosed" = "fg=red";
# "double-quoted-argument" = "fg=brightYellow";
# "double-quoted-argument-unclosed" = "fg=red";
# "rc-quote" = "fg=brightYellow";
#
# # -------===[ Variables ]===------- #
# "dollar-quoted-argument" = "fg=highlight";
# "dollar-quoted-argument-unclosed" = "fg=brightRed";
# "dollar-double-quoted-argument" = "fg=highlight";
# assign = "fg=highlight";
# "named-fd" = "fg=highlight";
# "numeric-fd" = "fg=highlight";
#
# # -------===[ Non-Exclusive ]===------- #
# "unknown-token" = "fg=red";
# path = "fg=highlight,underline";
# path_pathseparator = "fg=brightRed,underline";
# path_prefix = "fg=highlight,underline";
# path_prefix_pathseparator = "fg=brightRed,underline";
# globbing = "fg=highlight";
# "history-expansion" = "fg=magenta";
# "back-quoted-argument-unclosed" = "fg=red";
# redirection = "fg=highlight";
# arg0 = "fg=highlight";
# default = "fg=highlight";
# cursor = "fg=highlight";
# };
# };
};
create.configFile.zsh-abbreviations = {