vinzenz/nova-shell
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix fmt

Browse source
This commit is contained in:
Damocles 2026-04-12 15:58:13 +02:00
parent 4df704844e
commit 9e1716aa39
14 changed files with 154 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/Backlight.qml
View file

@ -9,7 +9,8 @@ M.BarSection {
tooltip: "Brightness: " + root.percent + "%"
property int percent: 0
onPercentChanged: if (percent > 0) M.OsdState.show(percent / 100, "\uF185")
onPercentChanged: if (percent > 0)
M.OsdState.show(percent / 100, "\uF185")
Process {
id: adjProc

58
modules/Bar.qml
View file

@ -39,8 +39,12 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter
spacing: M.Theme.barSpacing
M.Clock { visible: M.Modules.clock }
M.Notifications { visible: M.Modules.notifications }
M.Clock {
visible: M.Modules.clock
}
M.Notifications {
visible: M.Modules.notifications
}
}
// ---- left ----
@ -50,7 +54,10 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter
spacing: M.Theme.barSpacing
M.Workspaces { bar: bar; visible: M.Modules.workspaces }
M.Workspaces {
bar: bar
visible: M.Modules.workspaces
}
M.Tray {
bar: bar
visible: M.Modules.tray
@ -59,7 +66,9 @@ PanelWindow {
Layout.maximumWidth: 400
visible: M.Modules.windowTitle
}
Item { Layout.fillWidth: true }
Item {
Layout.fillWidth: true
}
}
// ---- right ----
@ -76,38 +85,59 @@ PanelWindow {
// Media
M.BarGroup {
M.Mpris {}
M.Volume { visible: M.Modules.volume }
M.Volume {
visible: M.Modules.volume
}
}
// Connectivity
M.BarGroup {
M.Network { visible: M.Modules.network }
M.Network {
visible: M.Modules.network
}
M.Bluetooth {}
}
// Controls
M.BarGroup {
M.Backlight {}
M.PowerProfile { visible: M.Modules.powerProfile }
M.IdleInhibitor { visible: M.Modules.idleInhibitor }
M.PowerProfile {
visible: M.Modules.powerProfile
}
M.IdleInhibitor {
visible: M.Modules.idleInhibitor
}
}
// System
M.BarGroup {
M.Cpu { visible: M.Modules.cpu }
M.Memory { visible: M.Modules.memory }
M.Temperature { visible: M.Modules.temperature }
M.Cpu {
visible: M.Modules.cpu
}
M.Memory {
visible: M.Modules.memory
}
M.Temperature {
visible: M.Modules.temperature
}
}
// Status
M.BarGroup {
M.Weather { visible: M.Modules.weather }
M.Disk { visible: M.Modules.disk }
M.Weather {
visible: M.Modules.weather
}
M.Disk {
visible: M.Modules.disk
}
M.Battery {}
}
// Power
M.Power { bar: bar; visible: M.Modules.power }
M.Power {
bar: bar
visible: M.Modules.power
}
}
}
}

5
modules/Battery.qml
View file

@ -17,10 +17,7 @@ M.BarSection {
readonly property var dev: UPower.displayDevice
readonly property real pct: (dev?.percentage ?? 0) * 100
readonly property bool charging: dev?.state === UPowerDeviceState.Charging
readonly property color _stateColor: charging ? M.Theme.base0B
: pct < 15 ? M.Theme.base08
: pct < 30 ? M.Theme.base09
: M.Theme.base0B
readonly property color _stateColor: charging ? M.Theme.base0B : pct < 15 ? M.Theme.base08 : pct < 30 ? M.Theme.base09 : M.Theme.base0B
M.BarIcon {
icon: {

23
modules/Bluetooth.qml
View file

@ -7,8 +7,10 @@ M.BarSection {
spacing: M.Theme.moduleSpacing
visible: M.Modules.bluetooth && root.state !== "unavailable"
tooltip: {
if (root.state === "off") return "Bluetooth: off";
if (root.state === "connected") return "Bluetooth: " + root.device;
if (root.state === "off")
return "Bluetooth: off";
if (root.state === "connected")
return "Bluetooth: " + root.device;
return "Bluetooth: on";
}
@ -18,20 +20,14 @@ M.BarSection {
function _parse(text) {
const t = text.trim();
const sep = t.indexOf(":");
root.state = sep === -1 ? t : t.slice(0, sep);
root.state = sep === -1 ? t : t.slice(0, sep);
root.device = sep === -1 ? "" : t.slice(sep + 1);
}
Process {
id: proc
running: true
command: ["sh", "-c",
"s=$(bluetoothctl show 2>/dev/null); " +
"[ -z \"$s\" ] && echo unavailable && exit; " +
"echo \"$s\" | grep -q 'Powered: yes' || { echo off:; exit; }; " +
"d=$(bluetoothctl info 2>/dev/null | awk -F': ' '/\\tName:/{n=$2}/Connected: yes/{c=1}END{if(c)print n}'); " +
"[ -n \"$d\" ] && echo \"connected:$d\" || echo on:"
]
command: ["sh", "-c", "s=$(bluetoothctl show 2>/dev/null); " + "[ -z \"$s\" ] && echo unavailable && exit; " + "echo \"$s\" | grep -q 'Powered: yes' || { echo off:; exit; }; " + "d=$(bluetoothctl info 2>/dev/null | awk -F': ' '/\\tName:/{n=$2}/Connected: yes/{c=1}END{if(c)print n}'); " + "[ -n \"$d\" ] && echo \"connected:$d\" || echo on:"]
stdout: StdioCollector {
onStreamFinished: root._parse(text)
}
@ -47,14 +43,13 @@ M.BarSection {
id: toggle
property string cmd: ""
command: ["bluetoothctl", "power", cmd]
onRunningChanged: if (!running && cmd !== "") proc.running = true
onRunningChanged: if (!running && cmd !== "")
proc.running = true
}
M.BarIcon {
icon: "\uF294"
color: root.state === "connected" ? M.Theme.base0D
: root.state === "off" ? M.Theme.base04
: M.Theme.base0D
color: root.state === "connected" ? M.Theme.base0D : root.state === "off" ? M.Theme.base04 : M.Theme.base0D
anchors.verticalCenter: parent.verticalCenter
}
M.BarLabel {

5
modules/Flyout.qml
View file

@ -20,10 +20,7 @@ PanelWindow {
// Flush below bar, centered on hovered item
margins.top: 0
margins.left: Math.max(0, Math.min(
Math.round(M.FlyoutState.itemX - implicitWidth / 2),
screen.width - implicitWidth
))
margins.left: Math.max(0, Math.min(Math.round(M.FlyoutState.itemX - implicitWidth / 2), screen.width - implicitWidth))
implicitWidth: label.implicitWidth + M.Theme.barPadding * 2
implicitHeight: label.implicitHeight + M.Theme.barPadding * 2

42
modules/PowerMenu.qml
View file

@ -10,7 +10,7 @@ PanelWindow {
required property var screen
required property real anchorX
signal menuClosed()
signal menuClosed
signal runCommand(var cmd)
readonly property bool _isNiri: Quickshell.env("NIRI_SOCKET") !== ""
@ -40,10 +40,7 @@ PanelWindow {
Item {
id: panel
x: Math.max(0, Math.min(
Math.round(menuWindow.anchorX - menuCol.width / 2),
menuWindow.width - menuCol.width
))
x: Math.max(0, Math.min(Math.round(menuWindow.anchorX - menuCol.width / 2), menuWindow.width - menuCol.width))
y: 0
width: menuCol.width
@ -73,11 +70,36 @@ PanelWindow {
Repeater {
model: [
{ label: "Lock", icon: "\uF023", cmd: ["loginctl", "lock-session"], color: M.Theme.base0D },
{ label: "Suspend", icon: "\uF186", cmd: ["systemctl", "suspend"], color: M.Theme.base0E },
{ label: "Logout", icon: "\uF2F5", cmd: menuWindow._isNiri ? ["niri", "msg", "action", "quit"] : ["loginctl", "terminate-user", ""], color: M.Theme.base0A },
{ label: "Reboot", icon: "\uF021", cmd: ["systemctl", "reboot"], color: M.Theme.base09 },
{ label: "Shutdown", icon: "\uF011", cmd: ["systemctl", "poweroff"], color: M.Theme.base08 }
{
label: "Lock",
icon: "\uF023",
cmd: ["loginctl", "lock-session"],
color: M.Theme.base0D
},
{
label: "Suspend",
icon: "\uF186",
cmd: ["systemctl", "suspend"],
color: M.Theme.base0E
},
{
label: "Logout",
icon: "\uF2F5",
cmd: menuWindow._isNiri ? ["niri", "msg", "action", "quit"] : ["loginctl", "terminate-user", ""],
color: M.Theme.base0A
},
{
label: "Reboot",
icon: "\uF021",
cmd: ["systemctl", "reboot"],
color: M.Theme.base09
},
{
label: "Shutdown",
icon: "\uF011",
cmd: ["systemctl", "poweroff"],
color: M.Theme.base08
}
]
delegate: Item {

4
modules/PowerProfile.qml
View file

@ -8,9 +8,7 @@ M.BarIcon {
property string profile: ""
color: root.profile === "performance" ? M.Theme.base09
: root.profile === "power-saver" ? M.Theme.base0B
: M.Theme.base05
color: root.profile === "performance" ? M.Theme.base09 : root.profile === "power-saver" ? M.Theme.base0B : M.Theme.base05
icon: {
if (root.profile === "performance")

24
modules/ScreenCorners.qml
View file

@ -70,8 +70,24 @@ Item {
}
}
Corner { corner: 0; anchors.top: true; anchors.left: true }
Corner { corner: 1; anchors.top: true; anchors.right: true }
Corner { corner: 2; anchors.bottom: true; anchors.left: true }
Corner { corner: 3; anchors.bottom: true; anchors.right: true }
Corner {
corner: 0
anchors.top: true
anchors.left: true
}
Corner {
corner: 1
anchors.top: true
anchors.right: true
}
Corner {
corner: 2
anchors.bottom: true
anchors.left: true
}
Corner {
corner: 3
anchors.bottom: true
anchors.right: true
}
}

4
modules/Temperature.qml
View file

@ -8,9 +8,7 @@ M.BarSection {
tooltip: "Temperature: " + root.celsius + "\u00B0C"
property int celsius: 0
readonly property color _stateColor: celsius > 80 ? M.Theme.base08
: celsius > 60 ? M.Theme.base09
: M.Theme.base0C
readonly property color _stateColor: celsius > 80 ? M.Theme.base08 : celsius > 60 ? M.Theme.base09 : M.Theme.base0C
FileView {
id: thermal

3
modules/Tray.qml
View file

@ -30,8 +30,7 @@ RowLayout {
HoverHandler {
onHoveredChanged: {
const tip = [iconItem.modelData.tooltipTitle, iconItem.modelData.tooltipDescription]
.filter(s => s).join("\n") || iconItem.modelData.title;
const tip = [iconItem.modelData.tooltipTitle, iconItem.modelData.tooltipDescription].filter(s => s).join("\n") || iconItem.modelData.title;
if (hovered && tip) {
M.FlyoutState.text = tip;
M.FlyoutState.itemX = iconItem.mapToGlobal(iconItem.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0);

10
modules/TrayMenu.qml
View file

@ -13,7 +13,7 @@ PanelWindow {
required property var screen
required property real anchorX
signal menuClosed()
signal menuClosed
// Current menu level — swapped when entering/leaving submenus
property var _currentHandle: handle
@ -41,10 +41,7 @@ PanelWindow {
Item {
id: panel
x: Math.max(0, Math.min(
Math.round(menuWindow.anchorX - menuCol.width / 2),
menuWindow.width - menuCol.width
))
x: Math.max(0, Math.min(Math.round(menuWindow.anchorX - menuCol.width / 2), menuWindow.width - menuCol.width))
y: 0
width: menuCol.width
@ -143,8 +140,7 @@ PanelWindow {
anchors.fill: parent
anchors.leftMargin: 4
anchors.rightMargin: 4
color: rowArea.containsMouse && entryItem.modelData.enabled
? M.Theme.base02 : "transparent"
color: rowArea.containsMouse && entryItem.modelData.enabled ? M.Theme.base02 : "transparent"
radius: M.Theme.radius
}

3
modules/WindowTitle.qml
View file

@ -14,7 +14,8 @@ M.BarSection {
property string _title: ""
property string _appId: ""
readonly property string _iconSource: {
if (!root._appId) return "";
if (!root._appId)
return "";
const entry = DesktopEntries.heuristicLookup(root._appId);
return entry ? Quickshell.iconPath(entry.icon) : "";
}

3
modules/Workspaces.qml
View file

@ -44,8 +44,7 @@ Row {
try {
const ev = JSON.parse(line);
if (ev.WorkspacesChanged !== undefined) {
root._allWorkspaces = ev.WorkspacesChanged.workspaces
.sort((a, b) => a.idx - b.idx);
root._allWorkspaces = ev.WorkspacesChanged.workspaces.sort((a, b) => a.idx - b.idx);
} else if (ev.WorkspaceActivated !== undefined) {
if (ev.WorkspaceActivated.focused)
root._activeId = ev.WorkspaceActivated.id;

69
nix/hm-module.nix
View file

@ -56,33 +56,37 @@ in
description = "Enable or disable individual bar modules.";
default = { };
type = lib.types.submodule {
options = lib.genAttrs
[
"workspaces"
"tray"
"windowTitle"
"clock"
"notifications"
"mpris"
"volume"
"bluetooth"
"backlight"
"network"
"powerProfile"
"idleInhibitor"
"weather"
"temperature"
"cpu"
"memory"
"disk"
"battery"
"power"
]
(name: lib.mkOption {
type = lib.types.bool;
default = true;
description = "Enable the ${name} module.";
});
options =
lib.genAttrs
[
"workspaces"
"tray"
"windowTitle"
"clock"
"notifications"
"mpris"
"volume"
"bluetooth"
"backlight"
"network"
"powerProfile"
"idleInhibitor"
"weather"
"temperature"
"cpu"
"memory"
"disk"
"battery"
"power"
]
(
name:
lib.mkOption {
type = lib.types.bool;
default = true;
description = "Enable the ${name} module.";
}
);
};
};
@ -123,12 +127,11 @@ in
};
config = lib.mkIf cfg.enable {
home.packages =
[
self.packages.${pkgs.stdenv.hostPlatform.system}.nova-shell-cli
pkgs.nerd-fonts.symbols-only
]
++ lib.optional cfg.modules.weather pkgs.wttrbar;
home.packages = [
self.packages.${pkgs.stdenv.hostPlatform.system}.nova-shell-cli
pkgs.nerd-fonts.symbols-only
]
++ lib.optional cfg.modules.weather pkgs.wttrbar;
xdg.configFile."nova-shell/modules.json".source =
(pkgs.formats.json { }).generate "nova-shell-modules.json"