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

feat: use quickshell native sway functions

Browse source
This commit is contained in:
Nydragon 2024-11-03 15:35:47 +01:00
parent 2a75912724
commit f31a57c15d
Signed by: nydragon
SSH key fingerprint: SHA256:WcjW5NJPQ8Dx4uQDmoIlVPLWE27Od3fxoe0IUvuoPHE
4 changed files with 13 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -23,17 +23,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730157521, "lastModified": 1730530038,
"narHash": "sha256-xyodl47NDih2SEYbRkAvv6lPbjjA/E9B0TlCLnGIFa8=", "narHash": "sha256-D3t7uwFNdgJNgSvoHAY+nX4azEkJFIIx7hntVAqihGU=",
"ref": "refs/heads/master", "owner": "nydragon",
"rev": "4e48c6eefb399abfcdefbe046a6a642bdcfcc1a6", "repo": "quickshell",
"revCount": 358, "rev": "28f281952d93768ec664f3eeb2becba5abdddf0d",
"type": "git", "type": "github"
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
}, },
"original": { "original": {
"type": "git", "owner": "nydragon",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell" "repo": "quickshell",
"type": "github"
} }
}, },
"root": { "root": {

2
flake.nix
View file

@ -5,7 +5,7 @@
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
quickshell = { quickshell = {
url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; url = "github:nydragon/quickshell";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };

34
src/provider/Sway.qml
View file

@ -1,34 +0,0 @@
pragma Singleton
import Quickshell
import QtQuick
import Quickshell.Io
Singleton {
id: root
property int activeWorkspace: 1
property var dispatch: m => {
sender.command = ["swaymsg", ...m];
sender.running = true;
}
Process {
id: sender
command: []
}
Process {
command: ["swaymsg", "-mtsubscribe", "[\"workspace\"]"]
running: true
stdout: SplitParser {
onRead: data => {
const parsed = JSON.parse(data);
if (parsed.change == "focus") {
root.activeWorkspace = parsed.current.num;
}
}
}
}
}

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

@ -1,7 +1,7 @@
import QtQuick import QtQuick
import Quickshell.Io import Quickshell.Io
import Quickshell.Hyprland import Quickshell.Hyprland
import "root:provider" import Quickshell.Sway
Item { Item {
id: root id: root
@ -14,7 +14,7 @@ Item {
console.log(`We are switching from workspace ${active} to ${w}`); console.log(`We are switching from workspace ${active} to ${w}`);
switch (root.name) { switch (root.name) {
case "sway": case "sway":
Sway.dispatch(["workspace", w]); Sway.dispatch(`workspace ${w}`);
break; break;
case "Hyprland": case "Hyprland":
Hyprland.dispatch(`workspace ${w}`); Hyprland.dispatch(`workspace ${w}`);
@ -34,7 +34,7 @@ Item {
root.name = data.slice(20); root.name = data.slice(20);
switch (root.name) { switch (root.name) {
case "sway": case "sway":
root.active = Qt.binding(() => Sway.activeWorkspace ?? root.active); root.active = Qt.binding(() => Sway.focusedWorkspace?.num ?? root.active);
break; break;
case "Hyprland": case "Hyprland":
root.active = Qt.binding(() => Hyprland.focusedMonitor?.activeWorkspace?.id ?? root.active); root.active = Qt.binding(() => Hyprland.focusedMonitor?.activeWorkspace?.id ?? root.active);