Skip to content

Commit

Permalink
theme: remane aqua -> cyan, add dominantName option
Browse files Browse the repository at this point in the history
  • Loading branch information
@minijackson
minijackson committed Aug 9, 2020
1 parent a796775 commit 57b184b
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 41 deletions.
6 changes: 3 additions & 3 deletions colors/nord.nix
View file
Expand Up @@ -41,8 +41,8 @@ with lib; with config.theme.colors; {
neutralBlue = mkDefault "#5e81ac";
fadedBlue = mkDefault neutralBlue;

brightAqua = mkDefault "#88c0d0";
neutralAqua = mkDefault "#8fbcbb";
fadedAqua = mkDefault neutralAqua;
brightCyan = mkDefault "#88c0d0";
neutralCyan = mkDefault "#8fbcbb";
fadedCyan = mkDefault neutralCyan;
};
}
4 changes: 2 additions & 2 deletions dotfiles/waybar-style.css
View file
Expand Up @@ -95,7 +95,7 @@ window#waybar {
}

#pulseaudio {
background: @neutralAqua@;
background: @neutralCyan@;
color: @background@;
}

Expand All @@ -104,7 +104,7 @@ window#waybar {
}

#temperature {
background: @brightAqua@;
background: @brightCyan@;
color: @background@;
}

Expand Down
6 changes: 3 additions & 3 deletions home.nix
View file
Expand Up @@ -366,7 +366,7 @@ in
type = "internal/temperature";

format = "<ramp> <label>";
format-underline = brightAqua;
format-underline = brightCyan;

label = "%temperature%";
label-warn = "%temperature%";
Expand All @@ -375,7 +375,7 @@ in
ramp-0 = "";
ramp-1 = "";
ramp-2 = "";
ramp-foreground = brightAqua;
ramp-foreground = brightCyan;
};

"module/date" = {
Expand Down Expand Up @@ -708,7 +708,7 @@ in
dominant dimDominant
background lightBackground background6
foreground
neutralPurple neutralYellow fadedRed neutralOrange brightBlue neutralGreen neutralAqua brightAqua;
neutralPurple neutralYellow fadedRed neutralOrange brightBlue neutralGreen neutralCyan brightCyan;
};

"waybar/config".text = builtins.toJSON {
Expand Down
60 changes: 30 additions & 30 deletions packages/tomorrow-pygments/add-tomorrow-themes.patch
View file
Expand Up @@ -26,7 +26,7 @@ index 0000000..f08bb02
+ORANGE = "#f5871f"
+YELLOW = "#eab700"
+GREEN = "#718c00"
+AQUA = "#3e999f"
+CYAN = "#3e999f"
+BLUE = "#4271ae"
+PURPLE = "#8959a8"
+
Expand Down Expand Up @@ -61,12 +61,12 @@ index 0000000..f08bb02
+ Keyword: PURPLE, # class: 'k'
+ Keyword.Constant: "", # class: 'kc'
+ Keyword.Declaration: "", # class: 'kd'
+ Keyword.Namespace: AQUA, # class: 'kn'
+ Keyword.Namespace: CYAN, # class: 'kn'
+ Keyword.Pseudo: "", # class: 'kp'
+ Keyword.Reserved: "", # class: 'kr'
+ Keyword.Type: YELLOW, # class: 'kt'
+
+ Operator: AQUA, # class: 'o'
+ Operator: CYAN, # class: 'o'
+ Operator.Word: "", # class: 'ow' - like keywords
+
+ Punctuation: FOREGROUND, # class: 'p'
Expand All @@ -77,15 +77,15 @@ index 0000000..f08bb02
+ Name.Builtin.Pseudo: "", # class: 'bp'
+ Name.Class: YELLOW, # class: 'nc' - to be revised
+ Name.Constant: RED, # class: 'no' - to be revised
+ Name.Decorator: AQUA, # class: 'nd' - to be revised
+ Name.Decorator: CYAN, # class: 'nd' - to be revised
+ Name.Entity: "", # class: 'ni'
+ Name.Exception: RED, # class: 'ne'
+ Name.Function: BLUE, # class: 'nf'
+ Name.Property: "", # class: 'py'
+ Name.Label: "", # class: 'nl'
+ Name.Namespace: YELLOW, # class: 'nn' - to be revised
+ Name.Other: BLUE, # class: 'nx'
+ Name.Tag: AQUA, # class: 'nt' - like a keyword
+ Name.Tag: CYAN, # class: 'nt' - like a keyword
+ Name.Variable: RED, # class: 'nv' - to be revised
+ Name.Variable.Class: "", # class: 'vc' - to be revised
+ Name.Variable.Global: "", # class: 'vg' - to be revised
Expand Down Expand Up @@ -123,7 +123,7 @@ index 0000000..f08bb02
+ Generic.Output: "", # class: 'go'
+ Generic.Prompt: "bold " + COMMENT, # class: 'gp'
+ Generic.Strong: "bold", # class: 'gs'
+ Generic.Subheading: "bold " + AQUA, # class: 'gu'
+ Generic.Subheading: "bold " + CYAN, # class: 'gu'
+ Generic.Traceback: "", # class: 'gt'
+ }
diff --git a/pygments/styles/tomorrownight.py b/pygments/styles/tomorrownight.py
Expand Down Expand Up @@ -154,7 +154,7 @@ index 0000000..35db132
+ORANGE = "#de935f"
+YELLOW = "#f0c674"
+GREEN = "#b5bd68"
+AQUA = "#8abeb7"
+CYAN = "#8abeb7"
+BLUE = "#81a2be"
+PURPLE = "#b294bb"
+
Expand Down Expand Up @@ -189,12 +189,12 @@ index 0000000..35db132
+ Keyword: PURPLE, # class: 'k'
+ Keyword.Constant: "", # class: 'kc'
+ Keyword.Declaration: "", # class: 'kd'
+ Keyword.Namespace: AQUA, # class: 'kn'
+ Keyword.Namespace: CYAN, # class: 'kn'
+ Keyword.Pseudo: "", # class: 'kp'
+ Keyword.Reserved: "", # class: 'kr'
+ Keyword.Type: YELLOW, # class: 'kt'
+
+ Operator: AQUA, # class: 'o'
+ Operator: CYAN, # class: 'o'
+ Operator.Word: "", # class: 'ow' - like keywords
+
+ Punctuation: FOREGROUND, # class: 'p'
Expand All @@ -205,15 +205,15 @@ index 0000000..35db132
+ Name.Builtin.Pseudo: "", # class: 'bp'
+ Name.Class: YELLOW, # class: 'nc' - to be revised
+ Name.Constant: RED, # class: 'no' - to be revised
+ Name.Decorator: AQUA, # class: 'nd' - to be revised
+ Name.Decorator: CYAN, # class: 'nd' - to be revised
+ Name.Entity: "", # class: 'ni'
+ Name.Exception: RED, # class: 'ne'
+ Name.Function: BLUE, # class: 'nf'
+ Name.Property: "", # class: 'py'
+ Name.Label: "", # class: 'nl'
+ Name.Namespace: YELLOW, # class: 'nn' - to be revised
+ Name.Other: BLUE, # class: 'nx'
+ Name.Tag: AQUA, # class: 'nt' - like a keyword
+ Name.Tag: CYAN, # class: 'nt' - like a keyword
+ Name.Variable: RED, # class: 'nv' - to be revised
+ Name.Variable.Class: "", # class: 'vc' - to be revised
+ Name.Variable.Global: "", # class: 'vg' - to be revised
Expand Down Expand Up @@ -251,7 +251,7 @@ index 0000000..35db132
+ Generic.Output: "", # class: 'go'
+ Generic.Prompt: "bold " + COMMENT, # class: 'gp'
+ Generic.Strong: "bold", # class: 'gs'
+ Generic.Subheading: "bold " + AQUA, # class: 'gu'
+ Generic.Subheading: "bold " + CYAN, # class: 'gu'
+ Generic.Traceback: "", # class: 'gt'
+ }
diff --git a/pygments/styles/tomorrownightblue.py b/pygments/styles/tomorrownightblue.py
Expand Down Expand Up @@ -282,7 +282,7 @@ index 0000000..82c5a24
+ORANGE = "#ffc58f"
+YELLOW = "#ffeead"
+GREEN = "#d1f1a9"
+AQUA = "#99ffff"
+CYAN = "#99ffff"
+BLUE = "#bbdaff"
+PURPLE = "#ebbbff"
+
Expand Down Expand Up @@ -317,12 +317,12 @@ index 0000000..82c5a24
+ Keyword: PURPLE, # class: 'k'
+ Keyword.Constant: "", # class: 'kc'
+ Keyword.Declaration: "", # class: 'kd'
+ Keyword.Namespace: AQUA, # class: 'kn'
+ Keyword.Namespace: CYAN, # class: 'kn'
+ Keyword.Pseudo: "", # class: 'kp'
+ Keyword.Reserved: "", # class: 'kr'
+ Keyword.Type: YELLOW, # class: 'kt'
+
+ Operator: AQUA, # class: 'o'
+ Operator: CYAN, # class: 'o'
+ Operator.Word: "", # class: 'ow' - like keywords
+
+ Punctuation: FOREGROUND, # class: 'p'
Expand All @@ -333,15 +333,15 @@ index 0000000..82c5a24
+ Name.Builtin.Pseudo: "", # class: 'bp'
+ Name.Class: YELLOW, # class: 'nc' - to be revised
+ Name.Constant: RED, # class: 'no' - to be revised
+ Name.Decorator: AQUA, # class: 'nd' - to be revised
+ Name.Decorator: CYAN, # class: 'nd' - to be revised
+ Name.Entity: "", # class: 'ni'
+ Name.Exception: RED, # class: 'ne'
+ Name.Function: BLUE, # class: 'nf'
+ Name.Property: "", # class: 'py'
+ Name.Label: "", # class: 'nl'
+ Name.Namespace: YELLOW, # class: 'nn' - to be revised
+ Name.Other: BLUE, # class: 'nx'
+ Name.Tag: AQUA, # class: 'nt' - like a keyword
+ Name.Tag: CYAN, # class: 'nt' - like a keyword
+ Name.Variable: RED, # class: 'nv' - to be revised
+ Name.Variable.Class: "", # class: 'vc' - to be revised
+ Name.Variable.Global: "", # class: 'vg' - to be revised
Expand Down Expand Up @@ -379,7 +379,7 @@ index 0000000..82c5a24
+ Generic.Output: "", # class: 'go'
+ Generic.Prompt: "bold " + COMMENT, # class: 'gp'
+ Generic.Strong: "bold", # class: 'gs'
+ Generic.Subheading: "bold " + AQUA, # class: 'gu'
+ Generic.Subheading: "bold " + CYAN, # class: 'gu'
+ Generic.Traceback: "", # class: 'gt'
+ }
diff --git a/pygments/styles/tomorrownightbright.py b/pygments/styles/tomorrownightbright.py
Expand Down Expand Up @@ -410,7 +410,7 @@ index 0000000..f1e2017
+ORANGE = "#e78c45"
+YELLOW = "#e7c547"
+GREEN = "#b9ca4a"
+AQUA = "#70c0b1"
+CYAN = "#70c0b1"
+BLUE = "#7aa6da"
+PURPLE = "#c397d8"
+
Expand Down Expand Up @@ -445,12 +445,12 @@ index 0000000..f1e2017
+ Keyword: PURPLE, # class: 'k'
+ Keyword.Constant: "", # class: 'kc'
+ Keyword.Declaration: "", # class: 'kd'
+ Keyword.Namespace: AQUA, # class: 'kn'
+ Keyword.Namespace: CYAN, # class: 'kn'
+ Keyword.Pseudo: "", # class: 'kp'
+ Keyword.Reserved: "", # class: 'kr'
+ Keyword.Type: YELLOW, # class: 'kt'
+
+ Operator: AQUA, # class: 'o'
+ Operator: CYAN, # class: 'o'
+ Operator.Word: "", # class: 'ow' - like keywords
+
+ Punctuation: FOREGROUND, # class: 'p'
Expand All @@ -461,15 +461,15 @@ index 0000000..f1e2017
+ Name.Builtin.Pseudo: "", # class: 'bp'
+ Name.Class: YELLOW, # class: 'nc' - to be revised
+ Name.Constant: RED, # class: 'no' - to be revised
+ Name.Decorator: AQUA, # class: 'nd' - to be revised
+ Name.Decorator: CYAN, # class: 'nd' - to be revised
+ Name.Entity: "", # class: 'ni'
+ Name.Exception: RED, # class: 'ne'
+ Name.Function: BLUE, # class: 'nf'
+ Name.Property: "", # class: 'py'
+ Name.Label: "", # class: 'nl'
+ Name.Namespace: YELLOW, # class: 'nn' - to be revised
+ Name.Other: BLUE, # class: 'nx'
+ Name.Tag: AQUA, # class: 'nt' - like a keyword
+ Name.Tag: CYAN, # class: 'nt' - like a keyword
+ Name.Variable: RED, # class: 'nv' - to be revised
+ Name.Variable.Class: "", # class: 'vc' - to be revised
+ Name.Variable.Global: "", # class: 'vg' - to be revised
Expand Down Expand Up @@ -507,7 +507,7 @@ index 0000000..f1e2017
+ Generic.Output: "", # class: 'go'
+ Generic.Prompt: "bold " + COMMENT, # class: 'gp'
+ Generic.Strong: "bold", # class: 'gs'
+ Generic.Subheading: "bold " + AQUA, # class: 'gu'
+ Generic.Subheading: "bold " + CYAN, # class: 'gu'
+ Generic.Traceback: "", # class: 'gt'
+ }
diff --git a/pygments/styles/tomorrownighteighties.py b/pygments/styles/tomorrownighteighties.py
Expand Down Expand Up @@ -538,7 +538,7 @@ index 0000000..3a7e764
+ORANGE = "#f99157"
+YELLOW = "#ffcc66"
+GREEN = "#99cc99"
+AQUA = "#66cccc"
+CYAN = "#66cccc"
+BLUE = "#6699cc"
+PURPLE = "#cc99cc"
+
Expand Down Expand Up @@ -573,12 +573,12 @@ index 0000000..3a7e764
+ Keyword: PURPLE, # class: 'k'
+ Keyword.Constant: "", # class: 'kc'
+ Keyword.Declaration: "", # class: 'kd'
+ Keyword.Namespace: AQUA, # class: 'kn'
+ Keyword.Namespace: CYAN, # class: 'kn'
+ Keyword.Pseudo: "", # class: 'kp'
+ Keyword.Reserved: "", # class: 'kr'
+ Keyword.Type: YELLOW, # class: 'kt'
+
+ Operator: AQUA, # class: 'o'
+ Operator: CYAN, # class: 'o'
+ Operator.Word: "", # class: 'ow' - like keywords
+
+ Punctuation: FOREGROUND, # class: 'p'
Expand All @@ -589,15 +589,15 @@ index 0000000..3a7e764
+ Name.Builtin.Pseudo: "", # class: 'bp'
+ Name.Class: YELLOW, # class: 'nc' - to be revised
+ Name.Constant: RED, # class: 'no' - to be revised
+ Name.Decorator: AQUA, # class: 'nd' - to be revised
+ Name.Decorator: CYAN, # class: 'nd' - to be revised
+ Name.Entity: "", # class: 'ni'
+ Name.Exception: RED, # class: 'ne'
+ Name.Function: BLUE, # class: 'nf'
+ Name.Property: "", # class: 'py'
+ Name.Label: "", # class: 'nl'
+ Name.Namespace: YELLOW, # class: 'nn' - to be revised
+ Name.Other: BLUE, # class: 'nx'
+ Name.Tag: AQUA, # class: 'nt' - like a keyword
+ Name.Tag: CYAN, # class: 'nt' - like a keyword
+ Name.Variable: RED, # class: 'nv' - to be revised
+ Name.Variable.Class: "", # class: 'vc' - to be revised
+ Name.Variable.Global: "", # class: 'vg' - to be revised
Expand Down Expand Up @@ -635,6 +635,6 @@ index 0000000..3a7e764
+ Generic.Output: "", # class: 'go'
+ Generic.Prompt: "bold " + COMMENT, # class: 'gp'
+ Generic.Strong: "bold", # class: 'gs'
+ Generic.Subheading: "bold " + AQUA, # class: 'gu'
+ Generic.Subheading: "bold " + CYAN, # class: 'gu'
+ Generic.Traceback: "", # class: 'gt'
+ }
16 changes: 13 additions & 3 deletions theme.nix
View file
Expand Up @@ -12,6 +12,16 @@ with lib;
{
options.theme.colors = {

dominantName = mkOption {
type = types.str;
default = "green";
description = ''
The dominant color name of the theme.
This color should be different on different hosts.
'';
};

dominant = mkOption {
type = types.str;
default = "#b8bb26";
Expand Down Expand Up @@ -127,7 +137,7 @@ with lib;
default = "#d3869b";
};

brightAqua = mkOption {
brightCyan = mkOption {
type = types.str;
default = "#8ec07c";
};
Expand Down Expand Up @@ -163,7 +173,7 @@ with lib;
default = "#b16286";
};

neutralAqua = mkOption {
neutralCyan = mkOption {
type = types.str;
default = "#689d6a";
};
Expand Down Expand Up @@ -199,7 +209,7 @@ with lib;
default = "#8f3f71";
};

fadedAqua = mkOption {
fadedCyan = mkOption {
type = types.str;
default = "#427b58";
};
Expand Down

0 comments on commit 57b184b

Please sign in to comment.