diff --git a/.gitignore b/.gitignore index 3b1e728..22301f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -scripts/clients/build/ +ewwScripts/clients/build/ .vscode/ # Added by cargo diff --git a/Cargo.toml b/Cargo.toml index f216aa8..183de9e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,3 +6,4 @@ edition = "2021" [dependencies] serde = "1.0.199" serde_json = "1.0.116" +hyprland = "0.3.13" \ No newline at end of file diff --git a/eww/variables.yuck b/eww/variables.yuck index d45c57b..35fef92 100644 --- a/eww/variables.yuck +++ b/eww/variables.yuck @@ -1,25 +1,25 @@ (deflisten brightnessValue :initial "0" - `../scripts/brightness.sh`) + `../ewwScripts/brightness.sh`) (deflisten network :initial '{"name":"No Connection","image":"n.A."}' - `../scripts/network.sh`) + `../ewwScripts/network.sh`) (deflisten workspaces :initial '' - `../scripts/client`) + `../ewwScripts/client`) (defpoll bluetooth :initial '{"name":"","battery":"0"}' :interval "2s" - `../scripts/bluetooth.sh`) + `../ewwScripts/bluetooth.sh`) (deflisten volume :initial '{"volume":"0","muted":"0"}' - `../scripts/volume.sh`) + `../ewwScripts/volume.sh`) (defpoll media :initial '{"status":"","name":""}' :interval "2s" - `../scripts/media.sh`) + `../ewwScripts/media.sh`) diff --git a/ewwScripts/client b/ewwScripts/client new file mode 100755 index 0000000..6d7ead6 Binary files /dev/null and b/ewwScripts/client differ diff --git a/ewwScripts/clients/src/main.cpp b/ewwScripts/clients/src/main.cpp index 9d9e585..99c85e9 100644 --- a/ewwScripts/clients/src/main.cpp +++ b/ewwScripts/clients/src/main.cpp @@ -99,7 +99,8 @@ void generateIconMap() //TODO unjank std::string cmd ="cd /home/willifan/.config/eww/scripts/ && ./test.sh "; - std::string test = std::string("cd /home/willifan/.config/eww/scripts/ && ./test.sh ") + initClass + " " + pid; + std::string test = std::string("cd /home/willifan/.config/desktop-utils/ewwScripts && ./test.sh ") + initClass + " " + pid; + std::cout << test << std::endl; iconMap[client["address"]] = command(test); diff --git a/ewwScripts/monitors.sh b/ewwScripts/monitors.sh index 12aaa90..6696090 100755 --- a/ewwScripts/monitors.sh +++ b/ewwScripts/monitors.sh @@ -20,9 +20,7 @@ while read -r k n h v s t; do ((i=i+1)) done < <(hyprctl monitors -j | jq -r '.[]|"\(.id) \(.name) \(.width) \(.height) \(.scale) \(.transform)"') -echo -n "" > "$XDG_CONFIG_HOME"/eww/bar.yuck - -eww close-all +eww close-all --config ../eww sleep 2 diff --git a/scripts/client b/scripts/client deleted file mode 100755 index 7b88579..0000000 Binary files a/scripts/client and /dev/null differ