nydragon/nysh
1
Fork 0
Code Issues Pull requests Activity Actions

chore: use quickshell's env getter

Browse source
This commit is contained in:
Nydragon 2024-11-17 15:27:05 +01:00
parent 187037fd25
commit f4fa7deadf
Signed by: nydragon
SSH key fingerprint: SHA256:WcjW5NJPQ8Dx4uQDmoIlVPLWE27Od3fxoe0IUvuoPHE
2 changed files with 41 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/shell.qml
View file

@ -12,4 +12,32 @@ ShellRoot {
}
}
}
Component.onCompleted: {
Quickshell.reloadCompleted.connect(() => loader.active = false);
Quickshell.reloadFailed.connect(e => {
loader.active = true;
loader.message = e;
});
}
LazyLoader {
id: loader
property string message: ""
PanelWindow {
anchors {
top: true
left: true
right: true
}
Text {
anchors.centerIn: parent
anchors.fill: parent
text: loader.message
}
}
}
}

33
src/widgets/workspaces/WorkspaceIPC.qml
View file

@ -1,4 +1,5 @@
import QtQuick
import Quickshell
import Quickshell.Io
import Quickshell.Hyprland
import Quickshell.I3
@ -24,27 +25,19 @@ Item {
}
}
Process {
command: ["env"]
running: true
Component.onCompleted: {
root.name = Quickshell.env("XDG_CURRENT_DESKTOP");
stdout: SplitParser {
onRead: data => {
if (data.startsWith("XDG_CURRENT_DESKTOP=")) {
root.name = data.slice(20);
switch (root.name) {
case "sway":
case "none+i3":
root.active = Qt.binding(() => I3.focusedWorkspace?.num ?? root.active);
break;
case "Hyprland":
root.active = Qt.binding(() => Hyprland.focusedMonitor?.activeWorkspace?.id ?? root.active);
break;
default:
console.log("This desktop is unhandled:", root.name);
}
}
}
switch (root.name) {
case "sway":
case "none+i3":
root.active = Qt.binding(() => I3.focusedWorkspace?.num ?? root.active);
break;
case "Hyprland":
root.active = Qt.binding(() => Hyprland.focusedMonitor?.activeWorkspace?.id ?? root.active);
break;
default:
console.log("This desktop is unhandled:", root.name);
}
}
}