cleaned up and simplified theming
This commit is contained in:
parent
39939714b7
commit
d531fb9c59
12 changed files with 249 additions and 452 deletions
|
|
@ -25,7 +25,7 @@ in
|
|||
background_update = true;
|
||||
disks_filter = "exclude=/boot";
|
||||
|
||||
color_theme = "${active}";
|
||||
# color_theme = "${active}";
|
||||
rounded_corners = true;
|
||||
theme_background = false;
|
||||
truecolor = true;
|
||||
|
|
@ -90,55 +90,55 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
create.configFile.btop-theme = let
|
||||
inherit (config.modules.themes) active;
|
||||
in
|
||||
mkIf (active != null) {
|
||||
target = "btop/themes/${active}.theme";
|
||||
text = ''
|
||||
theme[main_bg]="bg"
|
||||
theme[main_fg]="fg"
|
||||
theme[title]="fg"
|
||||
theme[hi_fg]="highlight"
|
||||
theme[selected_bg]="border"
|
||||
theme[selected_fg]="bg"
|
||||
theme[inactive_fg]="brightBlack"
|
||||
theme[graph_text]="brightYellow"
|
||||
theme[meter_bg]="brightblack"
|
||||
theme[proc_misc]="brightYellow"
|
||||
theme[cpu_box]="brightCyan"
|
||||
theme[mem_box]="brightGreen"
|
||||
theme[net_box]="brightMagenta"
|
||||
theme[proc_box]="brightYellow"
|
||||
theme[div_line]="brightblack"
|
||||
theme[temp_start]="brightYellow"
|
||||
theme[temp_mid]="panelbg"
|
||||
theme[temp_end]="brightRed"
|
||||
theme[cpu_start]="brightCyan"
|
||||
theme[cpu_mid]="border"
|
||||
theme[cpu_end]="brightGreen"
|
||||
theme[free_start]="brightGreen"
|
||||
theme[free_mid]="brightGreen"
|
||||
theme[free_end]="brightGreen"
|
||||
theme[cached_start]="brightYellow"
|
||||
theme[cached_mid]="brightYellow"
|
||||
theme[cached_end]="brightMagenta"
|
||||
theme[available_start]="brightYellow"
|
||||
theme[available_mid]="brightYellow"
|
||||
theme[available_end]="brightYellow"
|
||||
theme[used_start]="panelbg"
|
||||
theme[used_mid]="panelbg"
|
||||
theme[used_end]="brightRed"
|
||||
theme[download_start]="brightBlue"
|
||||
theme[download_mid]="brightBlue"
|
||||
theme[download_end]="brightMagenta"
|
||||
theme[upload_start]="brightBlue"
|
||||
theme[upload_mid]="brightBlue"
|
||||
theme[upload_end]="brightMagenta"
|
||||
theme[process_start]="brightCyan"
|
||||
theme[process_mid]="border"
|
||||
theme[process_end]="brightGreen"
|
||||
'';
|
||||
};
|
||||
# create.configFile.btop-theme = let
|
||||
# inherit (config.modules.themes) active;
|
||||
# in
|
||||
# mkIf (active != null) {
|
||||
# target = "btop/themes/${active}.theme";
|
||||
# text = ''
|
||||
# theme[main_bg]="bg"
|
||||
# theme[main_fg]="fg"
|
||||
# theme[title]="fg"
|
||||
# theme[hi_fg]="highlight"
|
||||
# theme[selected_bg]="border"
|
||||
# theme[selected_fg]="bg"
|
||||
# theme[inactive_fg]="brightBlack"
|
||||
# theme[graph_text]="brightYellow"
|
||||
# theme[meter_bg]="brightblack"
|
||||
# theme[proc_misc]="brightYellow"
|
||||
# theme[cpu_box]="brightCyan"
|
||||
# theme[mem_box]="brightGreen"
|
||||
# theme[net_box]="brightMagenta"
|
||||
# theme[proc_box]="brightYellow"
|
||||
# theme[div_line]="brightblack"
|
||||
# theme[temp_start]="brightYellow"
|
||||
# theme[temp_mid]="panelbg"
|
||||
# theme[temp_end]="brightRed"
|
||||
# theme[cpu_start]="brightCyan"
|
||||
# theme[cpu_mid]="border"
|
||||
# theme[cpu_end]="brightGreen"
|
||||
# theme[free_start]="brightGreen"
|
||||
# theme[free_mid]="brightGreen"
|
||||
# theme[free_end]="brightGreen"
|
||||
# theme[cached_start]="brightYellow"
|
||||
# theme[cached_mid]="brightYellow"
|
||||
# theme[cached_end]="brightMagenta"
|
||||
# theme[available_start]="brightYellow"
|
||||
# theme[available_mid]="brightYellow"
|
||||
# theme[available_end]="brightYellow"
|
||||
# theme[used_start]="panelbg"
|
||||
# theme[used_mid]="panelbg"
|
||||
# theme[used_end]="brightRed"
|
||||
# theme[download_start]="brightBlue"
|
||||
# theme[download_mid]="brightBlue"
|
||||
# theme[download_end]="brightMagenta"
|
||||
# theme[upload_start]="brightBlue"
|
||||
# theme[upload_mid]="brightBlue"
|
||||
# theme[upload_end]="brightMagenta"
|
||||
# theme[process_start]="brightCyan"
|
||||
# theme[process_mid]="border"
|
||||
# theme[process_end]="brightGreen"
|
||||
# '';
|
||||
# };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,15 +10,17 @@ in
|
|||
config = mkIf config.modules.shell.toolset.starship.enable {
|
||||
hm.programs.starship = {
|
||||
enable = true;
|
||||
settings = {
|
||||
settings = let
|
||||
inherit (config.lib.stylix.colors) cyan red magenta yellow green blue;
|
||||
in {
|
||||
scan_timeout = 10;
|
||||
add_newline = true;
|
||||
line_break.disabled = true;
|
||||
|
||||
format = "$username$hostname$nix_shell$git_branch$git_commit$git_state$git_status$directory$jobs$cmd_duration$character";
|
||||
username = {
|
||||
style_user = "blue bold";
|
||||
style_root = "red bold";
|
||||
style_user = "${cyan} bold";
|
||||
style_root = "${red} bold";
|
||||
format = "[$user]($style) ";
|
||||
disabled = false;
|
||||
show_always = true;
|
||||
|
|
@ -27,7 +29,7 @@ in
|
|||
hostname = {
|
||||
ssh_only = false;
|
||||
ssh_symbol = "🌐 ";
|
||||
format = "on [$hostname](bold red) ";
|
||||
format = "on [$hostname](bold ${red}) ";
|
||||
trim_at = ".local";
|
||||
disabled = false;
|
||||
};
|
||||
|
|
@ -35,28 +37,28 @@ in
|
|||
nix_shell = {
|
||||
symbol = " ";
|
||||
format = "[$symbol$name]($style) ";
|
||||
style = "magenta bold";
|
||||
style = "${magenta} bold";
|
||||
};
|
||||
|
||||
git_branch = {
|
||||
only_attached = true;
|
||||
format = "[$symbol$branch]($style) ";
|
||||
symbol = "שׂ";
|
||||
style = "brightYellow bold";
|
||||
style = "${yellow} bold";
|
||||
};
|
||||
|
||||
git_commit = {
|
||||
only_detached = true;
|
||||
format = "[ﰖ$hash]($style) ";
|
||||
style = "brightYellow bold";
|
||||
style = "${yellow} bold";
|
||||
};
|
||||
|
||||
git_state = {
|
||||
style = "brightMagenta bold";
|
||||
style = "${magenta} bold";
|
||||
};
|
||||
|
||||
git_status = {
|
||||
style = "brightGreen bold";
|
||||
style = "${green} bold";
|
||||
};
|
||||
|
||||
directory = {
|
||||
|
|
@ -66,16 +68,16 @@ in
|
|||
|
||||
cmd_duration = {
|
||||
format = "[$duration]($style) ";
|
||||
style = "brightBlue";
|
||||
style = "${blue}";
|
||||
};
|
||||
|
||||
jobs = {
|
||||
style = "brightGreen bold";
|
||||
style = "${green} bold";
|
||||
};
|
||||
|
||||
character = {
|
||||
success_symbol = "[\\$](brightGreen} bold)";
|
||||
error_symbol = "[\\$](brightRed bold)";
|
||||
success_symbol = "[\\$](${green}} bold)";
|
||||
error_symbol = "[\\$](${red} bold)";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue