diff options
Diffstat (limited to 'modules/desktop')
| -rw-r--r-- | modules/desktop/eww/default.nix | 2 | ||||
| -rw-r--r-- | modules/desktop/eww/eww.scss (renamed from modules/desktop/eww/eww.mustache.scss) | 18 | ||||
| -rw-r--r-- | modules/desktop/rofi/default.nix | 2 | ||||
| -rw-r--r-- | modules/desktop/rofi/theme.rasi (renamed from modules/desktop/rofi/theme.mustache.rasi) | 34 | ||||
| -rw-r--r-- | modules/desktop/xdg/default.nix | 4 | ||||
| -rw-r--r-- | modules/desktop/xdg/style.css (renamed from modules/desktop/xdg/style.mustache.css) | 72 |
6 files changed, 66 insertions, 66 deletions
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@@; } |
