aurorae179d72
hypr: border and hyprlock colours from matugen
+9 −15
3 files changed
- M .config/hypr/hyprland.lua +5 −2
- M .config/hypr/hyprlock.conf +2 −11
- M .config/hypr/source/appearance.lua +2 −2
| @@ -9,13 +9,16 @@ mainMod = "SUPER" | |||
| 9 | 9 | HOME = os.getenv("HOME") | |
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | − | -- Theme (pywal16) | |
| 13 | − | wal = dofile(HOME .. "/.cache/wal/hyprland-colors.lua") | |
| 12 | + | -- Theme (matugen, run by aurora on every wallpaper change; fallback until it has run once) | |
| 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 | 15 | ||
| 15 | 16 | -- ----------------------------------------------------- | |
| 16 | 17 | -- Autostart | |
| 17 | 18 | -- ----------------------------------------------------- | |
| 18 | 19 | hl.on("hyprland.start", function() | |
| 20 | + | -- GTK3 on Wayland reads its theme from gsettings, not settings.ini (colours: gtk-3.0/gtk.css, matugen) | |
| 21 | + | hl.exec_cmd("gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3-dark") | |
| 19 | 22 | hl.exec_cmd("wl-paste --type text --watch cliphist store") | |
| 20 | 23 | hl.exec_cmd("wl-paste --type image --watch cliphist store") | |
| 21 | 24 | hl.exec_cmd("hyprpm reload -n") | |
| @@ -1,16 +1,7 @@ | |||
| 1 | 1 | # hyprlock, styled like aurora (flat, square, accent borders, JetBrains Mono). | |
| 2 | − | # Colours: pywal first as a fallback, then aurora's resolved palette (incl. the accent picked in its settings), | |
| 2 | + | # Colours: matugen's output first as a fallback, then aurora's resolved palette, | |
| 3 | 3 | # written by aurora's Theme.qml to ~/.config/aurora/hyprlock-colors.conf. | |
| 4 | − | source = $HOME/.cache/wal/colors-hyprland.conf | |
| 5 | − | $bg = $background | |
| 6 | − | $fg = $foreground | |
| 7 | − | $accent = $color14 | |
| 8 | − | $accentDim = $color6 | |
| 9 | − | $surface = $color0 | |
| 10 | − | $surfaceHi = $color8 | |
| 11 | − | $line = $color8 | |
| 12 | − | $dim = $color8 | |
| 13 | − | $err = $color1 | |
| 4 | + | source = $HOME/.cache/matugen/hyprlock.conf | |
| 14 | 5 | $font = JetBrainsMono Nerd Font | |
| 15 | 6 | source = $HOME/.config/aurora/hyprlock-colors.conf | |
| 16 | 7 | ||
| @@ -13,12 +13,12 @@ hl.config({ | |||
| 13 | 13 | layout = "master", | |
| 14 | 14 | ||
| 15 | 15 | ["col.active_border"] = { | |
| 16 | − | colors = { wal.colors.color14, wal.colors.color14 }, | |
| 16 | + | colors = { colors.primary, colors.primary }, | |
| 17 | 17 | angle = 45, | |
| 18 | 18 | }, | |
| 19 | 19 | ||
| 20 | 20 | ["col.inactive_border"] = { | |
| 21 | − | colors = { wal.colors.color0, wal.colors.color0 }, | |
| 21 | + | colors = { colors.outline_variant, colors.outline_variant }, | |
| 22 | 22 | angle = 45, | |
| 23 | 23 | }, | |
| 24 | 24 | }, | |