Krolyxon
Commit 11182a7

Branches

Refs →

aurora11182a7

aurora: nothing os redesign, phase 7 (cleanup)

Author
krolyxon
Date
2026-10-28 21:33 +0530
Parent
9f61535
Commit
11182a735a08b97d020780e7114b4160f8f597f5

+30 −70

20 files changed

Browse files Patch
−Context 3+
  1. M .config/quickshell/aurora/Bar.qml +1 −1
  2. M .config/quickshell/aurora/CalPopup.qml +1 −1
  3. M .config/quickshell/aurora/CharPicker.qml +3 −3
  4. M .config/quickshell/aurora/ClipWindow.qml +1 −1
  5. M .config/quickshell/aurora/ControlPanel.qml +1 −1
  6. M .config/quickshell/aurora/Dock.qml +1 −1
  7. M .config/quickshell/aurora/Runner.qml +1 −1
  8. M .config/quickshell/aurora/SetAbout.qml +3 −3
  9. M .config/quickshell/aurora/SetAppearance.qml +2 −4
  10. M .config/quickshell/aurora/SetDisplay.qml +5 −5
  11. M .config/quickshell/aurora/SetInput.qml +1 −1
  12. M .config/quickshell/aurora/SetKeys.qml +1 −1
  13. M .config/quickshell/aurora/SetPower.qml +2 −2
  14. M .config/quickshell/aurora/SetShell.qml +2 −2
  15. M .config/quickshell/aurora/SetWindows.qml +1 −1
  16. M .config/quickshell/aurora/Settings.qml +1 −7
  17. M .config/quickshell/aurora/Theme.qml +1 −32
  18. M .config/quickshell/aurora/WallPicker.qml +1 −1
  19. M README.md +1 −1
  20. M packages/desktop.txt +0 −1
M .config/quickshell/aurora/Bar.qml View
@@ -79,7 +79,7 @@ PanelWindow {
7979 Rectangle {
8080 id: pill
8181 anchors.fill: parent
82− color: Qt.rgba(Theme.s1.r, Theme.s1.g, Theme.s1.b, Theme.barAlpha)
82+ color: Theme.fade(Theme.s1, Theme.barAlpha)
8383 Rectangle { // hairline along the bottom
8484 anchors.left: parent.left
8585 anchors.right: parent.right
M .config/quickshell/aurora/CalPopup.qml View
@@ -75,7 +75,7 @@ PanelWindow {
7575 width: 384
7676 height: col.implicitHeight + 44
7777 radius: 36
78− color: Qt.rgba(Theme.s1.r, Theme.s1.g, Theme.s1.b, Theme.panelAlpha)
78+ color: Theme.fade(Theme.s1, Theme.panelAlpha)
7979 border.width: 1
8080 border.color: Theme.s2
8181 focus: true
M .config/quickshell/aurora/CharPicker.qml View
@@ -139,7 +139,7 @@ PanelWindow {
139139 view.currentIndex = Math.max(0, Math.min(results.length - 1, view.currentIndex + d * step))
140140 }
141141 function fontOf(it) {
142− return it && it.s !== undefined && Chars.sets[it.s] && Chars.sets[it.s].id === "emoji" ? "Noto Color Emoji" : Theme.font
142+ return it && it.s !== undefined && Chars.sets[it.s] && Chars.sets[it.s].id === "emoji" ? "Noto Color Emoji" : Theme.nf
143143 }
144144
145145 Rectangle {
@@ -157,7 +157,7 @@ PanelWindow {
157157 height: Math.min(parent.height - 160, 740)
158158 opacity: win.t
159159 radius: 44
160− color: Qt.rgba(Theme.s1.r, Theme.s1.g, Theme.s1.b, Theme.panelAlpha)
160+ color: Theme.fade(Theme.s1, Theme.panelAlpha)
161161 border.width: 1
162162 border.color: Theme.s2
163163 MouseArea { anchors.fill: parent }
@@ -528,7 +528,7 @@ PanelWindow {
528528 text: win.buffer
529529 elide: Text.ElideLeft
530530 color: Theme.fg
531− font.family: Theme.font
531+ font.family: Theme.nf
532532 font.pixelSize: 20
533533 }
534534 }
M .config/quickshell/aurora/ClipWindow.qml View
@@ -82,7 +82,7 @@ PanelWindow {
8282 height: Math.min(parent.height - 160, 780)
8383 opacity: win.t
8484 radius: 44
85− color: Qt.rgba(Theme.s1.r, Theme.s1.g, Theme.s1.b, Theme.panelAlpha)
85+ color: Theme.fade(Theme.s1, Theme.panelAlpha)
8686 border.width: 1
8787 border.color: Theme.s2
8888 MouseArea { anchors.fill: parent }
M .config/quickshell/aurora/ControlPanel.qml View
@@ -57,7 +57,7 @@ PanelWindow {
5757 height: Math.min(parent.height, col.implicitHeight + 44)
5858 opacity: win.t
5959 radius: 36
60− color: Qt.rgba(Theme.s1.r, Theme.s1.g, Theme.s1.b, Theme.panelAlpha)
60+ color: Theme.fade(Theme.s1, Theme.panelAlpha)
6161 border.width: 1
6262 border.color: Theme.s2
6363 focus: true
M .config/quickshell/aurora/Dock.qml View
@@ -95,7 +95,7 @@ PanelWindow {
9595 y: win.shown ? 0 : parent.height
9696 Behavior on y { enabled: Theme.motion; NumberAnimation { duration: Theme.t; easing.type: Easing.BezierSpline; easing.bezierCurve: Theme.glide } }
9797 radius: height / 2
98− color: Qt.rgba(Theme.s1.r, Theme.s1.g, Theme.s1.b, Theme.panelAlpha)
98+ color: Theme.fade(Theme.s1, Theme.panelAlpha)
9999 border.width: 1
100100 border.color: Theme.s2
101101
M .config/quickshell/aurora/Runner.qml View
@@ -393,7 +393,7 @@ PanelWindow {
393393 height: 30 + 66 + (win.rowsShown > 0 ? 20 + win.rowsShown * win.rowH : 0) + 30
394394 opacity: win.t
395395 radius: 44
396− color: Qt.rgba(Theme.s1.r, Theme.s1.g, Theme.s1.b, Theme.panelAlpha)
396+ color: Theme.fade(Theme.s1, Theme.panelAlpha)
397397 border.width: 1
398398 border.color: Theme.s2
399399 MouseArea { anchors.fill: parent }
M .config/quickshell/aurora/SetAbout.qml View
@@ -49,7 +49,7 @@ Flickable {
4949 spacing: 14
5050 Text {
5151 text: Theme.iArch
52− color: Theme.accent
52+ color: Theme.fill
5353 font.family: Theme.ui
5454 font.pixelSize: 56
5555 }
@@ -65,7 +65,7 @@ Flickable {
6565 Text {
6666 text: Quickshell.env("USER") + "@" + (flick.info.length > 2 ? flick.info[2][1] : "")
6767 + " · up " + Theme.fmtTime(SysStats.uptime)
68− color: Theme.dim
68+ color: Theme.fgDim
6969 font.family: Theme.ui
7070 font.pixelSize: 15
7171 }
@@ -82,7 +82,7 @@ Flickable {
8282 Text {
8383 Layout.preferredWidth: 150
8484 text: modelData[0]
85− color: Theme.accent
85+ color: Theme.fill
8686 font.family: Theme.ui
8787 font.pixelSize: 15
8888 }
M .config/quickshell/aurora/SetAppearance.qml View
@@ -23,7 +23,7 @@ Flickable {
2323 Layout.leftMargin: 18
2424 text: Wall.current !== "" ? Wall.current.replace(Wall.home, "~") : "-"
2525 elide: Text.ElideLeft
26− color: Theme.dim
26+ color: Theme.fgDim
2727 font.family: Theme.ui
2828 font.pixelSize: 14
2929 }
@@ -92,7 +92,7 @@ Flickable {
9292 Layout.leftMargin: 18
9393 text: "matugen scheme from the wallpaper, accent = its primary"
9494 elide: Text.ElideRight
95− color: Theme.dim
95+ color: Theme.fgDim
9696 font.family: Theme.ui
9797 font.pixelSize: 14
9898 }
@@ -113,8 +113,6 @@ Flickable {
113113 Knob { label: "contrast"; from: -1; to: 1; decimals: 2; value: Settings.matuContrast; onMoved: v => Settings.matuContrast = v }
114114
115115 SectionLabel { text: "sizes" }
116− Knob { label: "font size"; from: 9; to: 18; value: Settings.fontSize; onMoved: v => Settings.fontSize = v }
117− Knob { label: "workspace icons"; from: 8; to: 18; value: Settings.wsFontSize; onMoved: v => Settings.wsFontSize = v }
118116 Knob { label: "bar height"; from: 32; to: 56; value: Settings.barSize; onMoved: v => Settings.barSize = v }
119117
120118 SectionLabel { text: "transparency" }
M .config/quickshell/aurora/SetDisplay.qml View
@@ -147,9 +147,9 @@ Flickable {
147147 Layout.fillWidth: true
148148 visible: flick.countdown > 0
149149 implicitHeight: 40
150− color: Theme.surface
150+ color: Theme.s2
151151 border.width: 1
152− border.color: Theme.accent
152+ border.color: Theme.fill
153153 RowLayout {
154154 anchors.fill: parent
155155 anchors.margins: 6
@@ -188,7 +188,7 @@ Flickable {
188188 Layout.fillWidth: true
189189 Layout.leftMargin: 18
190190 text: "applies whenever a monitor is plugged in. external only turns the laptop panel back on when the last external screen is unplugged."
191− color: Theme.dim
191+ color: Theme.fgDim
192192 wrapMode: Text.WordWrap
193193 font.family: Theme.ui
194194 font.pixelSize: 14
@@ -211,7 +211,7 @@ Flickable {
211211 text: mon.m.description + (mon.m.disabled ? " · disabled"
212212 : " · " + mon.curMode + " @ " + mon.m.refreshRate.toFixed(2) + "Hz · scale " + mon.m.scale
213213 + " · at " + mon.m.x + "," + mon.m.y)
214− color: Theme.dim
214+ color: Theme.fgDim
215215 elide: Text.ElideRight
216216 font.family: Theme.ui
217217 font.pixelSize: 14
@@ -281,7 +281,7 @@ Flickable {
281281 Text {
282282 visible: !Toggles.hasNightLight
283283 text: "night light: gammastep isn't running"
284− color: Theme.dim
284+ color: Theme.fgDim
285285 font.family: Theme.ui
286286 font.pixelSize: 14
287287 }
M .config/quickshell/aurora/SetInput.qml View
@@ -74,7 +74,7 @@ Flickable {
7474 Layout.leftMargin: 18
7575 text: "per-device settings (hl.device) stay in source/input.lua"
7676 elide: Text.ElideRight
77− color: Theme.dim
77+ color: Theme.fgDim
7878 font.family: Theme.ui
7979 font.pixelSize: 13
8080 }
M .config/quickshell/aurora/SetKeys.qml View
@@ -142,7 +142,7 @@ ColumnLayout {
142142 }
143143 Text {
144144 text: page.binds.length + " binds · " + page.file.replace(Quickshell.env("HOME"), "~")
145− color: Theme.dim
145+ color: Theme.fgDim
146146 font.family: Theme.ui
147147 font.pixelSize: 13
148148 }
M .config/quickshell/aurora/SetPower.qml View
@@ -84,7 +84,7 @@ Flickable {
8484 ? "the firmware stops charging at ~80%, even when aurora isn't running. Conservation mode is "
8585 + (Battery.capOn ? "on" : "off") + "."
8686 : "charges to 100%"
87− color: Theme.dim
87+ color: Theme.fgDim
8888 font.family: Theme.ui
8989 font.pixelSize: 13
9090 }
@@ -150,7 +150,7 @@ Flickable {
150150 Layout.fillWidth: true
151151 Layout.leftMargin: 18
152152 text: "saved to ~/.config/aurora/hypridle.conf, hypridle restarts on change"
153− color: Theme.dim
153+ color: Theme.fgDim
154154 elide: Text.ElideLeft
155155 font.family: Theme.ui
156156 font.pixelSize: 13
M .config/quickshell/aurora/SetShell.qml View
@@ -23,7 +23,7 @@ Flickable {
2323 Switch { label: "dock"; hint: "autohides at the bottom edge"; checked: Settings.dock; onToggled: on => Settings.dock = on }
2424 Text {
2525 text: "pinned apps (pin more from the dock's right-click)"
26− color: Theme.dim
26+ color: Theme.fgDim
2727 font.family: Theme.ui
2828 font.pixelSize: 14
2929 }
@@ -70,7 +70,7 @@ Flickable {
7070 Layout.leftMargin: 18
7171 text: "~/.config/aurora/settings.json"
7272 elide: Text.ElideLeft
73− color: Theme.dim
73+ color: Theme.fgDim
7474 font.family: Theme.ui
7575 font.pixelSize: 13
7676 }
M .config/quickshell/aurora/SetWindows.qml View
@@ -102,7 +102,7 @@ Flickable {
102102 Layout.leftMargin: 18
103103 text: "saved to ~/.config/aurora/hypr.lua (loaded last by hyprland.lua)"
104104 elide: Text.ElideLeft
105− color: Theme.dim
105+ color: Theme.fgDim
106106 font.family: Theme.ui
107107 font.pixelSize: 13
108108 }
M .config/quickshell/aurora/Settings.qml View
@@ -11,7 +11,7 @@ Singleton {
1111
1212 // defaults live here; reset() puts them back
1313 readonly property var defaults: ({
14− fontSize: 12, wsFontSize: 11, barHeight: 22, barAlpha: 1.0, panelAlpha: 1.0, matuScheme: "scheme-content", matuContrast: 0.0,
14+ barAlpha: 1.0, panelAlpha: 1.0, matuScheme: "scheme-content", matuContrast: 0.0,
1515 osdTimeout: 1500, desktopClock: true, desktopViz: true, vizBars: 64,
1616 dock: true, dockPinned: ["foot", "librewolf", "pcmanfm", "obsidian"], wallFolder: "dusky-dark",
1717 notifSound: true, notifVolume: 0.7,
@@ -23,9 +23,6 @@ Singleton {
2323 blink: true
2424 })
2525
26− property alias fontSize: a.fontSize
27− property alias wsFontSize: a.wsFontSize
28− property alias barHeight: a.barHeight
2926 property alias barAlpha: a.barAlpha
3027 property alias panelAlpha: a.panelAlpha
3128 property alias matuScheme: a.matuScheme
@@ -86,9 +83,6 @@ Singleton {
8683 }
8784 adapter: JsonAdapter {
8885 id: a
89− property int fontSize: 12
90− property int wsFontSize: 11
91− property int barHeight: 22
9286 property real barAlpha: 1.0
9387 property real panelAlpha: 1.0 // control panel / popup opacity (settings > appearance)
9488 property string matuScheme: "scheme-content" // matugen -t (Wall.qml), accent = its primary_container (= wallpaper colour)
M .config/quickshell/aurora/Theme.qml View
@@ -13,11 +13,8 @@ Singleton {
1313 readonly property string ui: "Space Grotesk" // UI text: titles DemiBold, body Regular, greeting Light
1414 readonly property string mono: "Space Mono" // caps labels (Lb)
1515 readonly property string nf: "JetBrainsMono Nerd Font" // icons only (Icon)
16− property string font: nf // legacy: text not restyled yet (goes away in the cleanup)
1716
1817 // ---- knobs (persisted in ~/.config/aurora/settings.json, edited in the settings app) ----
19− readonly property int fontSize: Settings.fontSize
20− readonly property int wsFontSize: Settings.wsFontSize // workspace icons only; everything else uses fontSize
2118 readonly property real panelAlpha: Settings.panelAlpha
2219 readonly property int barSize: Math.max(32, Settings.barSize) // the bar's height (docked at the top)
2320 readonly property int barHeight: barSize // what the bar reserves at the top
@@ -98,21 +95,6 @@ Singleton {
9895 return Settings.clock24 ? (h < 10 ? "0" : "") + h : String(h % 12 || 12)
9996 }
10097
101− // legacy names for files not restyled yet (removed in the cleanup phase)
102− readonly property color accent: fill
103− readonly property color accentFg: fillFg
104− readonly property color accentDim: container
105− readonly property color ink: fillFg
106− readonly property color secondary: mat.secondary
107− readonly property color tertiary: mat.tertiary
108− readonly property color surface: s2
109− readonly property color surfaceHi: s3
110− readonly property color line: mute
111− readonly property color dim: fgDim
112− readonly property color cursorC: fill
113− readonly property color barBg: Qt.rgba(bg.r, bg.g, bg.b, barAlpha)
114− readonly property color bgA: Qt.rgba(s1.r, s1.g, s1.b, panelAlpha)
115−
11698 // ---- hyprlock -----------------------------------------------------
11799 // hyprlock stays a separate process (crash safety); it sources ~/.config/aurora/hyprlock-colors.conf,
118100 // written here so the lock uses the resolved palette (incl. the settings-picked accent).
@@ -126,9 +108,7 @@ Singleton {
126108 "$bg = " + c(bg), "$fg = " + c(fg), "$fgDim = " + c(fgDim), "$s1 = " + c(s1), "$s2 = " + c(s2), "$s3 = " + c(s3),
127109 "$mute = " + c(mute), "$grey = " + c(grey), "$fill = " + c(fill), "$fillFg = " + c(fillFg), "$live = " + c(live),
128110 "$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")
111+ ""].join("\n")
132112 }
133113 onLockConfChanged: lockTimer.restart()
134114 Timer { id: lockTimer; interval: 500; onTriggered: lockFv.setText(root.lockConf) }
@@ -244,17 +224,6 @@ Singleton {
244224 readonly property string iLink: cp(0xF0339) // link-variant
245225 readonly property string iCode: cp(0xF0169) // code-braces
246226
247− // workspace icons: the exact Font Awesome glyphs from your waybar config.
248− // 1 browser, 2 code, 3 book, 4 cog, 5 chat, 6 file, 7 folder, 8 terminal, 9 flask, 10 image
249− // 11-20 repeat the same ten, like your waybar format-icons did
250− readonly property var wsIcons: [
251− String.fromCharCode(0xf269), String.fromCharCode(0xf121), String.fromCharCode(0xf02d),
252− String.fromCharCode(0xf085), String.fromCharCode(0xf086), String.fromCharCode(0xf1c9),
253− String.fromCharCode(0xf07c), String.fromCharCode(0xf120), String.fromCharCode(0xf0c3),
254− String.fromCharCode(0xf03e)
255− ]
256− function wsIcon(id) { return id >= 1 ? wsIcons[(id - 1) % 10] : String(id) }
257−
258227 readonly property var batLevels: [0xF007A, 0xF007B, 0xF007C, 0xF007D, 0xF007E,
259228 0xF007F, 0xF0080, 0xF0081, 0xF0082, 0xF0079]
260229 function batIcon(p, charging, plugged) {
M .config/quickshell/aurora/WallPicker.qml View
@@ -112,7 +112,7 @@ PanelWindow {
112112 height: Math.round(parent.height * 0.46)
113113 opacity: win.t
114114 radius: 40
115− color: Qt.rgba(Theme.s1.r, Theme.s1.g, Theme.s1.b, Theme.panelAlpha)
115+ color: Theme.fade(Theme.s1, Theme.panelAlpha)
116116 border.width: 1
117117 border.color: Theme.s2
118118 MouseArea { anchors.fill: parent } // clicks on the card don't close
M README.md View
@@ -79,7 +79,7 @@ The lists live in `packages/*.txt`: one package per line, `#` for comments, and
7979 ## What's inside
8080 | | |
8181 |---|---|
82−| WM | Hyprland (Lua config), hypridle, hyprlock, hyprpaper |
82+| WM | Hyprland (Lua config), hypridle, hyprlock; aurora draws the wallpaper (mono dots, colour dots or photo) |
8383 | Shell / bar | aurora (Quickshell) |
8484 | Theming | matugen: picking a wallpaper in aurora (or `setwall`) re-themes everything (GTK via adw-gtk3, Qt via qt6ct); accent = the wallpaper's own colour, near-black surfaces. The terminal (foot) too, with ANSI colours tinted toward the wallpaper |
8585 | Terminal / shell | foot, zsh |
M packages/desktop.txt View
@@ -4,7 +4,6 @@
44 hyprland
55 hypridle
66 hyprlock
7−hyprpaper
87 hyprpicker
98 hyprpolkitagent
109 hyprshot