From 54b0942de633a984a7a3b084c2ab637c96a0f668 Mon Sep 17 00:00:00 2001 From: willifan Date: Mon, 13 Jan 2025 12:03:27 +0100 Subject: [PATCH] make directories implicit --- default.nix | 8 +- eww/eww.yuck | 532 +++++++++--------- {images => eww/images}/Bob Ross.png | Bin {images => eww/images}/SamGuk-by_Sang_Min.png | Bin {images => eww/images}/USTime.png | Bin {images => eww/images}/battery.png | Bin {images => eww/images}/batteryLow.png | Bin {images => eww/images}/bluetooth.png | Bin {images => eww/images}/bluetoothOriginal.png | Bin {images => eww/images}/brightness.png | Bin {images => eww/images}/brightnessOriginal.png | Bin {images => eww/images}/charging.png | Bin {images => eww/images}/chargingOriginal.png | Bin {images => eww/images}/cpu.png | Bin {images => eww/images}/cpuOriginal.png | Bin {images => eww/images}/ethernet.png | Bin {images => eww/images}/ethernetOriginal.png | Bin {images => eww/images}/hibernate.png | Bin {images => eww/images}/lock.png | Bin {images => eww/images}/logout.png | Bin {images => eww/images}/power.png | Bin {images => eww/images}/powerOriginal.png | Bin {images => eww/images}/ram.png | Bin {images => eww/images}/ramOriginal.png | Bin {images => eww/images}/reboot.png | Bin {images => eww/images}/shutdown.png | Bin {images => eww/images}/suspend.png | Bin {images => eww/images}/test.png | Bin {images => eww/images}/volume.png | Bin {images => eww/images}/volumeMuted.png | Bin {images => eww/images}/volumeOriginal.png | Bin {images => eww/images}/wifiHigh.png | Bin {images => eww/images}/wifiLow.png | Bin {images => eww/images}/wifiMedium.png | Bin {images => eww/images}/wifiOriginal.png | Bin {images => eww/images}/wifiVeryLow.png | Bin {ewwScripts => eww/scripts}/bluetooth.sh | 0 {ewwScripts => eww/scripts}/brightness.sh | 0 {ewwScripts => eww/scripts}/client | Bin {ewwScripts => eww/scripts}/media.sh | 0 {ewwScripts => eww/scripts}/network.sh | 0 {ewwScripts => eww/scripts}/volume.sh | 0 eww/variables.yuck | 28 +- src/main.rs | 2 +- 44 files changed, 285 insertions(+), 285 deletions(-) rename {images => eww/images}/Bob Ross.png (100%) rename {images => eww/images}/SamGuk-by_Sang_Min.png (100%) rename {images => eww/images}/USTime.png (100%) rename {images => eww/images}/battery.png (100%) rename {images => eww/images}/batteryLow.png (100%) rename {images => eww/images}/bluetooth.png (100%) rename {images => eww/images}/bluetoothOriginal.png (100%) rename {images => eww/images}/brightness.png (100%) rename {images => eww/images}/brightnessOriginal.png (100%) rename {images => eww/images}/charging.png (100%) rename {images => eww/images}/chargingOriginal.png (100%) rename {images => eww/images}/cpu.png (100%) rename {images => eww/images}/cpuOriginal.png (100%) rename {images => eww/images}/ethernet.png (100%) rename {images => eww/images}/ethernetOriginal.png (100%) rename {images => eww/images}/hibernate.png (100%) rename {images => eww/images}/lock.png (100%) rename {images => eww/images}/logout.png (100%) rename {images => eww/images}/power.png (100%) rename {images => eww/images}/powerOriginal.png (100%) rename {images => eww/images}/ram.png (100%) rename {images => eww/images}/ramOriginal.png (100%) rename {images => eww/images}/reboot.png (100%) rename {images => eww/images}/shutdown.png (100%) rename {images => eww/images}/suspend.png (100%) rename {images => eww/images}/test.png (100%) rename {images => eww/images}/volume.png (100%) rename {images => eww/images}/volumeMuted.png (100%) rename {images => eww/images}/volumeOriginal.png (100%) rename {images => eww/images}/wifiHigh.png (100%) rename {images => eww/images}/wifiLow.png (100%) rename {images => eww/images}/wifiMedium.png (100%) rename {images => eww/images}/wifiOriginal.png (100%) rename {images => eww/images}/wifiVeryLow.png (100%) rename {ewwScripts => eww/scripts}/bluetooth.sh (100%) rename {ewwScripts => eww/scripts}/brightness.sh (100%) rename {ewwScripts => eww/scripts}/client (100%) rename {ewwScripts => eww/scripts}/media.sh (100%) rename {ewwScripts => eww/scripts}/network.sh (100%) rename {ewwScripts => eww/scripts}/volume.sh (100%) diff --git a/default.nix b/default.nix index 89ff011..53f4c4c 100644 --- a/default.nix +++ b/default.nix @@ -18,10 +18,10 @@ pkgs.rustPlatform.buildRustPackage { pkgs.libxkbcommon ]; - # installPhase = '' - # mkdir -p $out/bin - # cp clients $out/bin/clients - #''; + postInstall = '' + mkdir -p $out/bin + cp -r $src/eww $out/bin/eww + ''; meta = with pkgs.lib; { description = "utils for my desktop"; diff --git a/eww/eww.yuck b/eww/eww.yuck index ecaf453..50e242f 100644 --- a/eww/eww.yuck +++ b/eww/eww.yuck @@ -12,79 +12,79 @@ (defwidget normalWorkspaces [monitor] - (box - :space-evenly false - :spacing 3 - :valign "center" - :height 20 - (for workspace in workspaces - (workspace - :activeOn {workspace.normal.activeOn} - :occupied {workspace.normal.occupied} - :id {workspace.normal.id} - :cmd {workspace.normal.id} - :icon {workspace.normal.icon} - :monitor {monitor})))) + (box + :space-evenly false + :spacing 3 + :valign "center" + :height 20 + (for workspace in workspaces + (workspace + :activeOn {workspace.normal.activeOn} + :occupied {workspace.normal.occupied} + :id {workspace.normal.id} + :cmd {workspace.normal.id} + :icon {workspace.normal.icon} + :monitor {monitor})))) ;; right (defwidget cpu [] - (icon - :widgetclass "cpu" - :hover "${round(EWW_CPU.avg, 1)}%" - :percentage {round(EWW_CPU.avg, 1)} - :image "../images/cpu.png")) + (icon + :widgetclass "cpu" + :hover "${round(EWW_CPU.avg, 1)}%" + :percentage {round(EWW_CPU.avg, 1)} + :image "./images/cpu.png")) (defwidget ram [] - (icon - :widgetclass "ram" - :hover "${round(EWW_RAM.used_mem /(1024*1024*1024), 1)} GiB | ${round(EWW_RAM.used_mem_perc, 1)}%" - :percentage {round(EWW_RAM.used_mem_perc, 1)} - :image "../images/ram.png")) + (icon + :widgetclass "ram" + :hover "${round(EWW_RAM.used_mem /(1024*1024*1024), 1)} GiB | ${round(EWW_RAM.used_mem_perc, 1)}%" + :percentage {round(EWW_RAM.used_mem_perc, 1)} + :image "./images/ram.png")) (defwidget audio [] - (icon - :widgetclass {volume.muted == 1 ? "muted" : "volume"} - :hover "${volume.volume}%" - :percentage {volume.volume >= 0 && volume.volume <= 100 ? volume.volume : 0} - :image {volume.muted == 1 ? "../images/volumeMuted.png" : "../images/volume.png"})) + (icon + :widgetclass {volume.muted == 1 ? "muted" : "volume"} + :hover "${volume.volume}%" + :percentage {volume.volume >= 0 && volume.volume <= 100 ? volume.volume : 0} + :image {volume.muted == 1 ? "./images/volumeMuted.png" : "./images/volume.png"})) (defwidget brightness [] - (icon - :widgetclass "brightness" - :hover "${brightnessValue / 960}%" - :percentage {brightnessValue / 960} - :image "../images/brightness.png")) + (icon + :widgetclass "brightness" + :hover "${brightnessValue / 960}%" + :percentage {brightnessValue / 960} + :image "./images/brightness.png")) (defwidget network [] - (icon - :widgetclass "network" - :hover {network.name} - :percentage "100" - :image "../images/${network.image}.png")) + (icon + :widgetclass "network" + :hover {network.name} + :percentage "100" + :image "./images/${network.image}.png")) (defwidget bluetooth [] - (icon - :widgetclass "bluetooth" - :hover {bluetooth.name} - :percentage {bluetooth.battery} - :image "../images/bluetooth.png")) + (icon + :widgetclass "bluetooth" + :hover {bluetooth.name} + :percentage {bluetooth.battery} + :image "./images/bluetooth.png")) (defwidget battery [] - (icon - :widgetclass {EWW_BATTERY.BAT1.status == "Charging" ? "battery" : EWW_BATTERY.total_avg > 25 ? "battery" : "batteryLow"} - :hover "${round(EWW_BATTERY.total_avg, 1)}%" - :percentage {EWW_BATTERY.total_avg <= 90 ? round(EWW_BATTERY.total_avg, 1)/0.9 : 100} - :image {EWW_BATTERY.BAT1.status == "Charging" ? "../images/charging.png" : EWW_BATTERY.total_avg > 25 ? "../images/battery.png" : "../images/batteryLow.png"})) + (icon + :widgetclass {EWW_BATTERY.BAT1.status == "Charging" ? "battery" : EWW_BATTERY.total_avg > 25 ? "battery" : "batteryLow"} + :hover "${round(EWW_BATTERY.total_avg, 1)}%" + :percentage {EWW_BATTERY.total_avg <= 90 ? round(EWW_BATTERY.total_avg, 1)/0.9 : 100} + :image {EWW_BATTERY.BAT1.status == "Charging" ? "./images/charging.png" : EWW_BATTERY.total_avg > 25 ? "./images/battery.png" : "./images/batteryLow.png"})) (defwidget power [] - (icon - :widgetclass "power" - :hover "placeholder" - :percentage "0" - :image "../images/power.png")) + (icon + :widgetclass "power" + :hover "placeholder" + :percentage "0" + :image "./images/power.png")) @@ -92,243 +92,243 @@ ;; Widget blocks (defwidget media [] - (box - :class "smallBox" - :height 20 - :valign "center" - :spacing 1 - :space-evenly false - (space) - (label - :text "${media.title} - ${media.artist}" - :tooltip "${media.title} - ${media.artist} | ${media.album}" - :truncate true) - (space))) + (box + :class "smallBox" + :height 20 + :valign "center" + :spacing 1 + :space-evenly false + (space) + (label + :text "${media.title} - ${media.artist}" + :tooltip "${media.title} - ${media.artist} | ${media.album}" + :truncate true) + (space))) (defwidget processing [] - (eventbox - :onclick 'hyprctl dispatch exec "[float; pin; size 40% 40%; move 100%-41% 40] kitty bpytop -b proc"' - :class "smallBox" - :halign "end" - :valign "center" - :height 20 - (box - :space-evenly false - :halign "end" - :valign "center" - :height 20 - (smallSpacer) - (cpu) - (space) - (ram) - (smallSpacer)))) + (eventbox + :onclick 'hyprctl dispatch exec "[float; pin; size 40% 40%; move 100%-41% 40] kitty bpytop -b proc"' + :class "smallBox" + :halign "end" + :valign "center" + :height 20 + (box + :space-evenly false + :halign "end" + :valign "center" + :height 20 + (smallSpacer) + (cpu) + (space) + (ram) + (smallSpacer)))) (defwidget controlls [] - (eventbox - :onclick 'hyprctl dispatch exec "[float; pin; size 40% 40%; move 100%-41% 40] kitty pulsemixer"' - :class "smallBox" - :halign "end" - :valign "center" - :height 20 - (box - :space-evenly false - :halign "end" - :valign "center" - :height 20 - (smallSpacer) - (audio) - (space) - (brightness) - (smallSpacer)))) + (eventbox + :onclick 'hyprctl dispatch exec "[float; pin; size 40% 40%; move 100%-41% 40] kitty pulsemixer"' + :class "smallBox" + :halign "end" + :valign "center" + :height 20 + (box + :space-evenly false + :halign "end" + :valign "center" + :height 20 + (smallSpacer) + (audio) + (space) + (brightness) + (smallSpacer)))) (defwidget wireless [] - (eventbox - :onclick "`networkmanager_dmenu`" - :class "smallBox" - :halign "end" - :valign "center" - :height 20 - (box - :space-evenly false - :halign "end" - :valign "center" - :height 24 - (smallSpacer) - (network) - (space) - (bluetooth) - (smallSpacer)))) + (eventbox + :onclick "`networkmanager_dmenu`" + :class "smallBox" + :halign "end" + :valign "center" + :height 20 + (box + :space-evenly false + :halign "end" + :valign "center" + :height 24 + (smallSpacer) + (network) + (space) + (bluetooth) + (smallSpacer)))) (defwidget energy [] - (eventbox - :onclick `wlogout -r 25 -c 25 -m 300 &` - :class "smallBox" - :valign "center" - :height 20 - (box - :space-evenly false - :halign "end" - :valign "center" - :height 20 - (smallSpacer) - (battery) - (space) - (power) - (smallSpacer)))) + (eventbox + :onclick `wlogout -r 25 -c 25 -m 300 &` + :class "smallBox" + :valign "center" + :height 20 + (box + :space-evenly false + :halign "end" + :valign "center" + :height 20 + (smallSpacer) + (battery) + (space) + (power) + (smallSpacer)))) ;; Boxes (defwidget timeBox [] - (box - :class "barbox" - :spacing 3 - :space-evenly false - :halign "end" - :valign "center" - :height 30 - (space) - (testtime) - (space))) + (box + :class "barbox" + :spacing 3 + :space-evenly false + :halign "end" + :valign "center" + :height 30 + (space) + (testtime) + (space))) (defwidget mediaBox [] - (box - :class "barbox" - :visible {media.status == "Playing" ? true : false} - :spacing 3 - :space-evenly false - :halign "end" - :valign "center" - :height 30 - (space) - (media) - (space))) + (box + :class "barbox" + :visible {media.status == "Playing" ? true : false} + :spacing 3 + :space-evenly false + :halign "end" + :valign "center" + :height 30 + (space) + (media) + (space))) (defwidget start [] - (box - :orientation "h" - :space-evenly false - :height 30 - :halign "start" - :valign "center" - :spacing 3 - (timeBox) - (mediaBox) - (box))) + (box + :orientation "h" + :space-evenly false + :height 30 + :halign "start" + :valign "center" + :spacing 3 + (timeBox) + (mediaBox) + (box))) (defwidget center [monitor] - (box - :class "barbox" - :orientation "h" - :space-evenly false - :spacing 3 - :height 30 - :halign "center" - :valign "center" - (space) - (workspace - :activeOn {workspaces[0].special.activeOn} - :occupied {workspaces[0].special.occupied} - :id {workspaces[0].special.id} - :icon {workspaces[0].special.icon} - :monitor {monitor}) - (workspace - :activeOn {workspaces[1].special.activeOn} - :occupied {workspaces[1].special.occupied} - :id {workspaces[1].special.id} - :icon {workspaces[1].special.icon} - :monitor {monitor}) - (seperator) - (normalWorkspaces - :monitor {monitor}) - (seperator) - (workspace - :activeOn {workspaces[2].special.activeOn} - :occupied {workspaces[2].special.occupied} - :id {workspaces[2].special.id} - :icon {workspaces[2].special.icon} - :monitor {monitor}) - (workspace - :activeOn {workspaces[3].special.activeOn} - :occupied {workspaces[3].special.occupied} - :id {workspaces[3].special.id} - :icon {workspaces[3].special.icon} - :monitor {monitor}) - (space))) + (box + :class "barbox" + :orientation "h" + :space-evenly false + :spacing 3 + :height 30 + :halign "center" + :valign "center" + (space) + (workspace + :activeOn {workspaces[0].special.activeOn} + :occupied {workspaces[0].special.occupied} + :id {workspaces[0].special.id} + :icon {workspaces[0].special.icon} + :monitor {monitor}) + (workspace + :activeOn {workspaces[1].special.activeOn} + :occupied {workspaces[1].special.occupied} + :id {workspaces[1].special.id} + :icon {workspaces[1].special.icon} + :monitor {monitor}) + (seperator) + (normalWorkspaces + :monitor {monitor}) + (seperator) + (workspace + :activeOn {workspaces[2].special.activeOn} + :occupied {workspaces[2].special.occupied} + :id {workspaces[2].special.id} + :icon {workspaces[2].special.icon} + :monitor {monitor}) + (workspace + :activeOn {workspaces[3].special.activeOn} + :occupied {workspaces[3].special.occupied} + :id {workspaces[3].special.id} + :icon {workspaces[3].special.icon} + :monitor {monitor}) + (space))) (defwidget end [] + (box + :orientation "h" + :space-evenly false + :spacing 3 + :height 30 + :valign "center" + :halign "end" (box - :orientation "h" - :space-evenly false - :spacing 3 - :height 30 - :valign "center" - :halign "end" - (box - :class "barbox" - :space-evenly false - :spacing 2 - (space) - (testtime - :timezone "US/Eastern" - :image "../images/USTime.png") - (seperator) - (testtime - :timezone "Asia/Seoul" - :image "../images/SamGuk-by_Sang_Min.png") - (space)) - (box - :class "barbox" - :spacing 2 - :orientation "h" - :space-evenly false - :height 30 - :valign "center" - :halign "end" - - (space) -;; (systray -;; :spacing 2 -;; :orientation "h" -;; :space-evenly true -;; :icon-size 16) -;; -;; (seperator) - - (processing) - - (seperator) - - (controlls) - - (seperator) - - (wireless) - - (seperator) - - (energy) - - (space)))) + :class "barbox" + :space-evenly false + :spacing 2 + (space) + (testtime + :timezone "US/Eastern" + :image "./images/USTime.png") + (seperator) + (testtime + :timezone "Asia/Seoul" + :image "./images/SamGuk-by_Sang_Min.png") + (space)) + (box + :class "barbox" + :spacing 2 + :orientation "h" + :space-evenly false + :height 30 + :valign "center" + :halign "end" + + (space) + ;; (systray + ;; :spacing 2 + ;; :orientation "h" + ;; :space-evenly true + ;; :icon-size 16) + ;; + ;; (seperator) + + (processing) + + (seperator) + + (controlls) + + (seperator) + + (wireless) + + (seperator) + + (energy) + + (space)))) (defwidget bar [monitor] - (centerbox - :orientation "h" - (start) - (center - :monitor {monitor}) - (end))) + (centerbox + :orientation "h" + (start) + (center + :monitor {monitor}) + (end))) (defwindow bar [monitor width height] - :monitor {monitor} - :geometry (geometry - :x "0%" - :y "5px" - :width "${width}px" - :height "${height}px" - :anchor "top center") - :stacking "fg" - :exclusive true - (bar - :monitor {monitor})) + :monitor {monitor} + :geometry (geometry + :x "0%" + :y "5px" + :width "${width}px" + :height "${height}px" + :anchor "top center") + :stacking "fg" + :exclusive true + (bar + :monitor {monitor})) diff --git a/images/Bob Ross.png b/eww/images/Bob Ross.png similarity index 100% rename from images/Bob Ross.png rename to eww/images/Bob Ross.png diff --git a/images/SamGuk-by_Sang_Min.png b/eww/images/SamGuk-by_Sang_Min.png similarity index 100% rename from images/SamGuk-by_Sang_Min.png rename to eww/images/SamGuk-by_Sang_Min.png diff --git a/images/USTime.png b/eww/images/USTime.png similarity index 100% rename from images/USTime.png rename to eww/images/USTime.png diff --git a/images/battery.png b/eww/images/battery.png similarity index 100% rename from images/battery.png rename to eww/images/battery.png diff --git a/images/batteryLow.png b/eww/images/batteryLow.png similarity index 100% rename from images/batteryLow.png rename to eww/images/batteryLow.png diff --git a/images/bluetooth.png b/eww/images/bluetooth.png similarity index 100% rename from images/bluetooth.png rename to eww/images/bluetooth.png diff --git a/images/bluetoothOriginal.png b/eww/images/bluetoothOriginal.png similarity index 100% rename from images/bluetoothOriginal.png rename to eww/images/bluetoothOriginal.png diff --git a/images/brightness.png b/eww/images/brightness.png similarity index 100% rename from images/brightness.png rename to eww/images/brightness.png diff --git a/images/brightnessOriginal.png b/eww/images/brightnessOriginal.png similarity index 100% rename from images/brightnessOriginal.png rename to eww/images/brightnessOriginal.png diff --git a/images/charging.png b/eww/images/charging.png similarity index 100% rename from images/charging.png rename to eww/images/charging.png diff --git a/images/chargingOriginal.png b/eww/images/chargingOriginal.png similarity index 100% rename from images/chargingOriginal.png rename to eww/images/chargingOriginal.png diff --git a/images/cpu.png b/eww/images/cpu.png similarity index 100% rename from images/cpu.png rename to eww/images/cpu.png diff --git a/images/cpuOriginal.png b/eww/images/cpuOriginal.png similarity index 100% rename from images/cpuOriginal.png rename to eww/images/cpuOriginal.png diff --git a/images/ethernet.png b/eww/images/ethernet.png similarity index 100% rename from images/ethernet.png rename to eww/images/ethernet.png diff --git a/images/ethernetOriginal.png b/eww/images/ethernetOriginal.png similarity index 100% rename from images/ethernetOriginal.png rename to eww/images/ethernetOriginal.png diff --git a/images/hibernate.png b/eww/images/hibernate.png similarity index 100% rename from images/hibernate.png rename to eww/images/hibernate.png diff --git a/images/lock.png b/eww/images/lock.png similarity index 100% rename from images/lock.png rename to eww/images/lock.png diff --git a/images/logout.png b/eww/images/logout.png similarity index 100% rename from images/logout.png rename to eww/images/logout.png diff --git a/images/power.png b/eww/images/power.png similarity index 100% rename from images/power.png rename to eww/images/power.png diff --git a/images/powerOriginal.png b/eww/images/powerOriginal.png similarity index 100% rename from images/powerOriginal.png rename to eww/images/powerOriginal.png diff --git a/images/ram.png b/eww/images/ram.png similarity index 100% rename from images/ram.png rename to eww/images/ram.png diff --git a/images/ramOriginal.png b/eww/images/ramOriginal.png similarity index 100% rename from images/ramOriginal.png rename to eww/images/ramOriginal.png diff --git a/images/reboot.png b/eww/images/reboot.png similarity index 100% rename from images/reboot.png rename to eww/images/reboot.png diff --git a/images/shutdown.png b/eww/images/shutdown.png similarity index 100% rename from images/shutdown.png rename to eww/images/shutdown.png diff --git a/images/suspend.png b/eww/images/suspend.png similarity index 100% rename from images/suspend.png rename to eww/images/suspend.png diff --git a/images/test.png b/eww/images/test.png similarity index 100% rename from images/test.png rename to eww/images/test.png diff --git a/images/volume.png b/eww/images/volume.png similarity index 100% rename from images/volume.png rename to eww/images/volume.png diff --git a/images/volumeMuted.png b/eww/images/volumeMuted.png similarity index 100% rename from images/volumeMuted.png rename to eww/images/volumeMuted.png diff --git a/images/volumeOriginal.png b/eww/images/volumeOriginal.png similarity index 100% rename from images/volumeOriginal.png rename to eww/images/volumeOriginal.png diff --git a/images/wifiHigh.png b/eww/images/wifiHigh.png similarity index 100% rename from images/wifiHigh.png rename to eww/images/wifiHigh.png diff --git a/images/wifiLow.png b/eww/images/wifiLow.png similarity index 100% rename from images/wifiLow.png rename to eww/images/wifiLow.png diff --git a/images/wifiMedium.png b/eww/images/wifiMedium.png similarity index 100% rename from images/wifiMedium.png rename to eww/images/wifiMedium.png diff --git a/images/wifiOriginal.png b/eww/images/wifiOriginal.png similarity index 100% rename from images/wifiOriginal.png rename to eww/images/wifiOriginal.png diff --git a/images/wifiVeryLow.png b/eww/images/wifiVeryLow.png similarity index 100% rename from images/wifiVeryLow.png rename to eww/images/wifiVeryLow.png diff --git a/ewwScripts/bluetooth.sh b/eww/scripts/bluetooth.sh similarity index 100% rename from ewwScripts/bluetooth.sh rename to eww/scripts/bluetooth.sh diff --git a/ewwScripts/brightness.sh b/eww/scripts/brightness.sh similarity index 100% rename from ewwScripts/brightness.sh rename to eww/scripts/brightness.sh diff --git a/ewwScripts/client b/eww/scripts/client similarity index 100% rename from ewwScripts/client rename to eww/scripts/client diff --git a/ewwScripts/media.sh b/eww/scripts/media.sh similarity index 100% rename from ewwScripts/media.sh rename to eww/scripts/media.sh diff --git a/ewwScripts/network.sh b/eww/scripts/network.sh similarity index 100% rename from ewwScripts/network.sh rename to eww/scripts/network.sh diff --git a/ewwScripts/volume.sh b/eww/scripts/volume.sh similarity index 100% rename from ewwScripts/volume.sh rename to eww/scripts/volume.sh diff --git a/eww/variables.yuck b/eww/variables.yuck index 35fef92..93fd5cf 100644 --- a/eww/variables.yuck +++ b/eww/variables.yuck @@ -1,25 +1,25 @@ (deflisten brightnessValue - :initial "0" - `../ewwScripts/brightness.sh`) + :initial "0" +`./scripts/brightness.sh`) (deflisten network - :initial '{"name":"No Connection","image":"n.A."}' - `../ewwScripts/network.sh`) + :initial '{"name":"No Connection","image":"n.A."}' +`./scripts/network.sh`) (deflisten workspaces - :initial '' - `../ewwScripts/client`) + :initial '' +`./scripts/client`) (defpoll bluetooth - :initial '{"name":"","battery":"0"}' - :interval "2s" - `../ewwScripts/bluetooth.sh`) + :initial '{"name":"","battery":"0"}' + :interval "2s" +`./scripts/bluetooth.sh`) (deflisten volume - :initial '{"volume":"0","muted":"0"}' - `../ewwScripts/volume.sh`) + :initial '{"volume":"0","muted":"0"}' +`./scripts/volume.sh`) (defpoll media - :initial '{"status":"","name":""}' - :interval "2s" - `../ewwScripts/media.sh`) + :initial '{"status":"","name":""}' + :interval "2s" +`./scripts/media.sh`) diff --git a/src/main.rs b/src/main.rs index 6ab3f22..4140e2c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,7 +12,7 @@ use smithay_client_toolkit::{ use wayland_client::{globals::registry_queue_init, protocol::wl_output, Connection, QueueHandle}; -const CONFIG_DIR: &str = "/home/willifan/.config/desktop-utils/eww"; +const CONFIG_DIR: &str = "./eww"; fn main() -> Result<(), Box> { // We initialize the logger for the purpose of debugging.