aurora6dd12d2
desktop: nothing os redesign, phase 6 (hyprland, hyprlock, gtk/qt, foot, zathura, cava)
Material You roles everywhere matugen themes: rounded windows with primary borders, glyph-style hyprlock (Doto clock, dotted pill), GTK/Qt colours with pill buttons, foot / zathura / cava / budctl from the same roles. Fonts: Space Grotesk for GTK/Qt UI (Qt at 9), Space Mono in foot. aurora writes the new hyprlock variables.
+168 −123
17 files changed
- M .config/foot/foot.ini +2 −1
- M .config/gtk-3.0/settings.ini +1 −1
- M .config/gtk-4.0/settings.ini +1 −1
- M .config/hypr/hyprland.lua +3 −1
- M .config/hypr/hyprlock.conf +50 −58
- M .config/hypr/source/appearance.lua +18 −2
- M .config/matugen/templates/budctl.json +8 −8
- M .config/matugen/templates/cava +2 −2
- M .config/matugen/templates/colors-zathura +13 −13
- M .config/matugen/templates/foot.ini +5 −4
- M .config/matugen/templates/gtk.css +34 −11
- M .config/matugen/templates/hyprland-colors.lua +8 −4
- M .config/matugen/templates/hyprlock.conf +11 −8
- M .config/matugen/templates/qt-colors.conf +4 −4
- M .config/qt5ct/qt5ct.conf +1 −1
- M .config/qt6ct/qt6ct.conf +1 −1
- M .config/quickshell/aurora/Theme.qml +6 −3
| @@ -1,7 +1,8 @@ | |||
| 1 | 1 | include=~/.cache/matugen/foot.ini | |
| 2 | 2 | ||
| 3 | 3 | [main] | |
| 4 | − | font=JetBrains Mono Nerd Font:size=11 | |
| 4 | + | # Space Mono like aurora's labels; nerd-font icons and missing glyphs fall back to JetBrains Mono | |
| 5 | + | font=Space Mono:size=11,JetBrainsMono Nerd Font:size=11 | |
| 5 | 6 | # pad=15x15 | |
| 6 | 7 | ||
| 7 | 8 | [colors-dark] | |
| @@ -1,7 +1,7 @@ | |||
| 1 | 1 | [Settings] | |
| 2 | 2 | gtk-theme-name=adw-gtk3-dark | |
| 3 | 3 | gtk-icon-theme-name=Papirus-Dark | |
| 4 | − | gtk-font-name=JetBrainsMonoNL Nerd Font Mono 11 | |
| 4 | + | gtk-font-name=Space Grotesk 11 | |
| 5 | 5 | gtk-cursor-theme-name=default | |
| 6 | 6 | gtk-cursor-theme-size=24 | |
| 7 | 7 | gtk-toolbar-style=GTK_TOOLBAR_BOTH | |
| @@ -1,7 +1,7 @@ | |||
| 1 | 1 | [Settings] | |
| 2 | 2 | gtk-theme-name=adw-gtk3-dark | |
| 3 | 3 | gtk-icon-theme-name=Papirus-Dark | |
| 4 | − | gtk-font-name=JetBrainsMonoNL Nerd Font Mono 11 | |
| 4 | + | gtk-font-name=Space Grotesk 11 | |
| 5 | 5 | gtk-cursor-theme-name=default | |
| 6 | 6 | gtk-cursor-theme-size=24 | |
| 7 | 7 | gtk-application-prefer-dark-theme=1 | |
| @@ -11,7 +11,8 @@ HOME = os.getenv("HOME") | |||
| 11 | 11 | ||
| 12 | 12 | -- Theme (matugen, run by aurora on every wallpaper change; fallback until it has run once) | |
| 13 | 13 | local ok, c = pcall(dofile, HOME .. "/.cache/matugen/hyprland-colors.lua") | |
| 14 | − | colors = ok and c or { primary = "rgba(80d5cbff)", outline_variant = "rgba(3f4947ff)" } | |
| 14 | + | colors = ok and c or { primary = "rgba(80d5cbff)", surface = "rgba(0e1514ff)", surface_highest = "rgba(2f3635ff)", | |
| 15 | + | on_surface = "rgba(dde4e2ff)", outline_variant = "rgba(3f4947ff)" } | |
| 15 | 16 | ||
| 16 | 17 | -- ----------------------------------------------------- | |
| 17 | 18 | -- Autostart | |
| @@ -20,6 +21,7 @@ hl.on("hyprland.start", function() | |||
| 20 | 21 | -- GTK3 on Wayland reads its theme + icons from gsettings, not settings.ini (colours: gtk-3.0/gtk.css, matugen) | |
| 21 | 22 | hl.exec_cmd("gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3-dark") | |
| 22 | 23 | hl.exec_cmd("gsettings set org.gnome.desktop.interface icon-theme Papirus-Dark") | |
| 24 | + | hl.exec_cmd("gsettings set org.gnome.desktop.interface font-name 'Space Grotesk 11'") -- like aurora's UI text | |
| 23 | 25 | hl.exec_cmd("wl-paste --type text --watch cliphist store") | |
| 24 | 26 | hl.exec_cmd("wl-paste --type image --watch cliphist store") | |
| 25 | 27 | hl.exec_cmd("hyprpm reload -n") | |
| @@ -1,8 +1,11 @@ | |||
| 1 | − | # hyprlock, styled like aurora (flat, square, accent borders, JetBrains Mono). | |
| 2 | − | # Colours: matugen's output first as a fallback, then aurora's resolved palette, | |
| 3 | − | # written by aurora's Theme.qml to ~/.config/aurora/hyprlock-colors.conf. | |
| 1 | + | # hyprlock in aurora's Nothing look (after glyph-rice's lock screen): a huge Doto clock, the date in spaced caps, | |
| 2 | + | # your name, the password as round dots in a pill, status in Space Mono at the bottom corners. | |
| 3 | + | # Colours / fonts: matugen's output first as a fallback, then aurora's resolved palette | |
| 4 | + | # (~/.config/aurora/hyprlock-colors.conf, written by aurora's Theme.qml). | |
| 5 | + | $dot = Doto Black | |
| 6 | + | $ui = Space Grotesk | |
| 7 | + | $mono = Space Mono | |
| 4 | 8 | source = $HOME/.cache/matugen/hyprlock.conf | |
| 5 | − | $font = JetBrainsMono Nerd Font | |
| 6 | 9 | source = $HOME/.config/aurora/hyprlock-colors.conf | |
| 7 | 10 | ||
| 8 | 11 | general { | |
| @@ -15,74 +18,63 @@ background { | |||
| 15 | 18 | color = $bg | |
| 16 | 19 | } | |
| 17 | 20 | ||
| 18 | − | # -- frame -- | |
| 19 | − | shape { | |
| 20 | − | monitor = | |
| 21 | − | size = 420, 300 | |
| 22 | − | color = $surface | |
| 23 | − | rounding = 0 | |
| 24 | − | border_size = 1 | |
| 25 | − | border_color = $line | |
| 26 | − | position = 0, 20 | |
| 27 | − | halign = center | |
| 28 | − | valign = center | |
| 29 | − | } | |
| 30 | − | ||
| 21 | + | # -- time / date -- | |
| 31 | 22 | label { | |
| 32 | 23 | monitor = | |
| 33 | − | text = <b>LOCKED</b> | |
| 34 | − | color = $accent | |
| 35 | − | font_size = 11 | |
| 36 | − | font_family = $font | |
| 37 | − | position = 0, 135 | |
| 24 | + | # round dots: Pango takes the variation axes after the size, so they go in the markup, not font_family | |
| 25 | + | text = cmd[update:1000] echo "<span font_desc='Doto 190 @ROND=100,wght=900'>$(date +%H:%M)</span>" | |
| 26 | + | color = $fg | |
| 27 | + | font_size = 190 | |
| 28 | + | font_family = $dot | |
| 29 | + | position = 0, 210 | |
| 38 | 30 | halign = center | |
| 39 | 31 | valign = center | |
| 40 | 32 | } | |
| 41 | 33 | ||
| 42 | − | # -- time / date -- | |
| 43 | 34 | label { | |
| 44 | 35 | monitor = | |
| 45 | − | text = cmd[update:1000] echo "<b>$(date +%H:%M)</b>" | |
| 46 | − | color = $fg | |
| 47 | − | font_size = 64 | |
| 48 | − | font_family = $font | |
| 49 | − | position = 0, 70 | |
| 36 | + | text = cmd[update:60000] echo "<span letter_spacing='3000'>$(date '+%A · %d %B · week %V' | tr a-z A-Z)</span>" | |
| 37 | + | color = $grey | |
| 38 | + | font_size = 12 | |
| 39 | + | font_family = $mono | |
| 40 | + | position = 0, 40 | |
| 50 | 41 | halign = center | |
| 51 | 42 | valign = center | |
| 52 | 43 | } | |
| 53 | 44 | ||
| 45 | + | # -- who -- | |
| 54 | 46 | label { | |
| 55 | 47 | monitor = | |
| 56 | − | text = cmd[update:60000] date '+%A %d %B' | tr a-z A-Z | |
| 57 | − | color = $accent | |
| 58 | − | font_size = 12 | |
| 59 | − | font_family = $font | |
| 60 | − | position = 0, 10 | |
| 48 | + | text = cmd[update:0] echo "$USER" | |
| 49 | + | color = $fg | |
| 50 | + | font_size = 22 | |
| 51 | + | font_family = $ui | |
| 52 | + | position = 0, -80 | |
| 61 | 53 | halign = center | |
| 62 | 54 | valign = center | |
| 63 | 55 | } | |
| 64 | 56 | ||
| 65 | − | # -- password -- | |
| 57 | + | # -- password: round dots in a pill -- | |
| 66 | 58 | input-field { | |
| 67 | 59 | monitor = | |
| 68 | − | size = 340, 42 | |
| 69 | − | rounding = 0 | |
| 70 | − | outline_thickness = 2 | |
| 71 | − | outer_color = $accent | |
| 72 | − | inner_color = $bg | |
| 60 | + | size = 360, 58 | |
| 61 | + | rounding = -1 | |
| 62 | + | outline_thickness = 1 | |
| 63 | + | outer_color = $s3 | |
| 64 | + | inner_color = $s2 | |
| 73 | 65 | font_color = $fg | |
| 74 | − | font_family = $font | |
| 75 | − | check_color = $accentDim | |
| 66 | + | font_family = $mono | |
| 67 | + | check_color = $fill | |
| 76 | 68 | fail_color = $err | |
| 77 | − | capslock_color = $accentDim | |
| 78 | − | dots_size = 0.22 | |
| 79 | − | dots_spacing = 0.4 | |
| 80 | − | dots_rounding = 0 | |
| 69 | + | capslock_color = $live | |
| 70 | + | dots_size = 0.24 | |
| 71 | + | dots_spacing = 0.55 | |
| 72 | + | dots_rounding = -1 | |
| 81 | 73 | dots_center = true | |
| 82 | 74 | fade_on_empty = false | |
| 83 | − | placeholder_text = PASSWORD | |
| 84 | − | fail_text = $FAIL ($ATTEMPTS) | |
| 85 | − | position = 0, -60 | |
| 75 | + | placeholder_text = <span letter_spacing='2000'>PASSWORD</span> | |
| 76 | + | fail_text = <span letter_spacing='2000'>$FAIL · $ATTEMPTS</span> | |
| 77 | + | position = 0, -150 | |
| 86 | 78 | halign = center | |
| 87 | 79 | valign = center | |
| 88 | 80 | } | |
| @@ -90,22 +82,22 @@ input-field { | |||
| 90 | 82 | # -- status line -- | |
| 91 | 83 | label { | |
| 92 | 84 | monitor = | |
| 93 | − | text = cmd[update:0] echo "$USER@$(cat /etc/hostname)" | |
| 94 | − | color = $dim | |
| 95 | − | font_size = 11 | |
| 96 | − | font_family = $font | |
| 97 | − | position = 20, 16 | |
| 85 | + | text = cmd[update:0] echo "<span letter_spacing='2000'>$(echo "$USER@$(cat /etc/hostname)" | tr a-z A-Z)</span>" | |
| 86 | + | color = $grey | |
| 87 | + | font_size = 10 | |
| 88 | + | font_family = $mono | |
| 89 | + | position = 40, 30 | |
| 98 | 90 | halign = left | |
| 99 | 91 | valign = bottom | |
| 100 | 92 | } | |
| 101 | 93 | ||
| 102 | 94 | label { | |
| 103 | 95 | monitor = | |
| 104 | − | text = cmd[update:5000] echo "$(mpc current 2>/dev/null | sed 's/&/\&/g; s/</\</g') BAT $(cat /sys/class/power_supply/BAT0/capacity)%" | |
| 105 | − | color = $dim | |
| 106 | − | font_size = 11 | |
| 107 | − | font_family = $font | |
| 108 | − | position = -20, 16 | |
| 96 | + | text = cmd[update:5000] echo "<span letter_spacing='2000'>$(mpc current 2>/dev/null | tr a-z A-Z | sed 's/&/\&/g; s/</\</g') BATTERY $(cat /sys/class/power_supply/BAT0/capacity)%</span>" | |
| 97 | + | color = $grey | |
| 98 | + | font_size = 10 | |
| 99 | + | font_family = $mono | |
| 100 | + | position = -40, 30 | |
| 109 | 101 | halign = right | |
| 110 | 102 | valign = bottom | |
| 111 | 103 | } | |
| @@ -18,16 +18,32 @@ hl.config({ | |||
| 18 | 18 | }, | |
| 19 | 19 | ||
| 20 | 20 | ["col.inactive_border"] = { | |
| 21 | − | colors = { colors.outline_variant, colors.outline_variant }, | |
| 21 | + | colors = { colors.surface_highest, colors.surface_highest }, | |
| 22 | 22 | angle = 45, | |
| 23 | 23 | }, | |
| 24 | 24 | }, | |
| 25 | 25 | ||
| 26 | + | -- groups: the same colours, the bar in Space Mono like aurora's labels | |
| 27 | + | group = { | |
| 28 | + | ["col.border_active"] = colors.primary, | |
| 29 | + | ["col.border_inactive"] = colors.surface_highest, | |
| 30 | + | ["col.border_locked_active"] = colors.primary, | |
| 31 | + | ["col.border_locked_inactive"] = colors.outline_variant, | |
| 32 | + | groupbar = { | |
| 33 | + | font_family = "Space Mono", | |
| 34 | + | text_color = colors.on_surface, | |
| 35 | + | ["col.active"] = colors.surface_highest, | |
| 36 | + | ["col.inactive"] = colors.surface, | |
| 37 | + | ["col.locked_active"] = colors.surface_highest, | |
| 38 | + | ["col.locked_inactive"] = colors.surface, | |
| 39 | + | }, | |
| 40 | + | }, | |
| 41 | + | ||
| 26 | 42 | -------------------------------------------------- | |
| 27 | 43 | -- Decoration | |
| 28 | 44 | -------------------------------------------------- | |
| 29 | 45 | decoration = { | |
| 30 | − | -- rounding = 8, | |
| 46 | + | rounding = 14, -- round corners like aurora's cards (Nothing look) | |
| 31 | 47 | ||
| 32 | 48 | blur = { | |
| 33 | 49 | enabled = true, | |
| @@ -1,14 +1,14 @@ | |||
| 1 | 1 | { | |
| 2 | − | "bg": "{{colors.surface.default.hex | set_lightness: 5.0}}", | |
| 2 | + | "bg": "{{colors.surface_container_lowest.default.hex}}", | |
| 3 | 3 | "fg": "{{colors.on_surface.default.hex}}", | |
| 4 | − | "primary": "{{colors.primary_container.default.hex}}", | |
| 5 | − | "primaryFg": "{{colors.on_primary_container.default.hex}}", | |
| 6 | − | "primaryContainer": "{{colors.primary_container.default.hex | set_lightness: 25.0}}", | |
| 4 | + | "primary": "{{colors.primary.default.hex}}", | |
| 5 | + | "primaryFg": "{{colors.on_primary.default.hex}}", | |
| 6 | + | "primaryContainer": "{{colors.primary_container.default.hex}}", | |
| 7 | 7 | "secondary": "{{colors.secondary.default.hex}}", | |
| 8 | − | "surfaceLow": "{{colors.surface.default.hex | set_lightness: 8.0}}", | |
| 9 | − | "surface": "{{colors.surface.default.hex | set_lightness: 10.0}}", | |
| 10 | − | "surfaceHigh": "{{colors.surface.default.hex | set_lightness: 14.0}}", | |
| 11 | − | "surfaceHighest": "{{colors.surface.default.hex | set_lightness: 18.0}}", | |
| 8 | + | "surfaceLow": "{{colors.surface_container_low.default.hex}}", | |
| 9 | + | "surface": "{{colors.surface_container.default.hex}}", | |
| 10 | + | "surfaceHigh": "{{colors.surface_container_high.default.hex}}", | |
| 11 | + | "surfaceHighest": "{{colors.surface_container_highest.default.hex}}", | |
| 12 | 12 | "outlineVariant": "{{colors.outline_variant.default.hex}}", | |
| 13 | 13 | "surfaceVariantFg": "{{colors.on_surface_variant.default.hex}}", | |
| 14 | 14 | "err": "{{colors.error.default.hex}}" | |
| @@ -3,5 +3,5 @@ gradient = 1 | |||
| 3 | 3 | ||
| 4 | 4 | gradient_color_1 = '{{colors.primary_container.default.hex}}' | |
| 5 | 5 | gradient_color_2 = '{{colors.primary.default.hex}}' | |
| 6 | − | gradient_color_3 = '{{colors.tertiary.default.hex}}' | |
| 7 | − | gradient_color_4 = '{{colors.secondary.default.hex}}' | |
| 6 | + | gradient_color_3 = '{{colors.secondary.default.hex}}' | |
| 7 | + | gradient_color_4 = '{{colors.tertiary.default.hex}}' | |
| @@ -1,29 +1,29 @@ | |||
| 1 | − | set completion-bg "{{colors.surface.default.hex | set_lightness: 5.0}}" | |
| 1 | + | set completion-bg "{{colors.surface_container_lowest.default.hex}}" | |
| 2 | 2 | set completion-fg "{{colors.on_surface.default.hex}}" | |
| 3 | − | set completion-group-bg "{{colors.surface.default.hex | set_lightness: 5.0}}" | |
| 3 | + | set completion-group-bg "{{colors.surface_container_lowest.default.hex}}" | |
| 4 | 4 | set completion-group-fg "{{colors.primary.default.hex}}" | |
| 5 | − | set completion-highlight-bg "{{colors.primary_container.default.hex}}" | |
| 6 | − | set completion-highlight-fg "{{colors.on_primary_container.default.hex}}" | |
| 5 | + | set completion-highlight-bg "{{colors.primary.default.hex}}" | |
| 6 | + | set completion-highlight-fg "{{colors.on_primary.default.hex}}" | |
| 7 | 7 | ||
| 8 | − | set recolor-lightcolor "{{colors.surface.default.hex | set_lightness: 5.0}}" | |
| 8 | + | set recolor-lightcolor "{{colors.surface_container_lowest.default.hex}}" | |
| 9 | 9 | set recolor-darkcolor "{{colors.on_surface.default.hex}}" | |
| 10 | − | set default-bg "{{colors.surface.default.hex | set_lightness: 5.0}}" | |
| 10 | + | set default-bg "{{colors.surface_container_lowest.default.hex}}" | |
| 11 | 11 | ||
| 12 | − | set inputbar-bg "{{colors.surface.default.hex | set_lightness: 10.0}}" | |
| 12 | + | set inputbar-bg "{{colors.surface_container_low.default.hex}}" | |
| 13 | 13 | set inputbar-fg "{{colors.on_surface.default.hex}}" | |
| 14 | − | set notification-bg "{{colors.surface.default.hex | set_lightness: 10.0}}" | |
| 14 | + | set notification-bg "{{colors.surface_container_low.default.hex}}" | |
| 15 | 15 | set notification-fg "{{colors.on_surface.default.hex}}" | |
| 16 | 16 | set notification-error-bg "{{colors.error.default.hex}}" | |
| 17 | 17 | set notification-error-fg "{{colors.on_error.default.hex}}" | |
| 18 | 18 | set notification-warning-bg "{{colors.tertiary.default.hex}}" | |
| 19 | 19 | set notification-warning-fg "{{colors.on_tertiary.default.hex}}" | |
| 20 | − | set statusbar-bg "{{colors.surface.default.hex | set_lightness: 10.0}}" | |
| 20 | + | set statusbar-bg "{{colors.surface_container_low.default.hex}}" | |
| 21 | 21 | set statusbar-fg "{{colors.on_surface.default.hex}}" | |
| 22 | − | set index-bg "{{colors.surface.default.hex | set_lightness: 5.0}}" | |
| 22 | + | set index-bg "{{colors.surface_container_lowest.default.hex}}" | |
| 23 | 23 | set index-fg "{{colors.on_surface.default.hex}}" | |
| 24 | − | set index-active-bg "{{colors.primary_container.default.hex}}" | |
| 25 | − | set index-active-fg "{{colors.on_primary_container.default.hex}}" | |
| 26 | − | set render-loading-bg "{{colors.surface.default.hex | set_lightness: 5.0}}" | |
| 24 | + | set index-active-bg "{{colors.primary.default.hex}}" | |
| 25 | + | set index-active-fg "{{colors.on_primary.default.hex}}" | |
| 26 | + | set render-loading-bg "{{colors.surface_container_lowest.default.hex}}" | |
| 27 | 27 | set render-loading-fg "{{colors.on_surface.default.hex}}" | |
| 28 | 28 | ||
| 29 | 29 | set window-title-home-tilde true | |
| @@ -1,11 +1,12 @@ | |||
| 1 | 1 | # Auto-generated by matugen, do not edit, edit the template instead. Included by foot.ini (new terminals only). | |
| 2 | 2 | # ANSI colours come from the wallpaper (pywal-like): Material primary/secondary/tertiary at fixed lightness. | |
| 3 | + | # Background / cursor / selection follow aurora's Material You roles. | |
| 3 | 4 | [colors-dark] | |
| 4 | − | background={{colors.surface.default.hex_stripped | set_lightness: 5.0}} | |
| 5 | + | background={{colors.surface_container_lowest.default.hex_stripped}} | |
| 5 | 6 | foreground={{colors.on_surface.default.hex_stripped}} | |
| 6 | − | cursor={{colors.surface.default.hex_stripped | set_lightness: 5.0}} {{colors.primary.default.hex_stripped}} | |
| 7 | − | selection-background={{colors.primary_container.default.hex_stripped}} | |
| 8 | − | selection-foreground={{colors.on_primary_container.default.hex_stripped}} | |
| 7 | + | cursor={{colors.on_primary.default.hex_stripped}} {{colors.primary.default.hex_stripped}} | |
| 8 | + | selection-background={{colors.primary.default.hex_stripped}} | |
| 9 | + | selection-foreground={{colors.on_primary.default.hex_stripped}} | |
| 9 | 10 | urls={{colors.tertiary.default.hex_stripped}} | |
| 10 | 11 | ||
| 11 | 12 | regular0={{colors.surface.default.hex_stripped | set_lightness: 14.0}} | |
| @@ -1,8 +1,9 @@ | |||
| 1 | 1 | /* Auto-generated by matugen, do not edit, edit the template instead. | |
| 2 | − | libadwaita named colours, imported by gtk-3.0/gtk.css (adw-gtk3 theme) and gtk-4.0/gtk.css. */ | |
| 2 | + | libadwaita named colours, imported by gtk-3.0/gtk.css (adw-gtk3 theme) and gtk-4.0/gtk.css. | |
| 3 | + | Material You roles like aurora (primary = accent and selection, tinted surface ladder), Nothing-ish pill shapes. */ | |
| 3 | 4 | @define-color accent_color {{colors.primary.default.hex}}; | |
| 4 | − | @define-color accent_bg_color {{colors.primary_container.default.hex}}; | |
| 5 | − | @define-color accent_fg_color {{colors.on_primary_container.default.hex}}; | |
| 5 | + | @define-color accent_bg_color {{colors.primary.default.hex}}; | |
| 6 | + | @define-color accent_fg_color {{colors.on_primary.default.hex}}; | |
| 6 | 7 | ||
| 7 | 8 | @define-color destructive_color {{colors.error.default.hex}}; | |
| 8 | 9 | @define-color destructive_bg_color {{colors.error.default.hex}}; | |
| @@ -10,25 +11,47 @@ | |||
| 10 | 11 | @define-color error_color {{colors.error.default.hex}}; | |
| 11 | 12 | @define-color error_bg_color {{colors.error.default.hex}}; | |
| 12 | 13 | @define-color error_fg_color {{colors.on_error.default.hex}}; | |
| 14 | + | @define-color warning_color {{colors.tertiary.default.hex}}; | |
| 15 | + | @define-color warning_bg_color {{colors.tertiary.default.hex}}; | |
| 16 | + | @define-color warning_fg_color {{colors.on_tertiary.default.hex}}; | |
| 13 | 17 | ||
| 14 | − | @define-color window_bg_color {{colors.surface.default.hex | set_lightness: 5.0}}; | |
| 18 | + | @define-color window_bg_color {{colors.surface.default.hex}}; | |
| 15 | 19 | @define-color window_fg_color {{colors.on_surface.default.hex}}; | |
| 16 | − | @define-color view_bg_color {{colors.surface.default.hex | set_lightness: 8.0}}; | |
| 20 | + | @define-color view_bg_color {{colors.surface_container_low.default.hex}}; | |
| 17 | 21 | @define-color view_fg_color {{colors.on_surface.default.hex}}; | |
| 18 | − | @define-color headerbar_bg_color {{colors.surface.default.hex | set_lightness: 10.0}}; | |
| 22 | + | @define-color headerbar_bg_color {{colors.surface.default.hex}}; | |
| 19 | 23 | @define-color headerbar_fg_color {{colors.on_surface.default.hex}}; | |
| 20 | − | @define-color headerbar_border_color {{colors.outline_variant.default.hex}}; | |
| 24 | + | @define-color headerbar_border_color {{colors.surface_container_high.default.hex}}; | |
| 21 | 25 | @define-color headerbar_backdrop_color @window_bg_color; | |
| 22 | 26 | @define-color headerbar_shade_color rgba(0, 0, 0, 0.36); | |
| 23 | − | @define-color sidebar_bg_color {{colors.surface.default.hex | set_lightness: 10.0}}; | |
| 27 | + | @define-color sidebar_bg_color {{colors.surface_container_low.default.hex}}; | |
| 24 | 28 | @define-color sidebar_fg_color {{colors.on_surface.default.hex}}; | |
| 25 | 29 | @define-color sidebar_backdrop_color @window_bg_color; | |
| 26 | − | @define-color card_bg_color {{colors.surface.default.hex | set_lightness: 14.0}}; | |
| 30 | + | @define-color card_bg_color {{colors.surface_container.default.hex}}; | |
| 27 | 31 | @define-color card_fg_color {{colors.on_surface.default.hex}}; | |
| 28 | 32 | @define-color card_shade_color rgba(0, 0, 0, 0.36); | |
| 29 | − | @define-color dialog_bg_color {{colors.surface.default.hex | set_lightness: 14.0}}; | |
| 33 | + | @define-color dialog_bg_color {{colors.surface_container_high.default.hex}}; | |
| 30 | 34 | @define-color dialog_fg_color {{colors.on_surface.default.hex}}; | |
| 31 | − | @define-color popover_bg_color {{colors.surface.default.hex | set_lightness: 14.0}}; | |
| 35 | + | @define-color popover_bg_color {{colors.surface_container_high.default.hex}}; | |
| 32 | 36 | @define-color popover_fg_color {{colors.on_surface.default.hex}}; | |
| 33 | 37 | @define-color shade_color rgba(0, 0, 0, 0.36); | |
| 34 | 38 | @define-color scrollbar_outline_color rgba(0, 0, 0, 0.5); | |
| 39 | + | @define-color borders {{colors.outline_variant.default.hex}}; | |
| 40 | + | ||
| 41 | + | /* gtk3 (adw-gtk3) */ | |
| 42 | + | @define-color theme_bg_color @window_bg_color; | |
| 43 | + | @define-color theme_fg_color @window_fg_color; | |
| 44 | + | @define-color theme_base_color @view_bg_color; | |
| 45 | + | @define-color theme_text_color @view_fg_color; | |
| 46 | + | @define-color theme_selected_bg_color @accent_bg_color; | |
| 47 | + | @define-color theme_selected_fg_color @accent_fg_color; | |
| 48 | + | @define-color insensitive_fg_color {{colors.outline.default.hex}}; | |
| 49 | + | ||
| 50 | + | /* ---- Nothing-ish shapes: pills, round popovers; joined groups keep straight inner corners ---- */ | |
| 51 | + | button, entry { border-radius: 999px; } | |
| 52 | + | entry { padding-left: 14px; padding-right: 14px; } | |
| 53 | + | .linked:not(.vertical) > button:not(:first-child), .linked:not(.vertical) > entry:not(:first-child) { border-top-left-radius: 0; border-bottom-left-radius: 0; } | |
| 54 | + | .linked:not(.vertical) > button:not(:last-child), .linked:not(.vertical) > entry:not(:last-child) { border-top-right-radius: 0; border-bottom-right-radius: 0; } | |
| 55 | + | .linked.vertical > button, .linked.vertical > entry { border-radius: 12px; } | |
| 56 | + | popover > contents, popover.background { border-radius: 24px; } | |
| 57 | + | scrollbar slider { border-radius: 999px; } | |
| @@ -1,10 +1,14 @@ | |||
| 1 | − | -- Auto-generated by matugen, do not edit, edit the template instead | |
| 1 | + | -- Auto-generated by matugen, do not edit, edit the template instead (Material You roles, like aurora) | |
| 2 | 2 | return { | |
| 3 | − | primary = "rgba({{colors.primary_container.default.hex_stripped}}ff)", | |
| 3 | + | primary = "rgba({{colors.primary.default.hex_stripped}}ff)", | |
| 4 | + | container = "rgba({{colors.primary_container.default.hex_stripped}}ff)", | |
| 4 | 5 | secondary = "rgba({{colors.secondary.default.hex_stripped}}ff)", | |
| 5 | 6 | tertiary = "rgba({{colors.tertiary.default.hex_stripped}}ff)", | |
| 6 | − | surface = "rgba({{colors.surface.default.hex_stripped | set_lightness: 5.0}}ff)", | |
| 7 | − | surface_high = "rgba({{colors.surface.default.hex_stripped | set_lightness: 14.0}}ff)", | |
| 7 | + | surface = "rgba({{colors.surface.default.hex_stripped}}ff)", | |
| 8 | + | surface_lowest = "rgba({{colors.surface_container_lowest.default.hex_stripped}}ff)", | |
| 9 | + | surface_high = "rgba({{colors.surface_container_high.default.hex_stripped}}ff)", | |
| 10 | + | surface_highest = "rgba({{colors.surface_container_highest.default.hex_stripped}}ff)", | |
| 11 | + | on_surface = "rgba({{colors.on_surface.default.hex_stripped}}ff)", | |
| 8 | 12 | outline = "rgba({{colors.outline.default.hex_stripped}}ff)", | |
| 9 | 13 | outline_variant = "rgba({{colors.outline_variant.default.hex_stripped}}ff)", | |
| 10 | 14 | error = "rgba({{colors.error.default.hex_stripped}}ff)", | |
| @@ -1,10 +1,13 @@ | |||
| 1 | − | # Auto-generated by matugen. Fallback only: aurora's ~/.config/aurora/hyprlock-colors.conf overrides it. | |
| 2 | − | $bg = rgba({{colors.surface.default.hex_stripped | set_lightness: 5.0}}ff) | |
| 1 | + | # Auto-generated by matugen. Fallback only: aurora's ~/.config/aurora/hyprlock-colors.conf overrides it (same names). | |
| 2 | + | $bg = rgba({{colors.surface_container_lowest.default.hex_stripped}}ff) | |
| 3 | 3 | $fg = rgba({{colors.on_surface.default.hex_stripped}}ff) | |
| 4 | − | $accent = rgba({{colors.primary_container.default.hex_stripped}}ff) | |
| 5 | − | $accentDim = rgba({{colors.primary_container.default.hex_stripped | set_lightness: 25.0}}ff) | |
| 6 | − | $surface = rgba({{colors.surface.default.hex_stripped | set_lightness: 10.0}}ff) | |
| 7 | − | $surfaceHi = rgba({{colors.surface.default.hex_stripped | set_lightness: 14.0}}ff) | |
| 8 | − | $line = rgba({{colors.outline_variant.default.hex_stripped}}ff) | |
| 9 | − | $dim = rgba({{colors.on_surface_variant.default.hex_stripped}}ff) | |
| 4 | + | $fgDim = rgba({{colors.on_surface_variant.default.hex_stripped}}ff) | |
| 5 | + | $s1 = rgba({{colors.surface_container_low.default.hex_stripped}}ff) | |
| 6 | + | $s2 = rgba({{colors.surface_container_high.default.hex_stripped}}ff) | |
| 7 | + | $s3 = rgba({{colors.surface_container_highest.default.hex_stripped}}ff) | |
| 8 | + | $mute = rgba({{colors.outline_variant.default.hex_stripped}}ff) | |
| 9 | + | $grey = rgba({{colors.outline.default.hex_stripped}}ff) | |
| 10 | + | $fill = rgba({{colors.primary.default.hex_stripped}}ff) | |
| 11 | + | $fillFg = rgba({{colors.on_primary.default.hex_stripped}}ff) | |
| 12 | + | $live = rgba({{colors.tertiary.default.hex_stripped}}ff) | |
| 10 | 13 | $err = rgba({{colors.error.default.hex_stripped}}ff) | |
| @@ -1,7 +1,7 @@ | |||
| 1 | − | # Auto-generated by matugen, do not edit, edit the template instead. qt6ct/qt5ct colour scheme. | |
| 1 | + | # Auto-generated by matugen, do not edit, edit the template instead. qt6ct/qt5ct colour scheme (Material You roles). | |
| 2 | 2 | # Order: WindowText Button Light Midlight Dark Mid Text BrightText ButtonText Base Window Shadow | |
| 3 | 3 | # Highlight HighlightedText Link LinkVisited AlternateBase NoRole ToolTipBase ToolTipText PlaceholderText | |
| 4 | 4 | [ColorScheme] | |
| 5 | − | active_colors={{colors.on_surface.default.hex}}, {{colors.surface.default.hex | set_lightness: 14.0}}, {{colors.surface.default.hex | set_lightness: 18.0}}, {{colors.surface.default.hex | set_lightness: 14.0}}, {{colors.surface.default.hex | set_lightness: 3.0}}, {{colors.surface.default.hex | set_lightness: 10.0}}, {{colors.on_surface.default.hex}}, {{colors.on_surface.default.hex}}, {{colors.on_surface.default.hex}}, {{colors.surface.default.hex | set_lightness: 8.0}}, {{colors.surface.default.hex | set_lightness: 5.0}}, #ff000000, {{colors.primary_container.default.hex}}, {{colors.on_primary_container.default.hex}}, {{colors.primary.default.hex}}, {{colors.tertiary.default.hex}}, {{colors.surface.default.hex | set_lightness: 10.0}}, {{colors.surface.default.hex | set_lightness: 5.0}}, {{colors.surface.default.hex | set_lightness: 18.0}}, {{colors.on_surface.default.hex}}, {{colors.on_surface_variant.default.hex}} | |
| 6 | − | inactive_colors={{colors.on_surface.default.hex}}, {{colors.surface.default.hex | set_lightness: 14.0}}, {{colors.surface.default.hex | set_lightness: 18.0}}, {{colors.surface.default.hex | set_lightness: 14.0}}, {{colors.surface.default.hex | set_lightness: 3.0}}, {{colors.surface.default.hex | set_lightness: 10.0}}, {{colors.on_surface.default.hex}}, {{colors.on_surface.default.hex}}, {{colors.on_surface.default.hex}}, {{colors.surface.default.hex | set_lightness: 8.0}}, {{colors.surface.default.hex | set_lightness: 5.0}}, #ff000000, {{colors.primary_container.default.hex | set_lightness: 25.0}}, {{colors.on_primary_container.default.hex}}, {{colors.primary.default.hex}}, {{colors.tertiary.default.hex}}, {{colors.surface.default.hex | set_lightness: 10.0}}, {{colors.surface.default.hex | set_lightness: 5.0}}, {{colors.surface.default.hex | set_lightness: 18.0}}, {{colors.on_surface.default.hex}}, {{colors.on_surface_variant.default.hex}} | |
| 7 | − | disabled_colors={{colors.outline.default.hex}}, {{colors.surface.default.hex | set_lightness: 10.0}}, {{colors.surface.default.hex | set_lightness: 14.0}}, {{colors.surface.default.hex | set_lightness: 10.0}}, {{colors.surface.default.hex | set_lightness: 3.0}}, {{colors.surface.default.hex | set_lightness: 8.0}}, {{colors.outline.default.hex}}, {{colors.outline.default.hex}}, {{colors.outline.default.hex}}, {{colors.surface.default.hex | set_lightness: 5.0}}, {{colors.surface.default.hex | set_lightness: 5.0}}, #ff000000, {{colors.surface.default.hex | set_lightness: 18.0}}, {{colors.outline.default.hex}}, {{colors.outline.default.hex}}, {{colors.outline.default.hex}}, {{colors.surface.default.hex | set_lightness: 8.0}}, {{colors.surface.default.hex | set_lightness: 5.0}}, {{colors.surface.default.hex | set_lightness: 14.0}}, {{colors.outline.default.hex}}, {{colors.outline.default.hex}} | |
| 5 | + | active_colors={{colors.on_surface.default.hex}}, {{colors.surface_container_high.default.hex}}, {{colors.surface_container_highest.default.hex}}, {{colors.surface_container_high.default.hex}}, {{colors.surface_container_lowest.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.on_surface.default.hex}}, {{colors.on_surface.default.hex}}, {{colors.on_surface.default.hex}}, {{colors.surface_container_low.default.hex}}, {{colors.surface.default.hex}}, #ff000000, {{colors.primary.default.hex}}, {{colors.on_primary.default.hex}}, {{colors.primary.default.hex}}, {{colors.tertiary.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.surface.default.hex}}, {{colors.surface_container_highest.default.hex}}, {{colors.on_surface.default.hex}}, {{colors.on_surface_variant.default.hex}} | |
| 6 | + | inactive_colors={{colors.on_surface.default.hex}}, {{colors.surface_container_high.default.hex}}, {{colors.surface_container_highest.default.hex}}, {{colors.surface_container_high.default.hex}}, {{colors.surface_container_lowest.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.on_surface.default.hex}}, {{colors.on_surface.default.hex}}, {{colors.on_surface.default.hex}}, {{colors.surface_container_low.default.hex}}, {{colors.surface.default.hex}}, #ff000000, {{colors.primary_container.default.hex}}, {{colors.on_primary_container.default.hex}}, {{colors.primary.default.hex}}, {{colors.tertiary.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.surface.default.hex}}, {{colors.surface_container_highest.default.hex}}, {{colors.on_surface.default.hex}}, {{colors.on_surface_variant.default.hex}} | |
| 7 | + | disabled_colors={{colors.outline.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.surface_container_high.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.surface_container_lowest.default.hex}}, {{colors.surface_container_low.default.hex}}, {{colors.outline.default.hex}}, {{colors.outline.default.hex}}, {{colors.outline.default.hex}}, {{colors.surface.default.hex}}, {{colors.surface.default.hex}}, #ff000000, {{colors.surface_container_highest.default.hex}}, {{colors.outline.default.hex}}, {{colors.outline.default.hex}}, {{colors.outline.default.hex}}, {{colors.surface_container_low.default.hex}}, {{colors.surface.default.hex}}, {{colors.surface_container_high.default.hex}}, {{colors.outline.default.hex}}, {{colors.outline.default.hex}} | |
| @@ -9,4 +9,4 @@ style=Fusion | |||
| 9 | 9 | ||
| 10 | 10 | [Fonts] | |
| 11 | 11 | fixed="JetBrainsMonoNL Nerd Font Mono,10,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" | |
| 12 | − | general="JetBrainsMonoNL Nerd Font Mono,10,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" | |
| 12 | + | general="Space Grotesk,9,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" | |
| @@ -9,4 +9,4 @@ style=Fusion | |||
| 9 | 9 | ||
| 10 | 10 | [Fonts] | |
| 11 | 11 | fixed="JetBrainsMonoNL Nerd Font Mono,10,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" | |
| 12 | − | general="JetBrainsMonoNL Nerd Font Mono,10,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" | |
| 12 | + | general="Space Grotesk,9,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" | |
| @@ -123,9 +123,12 @@ Singleton { | |||
| 123 | 123 | return "rgba(" + h(v.r) + h(v.g) + h(v.b) + h(v.a) + ")" | |
| 124 | 124 | } | |
| 125 | 125 | return ["# generated by aurora (Theme.qml); edit the palette there, not here", | |
| 126 | − | "$bg = " + c(bg), "$fg = " + c(fg), "$accent = " + c(accent), "$accentDim = " + c(accentDim), | |
| 127 | − | "$surface = " + c(surface), "$surfaceHi = " + c(surfaceHi), "$line = " + c(line), | |
| 128 | − | "$dim = " + c(dim), "$err = " + c(err), "$font = " + font, ""].join("\n") | |
| 126 | + | "$bg = " + c(bg), "$fg = " + c(fg), "$fgDim = " + c(fgDim), "$s1 = " + c(s1), "$s2 = " + c(s2), "$s3 = " + c(s3), | |
| 127 | + | "$mute = " + c(mute), "$grey = " + c(grey), "$fill = " + c(fill), "$fillFg = " + c(fillFg), "$live = " + c(live), | |
| 128 | + | "$err = " + c(err), "$dot = " + dot + " Black", "$ui = " + ui, "$mono = " + mono, | |
| 129 | + | // old names, for an older hyprlock.conf | |
| 130 | + | "$accent = " + c(accent), "$accentDim = " + c(accentDim), "$surface = " + c(surface), "$surfaceHi = " + c(surfaceHi), | |
| 131 | + | "$line = " + c(line), "$dim = " + c(dim), "$font = " + font, ""].join("\n") | |
| 129 | 132 | } | |
| 130 | 133 | onLockConfChanged: lockTimer.restart() | |
| 131 | 134 | Timer { id: lockTimer; interval: 500; onTriggered: lockFv.setText(root.lockConf) } | |