aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/default.nix1
-rw-r--r--modules/desktop/eww/default.nix2
-rw-r--r--modules/desktop/eww/eww.scss (renamed from modules/desktop/eww/eww.mustache.scss)18
-rw-r--r--modules/desktop/rofi/default.nix2
-rw-r--r--modules/desktop/rofi/theme.rasi (renamed from modules/desktop/rofi/theme.mustache.rasi)34
-rw-r--r--modules/desktop/xdg/default.nix4
-rw-r--r--modules/desktop/xdg/style.css (renamed from modules/desktop/xdg/style.mustache.css)72
-rw-r--r--modules/terminal/bat/base16.tmTheme (renamed from modules/terminal/bat/base16.mustache.tmTheme)106
-rw-r--r--modules/terminal/bat/default.nix2
9 files changed, 121 insertions, 120 deletions
diff --git a/modules/default.nix b/modules/default.nix
index a3e7307..eb05dbf 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -2,6 +2,7 @@
{ ... }:
{
imports = [
+ ./colors/base16/onedark-dark.nix
./communication
./desktop
./development
diff --git a/modules/desktop/eww/default.nix b/modules/desktop/eww/default.nix
index 076307a..dfc80cd 100644
--- a/modules/desktop/eww/default.nix
+++ b/modules/desktop/eww/default.nix
@@ -51,7 +51,7 @@
(toString config.fonts.smallSize)
(toString config.fonts.idxSize)
]
- (builtins.readFile ./eww.mustache.scss);
+ (builtins.readFile ./eww.scss);
}
);
};
diff --git a/modules/desktop/eww/eww.mustache.scss b/modules/desktop/eww/eww.scss
index 6e8a152..40ce183 100644
--- a/modules/desktop/eww/eww.mustache.scss
+++ b/modules/desktop/eww/eww.scss
@@ -13,7 +13,7 @@ window#eww-bar {
}
.workspaces, .windows, .system {
- border: 1px solid #{{base07}};
+ border: 1px solid #@@base07@@;
margin: 5px;
min-width: 40px;
}
@@ -27,9 +27,9 @@ window#eww-bar {
}
.workspace-button, .window-button, .system-item {
- color: #{{base07}};
+ color: #@@base07@@;
font-size: @@font-size-icon@@px;
- background-color: #{{base00}};
+ background-color: #@@base00@@;
background-image: none;
box-shadow: none;
text-shadow: none;
@@ -38,12 +38,12 @@ window#eww-bar {
.workspace-button, .window-button {
padding: 8px;
- border: 1px solid #{{base03}};
+ border: 1px solid #@@base03@@;
}
.system-item {
padding: 5px 0;
- border-bottom: 1px solid #{{base07}};
+ border-bottom: 1px solid #@@base07@@;
}
.system-item .system-label.small {
@@ -59,11 +59,11 @@ window#eww-bar {
}
.system-item .system-icon {
- color: #{{base07}};
+ color: #@@base07@@;
}
.workspace-button.active, .window-button.focused {
- border-color: #{{base07}};
+ border-color: #@@base07@@;
}
.workspace-button .workspace-icon {
@@ -73,9 +73,9 @@ window#eww-bar {
.workspace-button .workspace-idx {
font-size: @@font-size-idx@@px;
- background: #{{base00}};
+ background: #@@base00@@;
opacity: 0.7;
- color: #{{base07}};
+ color: #@@base07@@;
border-radius: 4px;
margin: 20px 0 0 20px; /* nudges the label into the bottom-right corner over the icon */
}
diff --git a/modules/desktop/rofi/default.nix b/modules/desktop/rofi/default.nix
index d193c10..ced9167 100644
--- a/modules/desktop/rofi/default.nix
+++ b/modules/desktop/rofi/default.nix
@@ -28,7 +28,7 @@
''"${config.fonts.normal} Bold ${toString config.fonts.size}"''
''"${config.fonts.normal} Bold ${toString config.fonts.idxSize}"''
]
- (builtins.readFile ./theme.mustache.rasi);
+ (builtins.readFile ./theme.rasi);
in
"${config.scheme {
inherit template;
diff --git a/modules/desktop/rofi/theme.mustache.rasi b/modules/desktop/rofi/theme.rasi
index 19a3252..96fb7bb 100644
--- a/modules/desktop/rofi/theme.mustache.rasi
+++ b/modules/desktop/rofi/theme.rasi
@@ -1,24 +1,24 @@
/*
- * Rofi theme based on the Base16 OneDark Dark theme, rendered from a mustache template
+ * Rofi theme based on the OneDark Dark color scheme
*/
* {
- base00: #{{base00}};
- base01: #{{base01}};
- base02: #{{base02}};
- base03: #{{base03}};
- base04: #{{base04}};
- base05: #{{base05}};
- base06: #{{base06}};
- base07: #{{base07}};
- base08: #{{base08}};
- base09: #{{base09}};
- base0A: #{{base0A}};
- base0B: #{{base0B}};
- base0C: #{{base0C}};
- base0D: #{{base0D}};
- base0E: #{{base0E}};
- base0F: #{{base0F}};
+ base00: #@@base00@@;
+ base01: #@@base01@@;
+ base02: #@@base02@@;
+ base03: #@@base03@@;
+ base04: #@@base04@@;
+ base05: #@@base05@@;
+ base06: #@@base06@@;
+ base07: #@@base07@@;
+ base08: #@@base08@@;
+ base09: #@@base09@@;
+ base0A: #@@base0A@@;
+ base0B: #@@base0B@@;
+ base0C: #@@base0C@@;
+ base0D: #@@base0D@@;
+ base0E: #@@base0E@@;
+ base0F: #@@base0F@@;
background: @base00;
background-color: transparent;
diff --git a/modules/desktop/xdg/default.nix b/modules/desktop/xdg/default.nix
index e472e29..ef27182 100644
--- a/modules/desktop/xdg/default.nix
+++ b/modules/desktop/xdg/default.nix
@@ -27,7 +27,7 @@
let
gtkCss = builtins.readFile (
config.scheme {
- template = builtins.readFile ./style.mustache.css;
+ template = builtins.readFile ./style.css;
extension = ".css";
}
);
@@ -55,7 +55,7 @@
gtk3.extraCss = gtkCss;
gtk4 = {
# GTK 4/libadwaita does not support loading GTK 3 themes; use the
- # Base16 CSS above without Home Manager's compatibility workaround.
+ # OneDark Dark CSS above without Home Manager's compatibility workaround.
theme = null;
extraCss = gtkCss;
};
diff --git a/modules/desktop/xdg/style.mustache.css b/modules/desktop/xdg/style.css
index 4377184..53bedfc 100644
--- a/modules/desktop/xdg/style.mustache.css
+++ b/modules/desktop/xdg/style.css
@@ -1,26 +1,26 @@
-@define-color theme_bg_color #{{base00}};
-@define-color theme_fg_color #{{base05}};
-@define-color theme_base_color #{{base00}};
-@define-color theme_text_color #{{base05}};
-@define-color theme_selected_bg_color #{{base0D}};
-@define-color theme_selected_fg_color #{{base00}};
-@define-color theme_unfocused_bg_color #{{base01}};
-@define-color theme_unfocused_fg_color #{{base04}};
-@define-color theme_unfocused_base_color #{{base00}};
-@define-color theme_unfocused_text_color #{{base04}};
-@define-color theme_unfocused_selected_bg_color #{{base0D}};
-@define-color theme_unfocused_selected_fg_color #{{base00}};
-@define-color theme_tooltip_bg_color #{{base00}};
-@define-color theme_tooltip_fg_color #{{base06}};
-@define-color borders #{{base03}};
-@define-color unfocused_borders #{{base02}};
-@define-color accent_color #{{base0D}};
-@define-color warning_color #{{base0A}};
-@define-color error_color #{{base08}};
-@define-color success_color #{{base0B}};
-@define-color placeholder_text_color #{{base03}};
-@define-color insensitive_bg_color #{{base01}};
-@define-color insensitive_fg_color #{{base03}};
+@define-color theme_bg_color #@@base00@@;
+@define-color theme_fg_color #@@base05@@;
+@define-color theme_base_color #@@base00@@;
+@define-color theme_text_color #@@base05@@;
+@define-color theme_selected_bg_color #@@base0D@@;
+@define-color theme_selected_fg_color #@@base00@@;
+@define-color theme_unfocused_bg_color #@@base01@@;
+@define-color theme_unfocused_fg_color #@@base04@@;
+@define-color theme_unfocused_base_color #@@base00@@;
+@define-color theme_unfocused_text_color #@@base04@@;
+@define-color theme_unfocused_selected_bg_color #@@base0D@@;
+@define-color theme_unfocused_selected_fg_color #@@base00@@;
+@define-color theme_tooltip_bg_color #@@base00@@;
+@define-color theme_tooltip_fg_color #@@base06@@;
+@define-color borders #@@base03@@;
+@define-color unfocused_borders #@@base02@@;
+@define-color accent_color #@@base0D@@;
+@define-color warning_color #@@base0A@@;
+@define-color error_color #@@base08@@;
+@define-color success_color #@@base0B@@;
+@define-color placeholder_text_color #@@base03@@;
+@define-color insensitive_bg_color #@@base01@@;
+@define-color insensitive_fg_color #@@base03@@;
window, dialog, .background {
background-color: @theme_bg_color;
@@ -51,7 +51,7 @@ listview, .list, flowbox, treeview, calendar, notebook > stack, scrolledwindow {
}
button:hover, entry:hover, row:hover {
- border-color: #{{base04}};
+ border-color: #@@base04@@;
}
button:active, button:checked, button:default, entry:focus,
@@ -80,19 +80,19 @@ headerbar button, toolbar button, menubar button {
}
treeview header button {
- background-color: #{{base01}};
+ background-color: #@@base01@@;
color: @theme_text_color;
border-color: @borders;
}
switch, scale trough, progressbar trough, scrollbar slider {
- background-color: #{{base02}};
+ background-color: #@@base02@@;
border-color: @borders;
}
switch slider, scale slider {
- background-color: #{{base06}};
- border-color: #{{base02}};
+ background-color: #@@base06@@;
+ border-color: #@@base02@@;
}
scale highlight, scale fill, progressbar progress {
@@ -100,15 +100,15 @@ scale highlight, scale fill, progressbar progress {
}
scrollbar {
- background-color: #{{base01}};
+ background-color: #@@base01@@;
}
scrollbar slider:hover {
- background-color: #{{base04}};
+ background-color: #@@base04@@;
}
notebook tab, notebook > header tabs tab {
- background-color: #{{base01}};
+ background-color: #@@base01@@;
border-color: @borders;
}
@@ -118,7 +118,7 @@ notebook tab:checked, notebook > header tabs tab:checked {
}
separator, paned > separator {
- background-color: #{{base02}};
+ background-color: #@@base02@@;
}
tooltip, .tooltip {
@@ -129,15 +129,15 @@ tooltip, .tooltip {
statusbar, .statusbar {
background-color: @theme_bg_color;
- color: #{{base04}};
+ color: #@@base04@@;
}
link, .link {
- color: #{{base0D}};
+ color: #@@base0D@@;
}
expander, arrow {
- color: #{{base04}};
+ color: #@@base04@@;
}
label:disabled, button:disabled {
@@ -146,5 +146,5 @@ label:disabled, button:disabled {
}
.dim-label {
- color: #{{base04}};
+ color: #@@base04@@;
}
diff --git a/modules/terminal/bat/base16.mustache.tmTheme b/modules/terminal/bat/base16.tmTheme
index 6b2cd5b..2e9b065 100644
--- a/modules/terminal/bat/base16.mustache.tmTheme
+++ b/modules/terminal/bat/base16.tmTheme
@@ -14,39 +14,39 @@
<key>settings</key>
<dict>
<key>background</key>
- <string>#{{base00}}</string>
+ <string>#@@base00@@</string>
<key>foreground</key>
- <string>#{{base05}}</string>
+ <string>#@@base05@@</string>
<key>caret</key>
- <string>#{{base05}}</string>
+ <string>#@@base05@@</string>
<key>invisibles</key>
- <string>#{{base03}}</string>
+ <string>#@@base03@@</string>
<key>lineHighlight</key>
- <string>#{{base01}}</string>
+ <string>#@@base01@@</string>
<key>selection</key>
- <string>#{{base02}}</string>
+ <string>#@@base02@@</string>
<key>selectionBorder</key>
- <string>#{{base03}}</string>
+ <string>#@@base03@@</string>
<key>findHighlight</key>
- <string>#{{base0A}}</string>
+ <string>#@@base0A@@</string>
<key>findHighlightForeground</key>
- <string>#{{base00}}</string>
+ <string>#@@base00@@</string>
<key>activeGuide</key>
- <string>#{{base03}}</string>
+ <string>#@@base03@@</string>
<key>bracketsForeground</key>
- <string>#{{base05}}</string>
+ <string>#@@base05@@</string>
<key>bracketsOptions</key>
<string>underline</string>
<key>bracketContentsForeground</key>
- <string>#{{base05}}</string>
+ <string>#@@base05@@</string>
<key>bracketContentsOptions</key>
<string>underline</string>
<key>tagsOptions</key>
<string>stippled_underline</string>
<key>gutterForeground</key>
- <string>#{{base03}}</string>
+ <string>#@@base03@@</string>
<key>gutter</key>
- <string>#{{base01}}</string>
+ <string>#@@base01@@</string>
</dict>
</dict>
@@ -59,7 +59,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base03}}</string>
+ <string>#@@base03@@</string>
<key>fontStyle</key>
<string>italic</string>
</dict>
@@ -74,7 +74,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base05}}</string>
+ <string>#@@base05@@</string>
</dict>
</dict>
@@ -86,7 +86,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0E}}</string>
+ <string>#@@base0E@@</string>
<key>fontStyle</key>
<string>italic</string>
</dict>
@@ -101,7 +101,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0E}}</string>
+ <string>#@@base0E@@</string>
</dict>
</dict>
@@ -113,7 +113,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0C}}</string>
+ <string>#@@base0C@@</string>
</dict>
</dict>
@@ -126,7 +126,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0E}}</string>
+ <string>#@@base0E@@</string>
</dict>
</dict>
@@ -139,7 +139,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base09}}</string>
+ <string>#@@base09@@</string>
</dict>
</dict>
@@ -151,7 +151,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base09}}</string>
+ <string>#@@base09@@</string>
</dict>
</dict>
@@ -163,7 +163,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base09}}</string>
+ <string>#@@base09@@</string>
</dict>
</dict>
@@ -175,7 +175,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0C}}</string>
+ <string>#@@base0C@@</string>
</dict>
</dict>
@@ -188,7 +188,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0B}}</string>
+ <string>#@@base0B@@</string>
</dict>
</dict>
@@ -200,7 +200,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0B}}</string>
+ <string>#@@base0B@@</string>
</dict>
</dict>
@@ -213,7 +213,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0D}}</string>
+ <string>#@@base0D@@</string>
</dict>
</dict>
@@ -225,7 +225,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0A}}</string>
+ <string>#@@base0A@@</string>
</dict>
</dict>
@@ -237,7 +237,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0C}}</string>
+ <string>#@@base0C@@</string>
</dict>
</dict>
@@ -249,7 +249,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base09}}</string>
+ <string>#@@base09@@</string>
</dict>
</dict>
@@ -262,7 +262,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0D}}</string>
+ <string>#@@base0D@@</string>
</dict>
</dict>
@@ -274,7 +274,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0A}}</string>
+ <string>#@@base0A@@</string>
</dict>
</dict>
@@ -286,7 +286,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base08}}</string>
+ <string>#@@base08@@</string>
</dict>
</dict>
@@ -298,7 +298,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base09}}</string>
+ <string>#@@base09@@</string>
</dict>
</dict>
@@ -310,7 +310,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0A}}</string>
+ <string>#@@base0A@@</string>
<key>fontStyle</key>
<string>italic</string>
</dict>
@@ -325,7 +325,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base05}}</string>
+ <string>#@@base05@@</string>
</dict>
</dict>
@@ -337,7 +337,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base05}}</string>
+ <string>#@@base05@@</string>
</dict>
</dict>
@@ -350,9 +350,9 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base07}}</string>
+ <string>#@@base07@@</string>
<key>background</key>
- <string>#{{base08}}</string>
+ <string>#@@base08@@</string>
</dict>
</dict>
@@ -364,9 +364,9 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base07}}</string>
+ <string>#@@base07@@</string>
<key>background</key>
- <string>#{{base0F}}</string>
+ <string>#@@base0F@@</string>
</dict>
</dict>
@@ -379,7 +379,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0B}}</string>
+ <string>#@@base0B@@</string>
</dict>
</dict>
@@ -391,7 +391,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base08}}</string>
+ <string>#@@base08@@</string>
</dict>
</dict>
@@ -403,7 +403,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0E}}</string>
+ <string>#@@base0E@@</string>
</dict>
</dict>
@@ -416,7 +416,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0D}}</string>
+ <string>#@@base0D@@</string>
<key>fontStyle</key>
<string>bold</string>
</dict>
@@ -430,7 +430,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base09}}</string>
+ <string>#@@base09@@</string>
<key>fontStyle</key>
<string>bold</string>
</dict>
@@ -444,7 +444,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0E}}</string>
+ <string>#@@base0E@@</string>
<key>fontStyle</key>
<string>italic</string>
</dict>
@@ -458,7 +458,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0C}}</string>
+ <string>#@@base0C@@</string>
</dict>
</dict>
@@ -470,7 +470,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0D}}</string>
+ <string>#@@base0D@@</string>
<key>fontStyle</key>
<string>underline</string>
</dict>
@@ -484,7 +484,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0B}}</string>
+ <string>#@@base0B@@</string>
<key>fontStyle</key>
<string>italic</string>
</dict>
@@ -498,7 +498,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base08}}</string>
+ <string>#@@base08@@</string>
</dict>
</dict>
@@ -511,7 +511,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base0D}}</string>
+ <string>#@@base0D@@</string>
</dict>
</dict>
@@ -523,7 +523,7 @@
<key>settings</key>
<dict>
<key>foreground</key>
- <string>#{{base09}}</string>
+ <string>#@@base09@@</string>
</dict>
</dict>
diff --git a/modules/terminal/bat/default.nix b/modules/terminal/bat/default.nix
index a35bcbe..8e089ce 100644
--- a/modules/terminal/bat/default.nix
+++ b/modules/terminal/bat/default.nix
@@ -26,7 +26,7 @@
base16 = {
src = pkgs.runCommand "bat-base16-theme" { } ''
mkdir -p $out
- cp ${config.scheme { template = ./base16.mustache.tmTheme; }} $out/base16.tmTheme
+ cp ${config.scheme { template = ./base16.tmTheme; }} $out/base16.tmTheme
'';
file = "base16.tmTheme";
};
generated by cgit v1.2.3 (git 2.39.1) at 2026-10-11 01:07:47 +0000