From d2195ba06f22e8930cf176842ed18b15a97b22ff Mon Sep 17 00:00:00 2001 From: willifan Date: Mon, 13 Jan 2025 01:18:24 +0100 Subject: [PATCH 1/8] removed unnecessary files --- ewwScripts/monitors.sh | 38 -------------------------------------- ewwScripts/test.sh | 33 --------------------------------- scripts/idle.sh | 7 ------- scripts/lock.sh | 7 ------- scripts/scale.sh | 10 ---------- scripts/startup.sh | 0 6 files changed, 95 deletions(-) delete mode 100755 ewwScripts/monitors.sh delete mode 100755 ewwScripts/test.sh delete mode 100755 scripts/idle.sh delete mode 100755 scripts/lock.sh delete mode 100755 scripts/scale.sh delete mode 100644 scripts/startup.sh diff --git a/ewwScripts/monitors.sh b/ewwScripts/monitors.sh deleted file mode 100755 index 6696090..0000000 --- a/ewwScripts/monitors.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - - - -unset id name horizontal vertical scale activeWorkspace - -i=0 - -while read -r k n h v s t; do - id[i]="$k" - name[i]="$n" - horizontal[i]="$h" - vertical[i]="$v" - scale[i]="$s" - if [[ $((t%2)) == 1 ]]; then - temp=${vertical[$i]} - vertical[i]=${horizontal[$i]} - horizontal[i]=$temp - fi - ((i=i+1)) -done < <(hyprctl monitors -j | jq -r '.[]|"\(.id) \(.name) \(.width) \(.height) \(.scale) \(.transform)"') - -eww close-all --config ../eww - -sleep 2 - -for ((i = 0; i < ${#id[@]}; i++)); do - scale_value=$(echo "${scale[$i]}" | bc -l) - - new_width_float=$(echo "(${horizontal[$i]} / ${scale_value}) -10" | bc) - - new_width=$(echo "$new_width_float / 1" | bc) - - monitorID=$(xrandr --listactivemonitors | grep +"${name[$i]}" | awk '{sub(/.$/,"",$1); print $1}') - - eww open bar --id bar"${monitorID}" --arg monitor="${monitorID}" --arg width="${new_width}" --arg height=30 --config ../eww - sleep 2 -done diff --git a/ewwScripts/test.sh b/ewwScripts/test.sh deleted file mode 100755 index f40915a..0000000 --- a/ewwScripts/test.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -getIcon() { - local desktop="" - - # Search for desktop files by WM class - if [ -n "$1" ]; then - desktop=$(grep -l "StartupWMClass.*$1$" /run/current-system/sw/share/applications/*.desktop) - [ -z "$desktop" ] && desktop=$(grep -Pl "Name\s*=\s*$1$" /run/current-system/sw/share/applications/*.desktop) - [ -z "$desktop" ] && desktop=$(ls /run/current-system/sw/share/applications/"${1}".desktop 2>/dev/null) - fi - - # If not found by WM class, search by process name - if [ -z "$desktop" ] && [ -n "$2" ]; then - process=$(ps -p "${2}" -o comm=) - desktop=$(grep -Pl "$process" /run/current-system/sw/share/applications/*.desktop) - [ -n "$desktop" ] - fi - - # If not found by WM class or process name, search by name or description - if [ -z "$desktop" ] && [ -n "$1" ]; then - desktop=$(grep -Pl "$1" /run/current-system/sw/share/applications/*.desktop) - fi - - echo "$desktop" -} - -desktop=$(getIcon "$1" "$2") -if [ -n "$desktop" ]; then - desktop=$(echo "$desktop" | awk 'NR==1') - icon=$(awk -F'[[:space:]]*=[[:space:]]*' '/Icon[[:space:]]*=/ && !seen[$2]++ {print $2; exit}' "$desktop") - echo -n "${icon}.svg" -fi diff --git a/scripts/idle.sh b/scripts/idle.sh deleted file mode 100755 index 36435af..0000000 --- a/scripts/idle.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -if [[ $(acpi -a | awk '{print $3}') == "on-line" ]]; then - swaylock -else - systemctl suspend-then-hibernate -fi \ No newline at end of file diff --git a/scripts/lock.sh b/scripts/lock.sh deleted file mode 100755 index d936785..0000000 --- a/scripts/lock.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -swaylock & - -sleep 0.1 - -hyprctl dispatch dpms off \ No newline at end of file diff --git a/scripts/scale.sh b/scripts/scale.sh deleted file mode 100755 index fba2355..0000000 --- a/scripts/scale.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -while read -r f s; do - if [[ $f == true && $(awk -v s="$s" 'BEGIN{ if (s > 1.5) print 1; else print 0; }') == 1 ]]; then - export GDK_SCALE=2 - export QT_SCALE_FACTOR=2 - fi -done < <(hyprctl monitors -j | jq -r '.[]|"\(.focused) \(.scale)"') - -wofi --show drun \ No newline at end of file diff --git a/scripts/startup.sh b/scripts/startup.sh deleted file mode 100644 index e69de29..0000000 From 7b8e7c3b272ba7bd63aa489309f27de1eb3441ec Mon Sep 17 00:00:00 2001 From: willifan Date: Mon, 13 Jan 2025 12:02:41 +0100 Subject: [PATCH 2/8] remove result directory --- .gitignore | 2 +- result | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 120000 result diff --git a/.gitignore b/.gitignore index b998062..550c01b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -result +/result .vscode/ # Added by cargo diff --git a/result b/result deleted file mode 120000 index c1fabef..0000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/mp0zkc5iaf73f3yiq606qvfpqvs48q5i-desktop-utils-1.0.0 \ No newline at end of file From 54b0942de633a984a7a3b084c2ab637c96a0f668 Mon Sep 17 00:00:00 2001 From: willifan Date: Mon, 13 Jan 2025 12:03:27 +0100 Subject: [PATCH 3/8] 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. From aae66c3b70d103e9fc77323245c575eba3e60ee2 Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 14 Jan 2025 17:20:55 +0100 Subject: [PATCH 4/8] added necessary buildInputs --- default.nix | 8 +++++--- shell.nix | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 53f4c4c..d01b345 100644 --- a/default.nix +++ b/default.nix @@ -1,10 +1,10 @@ { pkgs ? import { } }: pkgs.rustPlatform.buildRustPackage { - pname = "desktop-utils"; + pname = "ewwbar"; version = "1.0.0"; - src = builtins.path { path = ./.; name = "desktop-utils"; }; + src = builtins.path { path = ./.; name = "ewwbar"; }; cargoLock = { lockFile = ./Cargo.lock; @@ -16,6 +16,7 @@ pkgs.rustPlatform.buildRustPackage { buildInputs = [ pkgs.libxkbcommon + pkgs.eww ]; postInstall = '' @@ -24,10 +25,11 @@ pkgs.rustPlatform.buildRustPackage { ''; meta = with pkgs.lib; { - description = "utils for my desktop"; + description = "Top bar using ElKowars Wacky Widgets"; homepage = " git.huwe.mooo.com/willifan/desktop-utils"; license = licenses.gpl3; platforms = platforms.unix; + mainProgram = "ewwbar"; }; } diff --git a/shell.nix b/shell.nix index 524c7da..8b1c54e 100644 --- a/shell.nix +++ b/shell.nix @@ -7,6 +7,7 @@ pkgs.mkShell { pkgs.cargo pkgs.pkg-config pkgs.libxkbcommon + pkgs.eww pkgs.rust-analyzer pkgs.clippy From 3017d91b974cea6cfc974eb4d8491d6b70eb618a Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 14 Jan 2025 17:22:06 +0100 Subject: [PATCH 5/8] gitignore .direnv --- .direnv/bin/nix-direnv-reload | 19 - .direnv/nix-profile-25.05-v0g0bxsd5gw6k0jz | 1 - .direnv/nix-profile-25.05-v0g0bxsd5gw6k0jz.rc | 2020 ----------------- .gitignore | 3 +- src/main.rs | 2 +- 5 files changed, 3 insertions(+), 2042 deletions(-) delete mode 100755 .direnv/bin/nix-direnv-reload delete mode 120000 .direnv/nix-profile-25.05-v0g0bxsd5gw6k0jz delete mode 100644 .direnv/nix-profile-25.05-v0g0bxsd5gw6k0jz.rc diff --git a/.direnv/bin/nix-direnv-reload b/.direnv/bin/nix-direnv-reload deleted file mode 100755 index a6d5d1e..0000000 --- a/.direnv/bin/nix-direnv-reload +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -set -e -if [[ ! -d "/home/willifan/Desktop/desktop-utils" ]]; then - echo "Cannot find source directory; Did you move it?" - echo "(Looking for "/home/willifan/Desktop/desktop-utils")" - echo 'Cannot force reload with this script - use "direnv reload" manually and then try again' - exit 1 -fi - -# rebuild the cache forcefully -_nix_direnv_force_reload=1 direnv exec "/home/willifan/Desktop/desktop-utils" true - -# Update the mtime for .envrc. -# This will cause direnv to reload again - but without re-building. -touch "/home/willifan/Desktop/desktop-utils/.envrc" - -# Also update the timestamp of whatever profile_rc we have. -# This makes sure that we know we are up to date. -touch -r "/home/willifan/Desktop/desktop-utils/.envrc" "/home/willifan/Desktop/desktop-utils/.direnv"/*.rc diff --git a/.direnv/nix-profile-25.05-v0g0bxsd5gw6k0jz b/.direnv/nix-profile-25.05-v0g0bxsd5gw6k0jz deleted file mode 120000 index ca732f7..0000000 --- a/.direnv/nix-profile-25.05-v0g0bxsd5gw6k0jz +++ /dev/null @@ -1 +0,0 @@ -/nix/store/pqsj954jryyfldxmv0fgag0ahmyrklbq-nix-shell-env \ No newline at end of file diff --git a/.direnv/nix-profile-25.05-v0g0bxsd5gw6k0jz.rc b/.direnv/nix-profile-25.05-v0g0bxsd5gw6k0jz.rc deleted file mode 100644 index b772cd5..0000000 --- a/.direnv/nix-profile-25.05-v0g0bxsd5gw6k0jz.rc +++ /dev/null @@ -1,2020 +0,0 @@ -unset shellHook -PATH=${PATH:-} -nix_saved_PATH="$PATH" -XDG_DATA_DIRS=${XDG_DATA_DIRS:-} -nix_saved_XDG_DATA_DIRS="$XDG_DATA_DIRS" -AR='ar' -export AR -AS='as' -export AS -BASH='/nix/store/5mh7kaj2fyv8mk4sfq1brwxgc02884wi-bash-5.2p37/bin/bash' -CC='gcc' -export CC -CONFIG_SHELL='/nix/store/5mh7kaj2fyv8mk4sfq1brwxgc02884wi-bash-5.2p37/bin/bash' -export CONFIG_SHELL -CXX='g++' -export CXX -HOSTTYPE='x86_64' -HOST_PATH='/nix/store/ss0yarz4m14gcskw73makm0glkm5aj9a-rustc-wrapper-1.83.0/bin:/nix/store/q2p507l5rmfw7c4n5pr6gcd5p2gyws2c-cargo-1.83.0/bin:/nix/store/0d4m43yp69lrm8imxbqgl9zxjwwz52jw-pkg-config-wrapper-0.29.2/bin:/nix/store/4fgxx1rc4x9vzzylyd192nkzb2ahva1p-libxkbcommon-1.7.0/bin:/nix/store/randaiycf8zv3pgh9l6f52f3grqigwi0-rust-analyzer-2024-12-23/bin:/nix/store/z7z8chcf39irpraswq4pkwg0d4jyyslf-clippy-1.83.0/bin:/nix/store/xpfccfj01hlnc347l3m6cljmhq4m9j0f-rustfmt-1.83.0/bin:/nix/store/kmsfl92rd4w4zdkzz1rfsi67y3y59nz3-nixd-2.5.1/bin:/nix/store/1szlkd8bvix08ipdh2ybviarls0ij6b8-nil-2024-08-06/bin:/nix/store/4s9rah4cwaxflicsk5cndnknqlk9n4p3-coreutils-9.5/bin:/nix/store/jqrz1vq5nz4lnv9pqzydj0ir58wbjfy1-findutils-4.10.0/bin:/nix/store/00g69vw7c9lycy63h45ximy0wmzqx5y6-diffutils-3.10/bin:/nix/store/abm77lnrkrkb58z6xp1qwjcr1xgkcfwm-gnused-4.9/bin:/nix/store/aap6cq56amx4mzbyxp2wpgsf1kqjcr1f-gnugrep-3.11/bin:/nix/store/a3c47r5z1q2c4rz0kvq8hlilkhx2s718-gawk-5.3.1/bin:/nix/store/9cwwj1c9csmc85l2cqzs3h9hbf1vwl6c-gnutar-1.35/bin:/nix/store/nvvj6sk0k6px48436drlblf4gafgbvzr-gzip-1.13/bin:/nix/store/mglixp03lsp0w986svwdvm7vcy17rdax-bzip2-1.0.8-bin/bin:/nix/store/fp6cjl1zcmm6mawsnrb5yak1wkz2ma8l-gnumake-4.4.1/bin:/nix/store/5mh7kaj2fyv8mk4sfq1brwxgc02884wi-bash-5.2p37/bin:/nix/store/5yja5dpk2qw1v5mbfbl2d7klcdfrh90w-patch-2.7.6/bin:/nix/store/h18s640fnhhj2qdh5vivcfbxvz377srg-xz-5.6.3-bin/bin:/nix/store/c4rj90r2m89rxs64hmm857mipwjhig5d-file-5.46/bin' -export HOST_PATH -IFS=' -' -IN_NIX_SHELL='impure' -export IN_NIX_SHELL -LD='ld' -export LD -LINENO='76' -MACHTYPE='x86_64-pc-linux-gnu' -NIX_BINTOOLS='/nix/store/srcmmqi8kxjfygd0hyy42c8hv6cws83b-binutils-wrapper-2.43.1' -export NIX_BINTOOLS -NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu='1' -export NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu -NIX_BUILD_CORES='16' -export NIX_BUILD_CORES -NIX_CC='/nix/store/xcn9p4xxfbvlkpah7pwchpav4ab9d135-gcc-wrapper-14-20241116' -export NIX_CC -NIX_CC_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu='1' -export NIX_CC_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu -NIX_CFLAGS_COMPILE=' -frandom-seed=pqsj954jry -isystem /nix/store/6dir2ya69y1lr1shf95wh8gr0d1svd90-libxkbcommon-1.7.0-dev/include -isystem /nix/store/6dir2ya69y1lr1shf95wh8gr0d1svd90-libxkbcommon-1.7.0-dev/include' -export NIX_CFLAGS_COMPILE -NIX_ENFORCE_NO_NATIVE='1' -export NIX_ENFORCE_NO_NATIVE -NIX_HARDENING_ENABLE='bindnow format fortify fortify3 pic relro stackprotector strictoverflow zerocallusedregs' -export NIX_HARDENING_ENABLE -NIX_LDFLAGS='-rpath /home/willifan/Desktop/desktop-utils/outputs/out/lib -L/nix/store/4fgxx1rc4x9vzzylyd192nkzb2ahva1p-libxkbcommon-1.7.0/lib -L/nix/store/kmsfl92rd4w4zdkzz1rfsi67y3y59nz3-nixd-2.5.1/lib -L/nix/store/4fgxx1rc4x9vzzylyd192nkzb2ahva1p-libxkbcommon-1.7.0/lib -L/nix/store/kmsfl92rd4w4zdkzz1rfsi67y3y59nz3-nixd-2.5.1/lib' -export NIX_LDFLAGS -NIX_NO_SELF_RPATH='1' -NIX_PKG_CONFIG_WRAPPER_TARGET_TARGET_x86_64_unknown_linux_gnu='1' -export NIX_PKG_CONFIG_WRAPPER_TARGET_TARGET_x86_64_unknown_linux_gnu -NIX_STORE='/nix/store' -export NIX_STORE -NM='nm' -export NM -OBJCOPY='objcopy' -export OBJCOPY -OBJDUMP='objdump' -export OBJDUMP -OLDPWD='' -export OLDPWD -OPTERR='1' -OSTYPE='linux-gnu' -PATH='/nix/store/srfxqk119fijwnprgsqvn68ys9kiw0bn-patchelf-0.15.0/bin:/nix/store/xcn9p4xxfbvlkpah7pwchpav4ab9d135-gcc-wrapper-14-20241116/bin:/nix/store/l89iqc7am6i60y8vk507zwrzxf0wcd3v-gcc-14-20241116/bin:/nix/store/1c6bmxrrhm8bd26ai2rjqld2yyjrxhds-glibc-2.40-36-bin/bin:/nix/store/4s9rah4cwaxflicsk5cndnknqlk9n4p3-coreutils-9.5/bin:/nix/store/srcmmqi8kxjfygd0hyy42c8hv6cws83b-binutils-wrapper-2.43.1/bin:/nix/store/j7p46r8v9gcpbxx89pbqlh61zhd33gzv-binutils-2.43.1/bin:/nix/store/ss0yarz4m14gcskw73makm0glkm5aj9a-rustc-wrapper-1.83.0/bin:/nix/store/q2p507l5rmfw7c4n5pr6gcd5p2gyws2c-cargo-1.83.0/bin:/nix/store/0d4m43yp69lrm8imxbqgl9zxjwwz52jw-pkg-config-wrapper-0.29.2/bin:/nix/store/4fgxx1rc4x9vzzylyd192nkzb2ahva1p-libxkbcommon-1.7.0/bin:/nix/store/randaiycf8zv3pgh9l6f52f3grqigwi0-rust-analyzer-2024-12-23/bin:/nix/store/z7z8chcf39irpraswq4pkwg0d4jyyslf-clippy-1.83.0/bin:/nix/store/xpfccfj01hlnc347l3m6cljmhq4m9j0f-rustfmt-1.83.0/bin:/nix/store/kmsfl92rd4w4zdkzz1rfsi67y3y59nz3-nixd-2.5.1/bin:/nix/store/1szlkd8bvix08ipdh2ybviarls0ij6b8-nil-2024-08-06/bin:/nix/store/4s9rah4cwaxflicsk5cndnknqlk9n4p3-coreutils-9.5/bin:/nix/store/jqrz1vq5nz4lnv9pqzydj0ir58wbjfy1-findutils-4.10.0/bin:/nix/store/00g69vw7c9lycy63h45ximy0wmzqx5y6-diffutils-3.10/bin:/nix/store/abm77lnrkrkb58z6xp1qwjcr1xgkcfwm-gnused-4.9/bin:/nix/store/aap6cq56amx4mzbyxp2wpgsf1kqjcr1f-gnugrep-3.11/bin:/nix/store/a3c47r5z1q2c4rz0kvq8hlilkhx2s718-gawk-5.3.1/bin:/nix/store/9cwwj1c9csmc85l2cqzs3h9hbf1vwl6c-gnutar-1.35/bin:/nix/store/nvvj6sk0k6px48436drlblf4gafgbvzr-gzip-1.13/bin:/nix/store/mglixp03lsp0w986svwdvm7vcy17rdax-bzip2-1.0.8-bin/bin:/nix/store/fp6cjl1zcmm6mawsnrb5yak1wkz2ma8l-gnumake-4.4.1/bin:/nix/store/5mh7kaj2fyv8mk4sfq1brwxgc02884wi-bash-5.2p37/bin:/nix/store/5yja5dpk2qw1v5mbfbl2d7klcdfrh90w-patch-2.7.6/bin:/nix/store/h18s640fnhhj2qdh5vivcfbxvz377srg-xz-5.6.3-bin/bin:/nix/store/c4rj90r2m89rxs64hmm857mipwjhig5d-file-5.46/bin' -export PATH -PKG_CONFIG_FOR_TARGET='pkg-config' -export PKG_CONFIG_FOR_TARGET -PKG_CONFIG_PATH_FOR_TARGET='/nix/store/6dir2ya69y1lr1shf95wh8gr0d1svd90-libxkbcommon-1.7.0-dev/lib/pkgconfig' -export PKG_CONFIG_PATH_FOR_TARGET -PS4='+ ' -RANLIB='ranlib' -export RANLIB -READELF='readelf' -export READELF -SHELL='/nix/store/5mh7kaj2fyv8mk4sfq1brwxgc02884wi-bash-5.2p37/bin/bash' -export SHELL -SIZE='size' -export SIZE -SOURCE_DATE_EPOCH='315532800' -export SOURCE_DATE_EPOCH -STRINGS='strings' -export STRINGS -STRIP='strip' -export STRIP -XDG_DATA_DIRS='/nix/store/srfxqk119fijwnprgsqvn68ys9kiw0bn-patchelf-0.15.0/share' -export XDG_DATA_DIRS -__structuredAttrs='' -export __structuredAttrs -_substituteStream_has_warned_replace_deprecation='false' -buildInputs='/nix/store/ss0yarz4m14gcskw73makm0glkm5aj9a-rustc-wrapper-1.83.0 /nix/store/q2p507l5rmfw7c4n5pr6gcd5p2gyws2c-cargo-1.83.0 /nix/store/0d4m43yp69lrm8imxbqgl9zxjwwz52jw-pkg-config-wrapper-0.29.2 /nix/store/6dir2ya69y1lr1shf95wh8gr0d1svd90-libxkbcommon-1.7.0-dev /nix/store/randaiycf8zv3pgh9l6f52f3grqigwi0-rust-analyzer-2024-12-23 /nix/store/z7z8chcf39irpraswq4pkwg0d4jyyslf-clippy-1.83.0 /nix/store/xpfccfj01hlnc347l3m6cljmhq4m9j0f-rustfmt-1.83.0 /nix/store/kmsfl92rd4w4zdkzz1rfsi67y3y59nz3-nixd-2.5.1 /nix/store/1szlkd8bvix08ipdh2ybviarls0ij6b8-nil-2024-08-06' -export buildInputs -buildPhase='{ echo "------------------------------------------------------------"; - echo " WARNING: the existence of this path is not guaranteed."; - echo " It is an internal implementation detail for pkgs.mkShell."; - echo "------------------------------------------------------------"; - echo; - # Record all build inputs as runtime dependencies - export; -} >> "$out" -' -export buildPhase -builder='/nix/store/5mh7kaj2fyv8mk4sfq1brwxgc02884wi-bash-5.2p37/bin/bash' -export builder -cmakeFlags='' -export cmakeFlags -configureFlags='' -export configureFlags -defaultBuildInputs='' -defaultNativeBuildInputs='/nix/store/srfxqk119fijwnprgsqvn68ys9kiw0bn-patchelf-0.15.0 /nix/store/d29r1bdmlvwmj52apgcdxfl1mm9c5782-update-autotools-gnu-config-scripts-hook /nix/store/h9lc1dpi14z7is86ffhl3ld569138595-audit-tmpdir.sh /nix/store/m54bmrhj6fqz8nds5zcj97w9s9bckc9v-compress-man-pages.sh /nix/store/wgrbkkaldkrlrni33ccvm3b6vbxzb656-make-symlinks-relative.sh /nix/store/5yzw0vhkyszf2d179m0qfkgxmp5wjjx4-move-docs.sh /nix/store/fyaryjvghbkpfnsyw97hb3lyb37s1pd6-move-lib64.sh /nix/store/kd4xwxjpjxi71jkm6ka0np72if9rm3y0-move-sbin.sh /nix/store/pag6l61paj1dc9sv15l7bm5c17xn5kyk-move-systemd-user-units.sh /nix/store/jivxp510zxakaaic7qkrb7v1dd2rdbw9-multiple-outputs.sh /nix/store/12lvf0c7xric9cny7slvf9cmhypl1p67-patch-shebangs.sh /nix/store/cickvswrvann041nqxb0rxilc46svw1n-prune-libtool-files.sh /nix/store/xyff06pkhki3qy1ls77w10s0v79c9il0-reproducible-builds.sh /nix/store/aazf105snicrlvyzzbdj85sx4179rpfp-set-source-date-epoch-to-latest.sh /nix/store/gps9qrh99j7g02840wv5x78ykmz30byp-strip.sh /nix/store/xcn9p4xxfbvlkpah7pwchpav4ab9d135-gcc-wrapper-14-20241116' -depsBuildBuild='' -export depsBuildBuild -depsBuildBuildPropagated='' -export depsBuildBuildPropagated -depsBuildTarget='' -export depsBuildTarget -depsBuildTargetPropagated='' -export depsBuildTargetPropagated -depsHostHost='' -export depsHostHost -depsHostHostPropagated='' -export depsHostHostPropagated -depsTargetTarget='' -export depsTargetTarget -depsTargetTargetPropagated='' -export depsTargetTargetPropagated -doCheck='' -export doCheck -doInstallCheck='' -export doInstallCheck -dontAddDisableDepTrack='1' -export dontAddDisableDepTrack -declare -a envBuildBuildHooks=() -declare -a envBuildHostHooks=() -declare -a envBuildTargetHooks=() -declare -a envHostHostHooks=('ccWrapper_addCVars' 'bintoolsWrapper_addLDVars' ) -declare -a envHostTargetHooks=('ccWrapper_addCVars' 'bintoolsWrapper_addLDVars' ) -declare -a envTargetTargetHooks=('pkgConfigWrapper_addPkgConfigPath' ) -declare -a fixupOutputHooks=('if [ -z "${dontPatchELF-}" ]; then patchELF "$prefix"; fi' 'if [[ -z "${noAuditTmpdir-}" && -e "$prefix" ]]; then auditTmpdir "$prefix"; fi' 'if [ -z "${dontGzipMan-}" ]; then compressManPages "$prefix"; fi' '_moveLib64' '_moveSbin' '_moveSystemdUserUnits' 'patchShebangsAuto' '_pruneLibtoolFiles' '_doStrip' ) -guess='16' -initialPath='/nix/store/4s9rah4cwaxflicsk5cndnknqlk9n4p3-coreutils-9.5 /nix/store/jqrz1vq5nz4lnv9pqzydj0ir58wbjfy1-findutils-4.10.0 /nix/store/00g69vw7c9lycy63h45ximy0wmzqx5y6-diffutils-3.10 /nix/store/abm77lnrkrkb58z6xp1qwjcr1xgkcfwm-gnused-4.9 /nix/store/aap6cq56amx4mzbyxp2wpgsf1kqjcr1f-gnugrep-3.11 /nix/store/a3c47r5z1q2c4rz0kvq8hlilkhx2s718-gawk-5.3.1 /nix/store/9cwwj1c9csmc85l2cqzs3h9hbf1vwl6c-gnutar-1.35 /nix/store/nvvj6sk0k6px48436drlblf4gafgbvzr-gzip-1.13 /nix/store/mglixp03lsp0w986svwdvm7vcy17rdax-bzip2-1.0.8-bin /nix/store/fp6cjl1zcmm6mawsnrb5yak1wkz2ma8l-gnumake-4.4.1 /nix/store/5mh7kaj2fyv8mk4sfq1brwxgc02884wi-bash-5.2p37 /nix/store/5yja5dpk2qw1v5mbfbl2d7klcdfrh90w-patch-2.7.6 /nix/store/h18s640fnhhj2qdh5vivcfbxvz377srg-xz-5.6.3-bin /nix/store/c4rj90r2m89rxs64hmm857mipwjhig5d-file-5.46' -mesonFlags='' -export mesonFlags -name='nix-shell-env' -export name -nativeBuildInputs='' -export nativeBuildInputs -out='/home/willifan/Desktop/desktop-utils/outputs/out' -export out -outputBin='out' -outputDev='out' -outputDevdoc='REMOVE' -outputDevman='out' -outputDoc='out' -outputInclude='out' -outputInfo='out' -outputLib='out' -outputMan='out' -outputs='out' -export outputs -patches='' -export patches -phases='buildPhase' -export phases -pkg='/nix/store/xcn9p4xxfbvlkpah7pwchpav4ab9d135-gcc-wrapper-14-20241116' -declare -a pkgsBuildBuild=() -declare -a pkgsBuildHost=('/nix/store/srfxqk119fijwnprgsqvn68ys9kiw0bn-patchelf-0.15.0' '/nix/store/d29r1bdmlvwmj52apgcdxfl1mm9c5782-update-autotools-gnu-config-scripts-hook' '/nix/store/h9lc1dpi14z7is86ffhl3ld569138595-audit-tmpdir.sh' '/nix/store/m54bmrhj6fqz8nds5zcj97w9s9bckc9v-compress-man-pages.sh' '/nix/store/wgrbkkaldkrlrni33ccvm3b6vbxzb656-make-symlinks-relative.sh' '/nix/store/5yzw0vhkyszf2d179m0qfkgxmp5wjjx4-move-docs.sh' '/nix/store/fyaryjvghbkpfnsyw97hb3lyb37s1pd6-move-lib64.sh' '/nix/store/kd4xwxjpjxi71jkm6ka0np72if9rm3y0-move-sbin.sh' '/nix/store/pag6l61paj1dc9sv15l7bm5c17xn5kyk-move-systemd-user-units.sh' '/nix/store/jivxp510zxakaaic7qkrb7v1dd2rdbw9-multiple-outputs.sh' '/nix/store/12lvf0c7xric9cny7slvf9cmhypl1p67-patch-shebangs.sh' '/nix/store/cickvswrvann041nqxb0rxilc46svw1n-prune-libtool-files.sh' '/nix/store/xyff06pkhki3qy1ls77w10s0v79c9il0-reproducible-builds.sh' '/nix/store/aazf105snicrlvyzzbdj85sx4179rpfp-set-source-date-epoch-to-latest.sh' '/nix/store/gps9qrh99j7g02840wv5x78ykmz30byp-strip.sh' '/nix/store/xcn9p4xxfbvlkpah7pwchpav4ab9d135-gcc-wrapper-14-20241116' '/nix/store/srcmmqi8kxjfygd0hyy42c8hv6cws83b-binutils-wrapper-2.43.1' ) -declare -a pkgsBuildTarget=() -declare -a pkgsHostHost=() -declare -a pkgsHostTarget=('/nix/store/ss0yarz4m14gcskw73makm0glkm5aj9a-rustc-wrapper-1.83.0' '/nix/store/q2p507l5rmfw7c4n5pr6gcd5p2gyws2c-cargo-1.83.0' '/nix/store/0d4m43yp69lrm8imxbqgl9zxjwwz52jw-pkg-config-wrapper-0.29.2' '/nix/store/6dir2ya69y1lr1shf95wh8gr0d1svd90-libxkbcommon-1.7.0-dev' '/nix/store/4fgxx1rc4x9vzzylyd192nkzb2ahva1p-libxkbcommon-1.7.0' '/nix/store/randaiycf8zv3pgh9l6f52f3grqigwi0-rust-analyzer-2024-12-23' '/nix/store/z7z8chcf39irpraswq4pkwg0d4jyyslf-clippy-1.83.0' '/nix/store/xpfccfj01hlnc347l3m6cljmhq4m9j0f-rustfmt-1.83.0' '/nix/store/kmsfl92rd4w4zdkzz1rfsi67y3y59nz3-nixd-2.5.1' '/nix/store/1szlkd8bvix08ipdh2ybviarls0ij6b8-nil-2024-08-06' ) -declare -a pkgsTargetTarget=() -declare -a postFixupHooks=('_makeSymlinksRelativeInAllOutputs' '_multioutPropagateDev' ) -declare -a postUnpackHooks=('_updateSourceDateEpochFromSourceRoot' ) -declare -a preConfigureHooks=('_multioutConfig' ) -preConfigurePhases=' updateAutotoolsGnuConfigScriptsPhase' -declare -a preFixupHooks=('_moveToShare' '_multioutDocs' '_multioutDevs' ) -preferLocalBuild='1' -export preferLocalBuild -prefix='/home/willifan/Desktop/desktop-utils/outputs/out' -declare -a propagatedBuildDepFiles=('propagated-build-build-deps' 'propagated-native-build-inputs' 'propagated-build-target-deps' ) -propagatedBuildInputs='' -export propagatedBuildInputs -declare -a propagatedHostDepFiles=('propagated-host-host-deps' 'propagated-build-inputs' ) -propagatedNativeBuildInputs='' -export propagatedNativeBuildInputs -declare -a propagatedTargetDepFiles=('propagated-target-target-deps' ) -shell='/nix/store/5mh7kaj2fyv8mk4sfq1brwxgc02884wi-bash-5.2p37/bin/bash' -export shell -shellHook='' -export shellHook -stdenv='/nix/store/d0gfdcag8bxzvg7ww4s7px4lf8sxisyx-stdenv-linux' -export stdenv -strictDeps='' -export strictDeps -system='x86_64-linux' -export system -declare -a unpackCmdHooks=('_defaultUnpack' ) -_activatePkgs () -{ - - local hostOffset targetOffset; - local pkg; - for hostOffset in "${allPlatOffsets[@]}"; - do - local pkgsVar="${pkgAccumVarVars[hostOffset + 1]}"; - for targetOffset in "${allPlatOffsets[@]}"; - do - (( hostOffset <= targetOffset )) || continue; - local pkgsRef="${pkgsVar}[$targetOffset - $hostOffset]"; - local pkgsSlice="${!pkgsRef}[@]"; - for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; - do - activatePackage "$pkg" "$hostOffset" "$targetOffset"; - done; - done; - done -} -_addRpathPrefix () -{ - - if [ "${NIX_NO_SELF_RPATH:-0}" != 1 ]; then - export NIX_LDFLAGS="-rpath $1/lib ${NIX_LDFLAGS-}"; - fi -} -_addToEnv () -{ - - local depHostOffset depTargetOffset; - local pkg; - for depHostOffset in "${allPlatOffsets[@]}"; - do - local hookVar="${pkgHookVarVars[depHostOffset + 1]}"; - local pkgsVar="${pkgAccumVarVars[depHostOffset + 1]}"; - for depTargetOffset in "${allPlatOffsets[@]}"; - do - (( depHostOffset <= depTargetOffset )) || continue; - local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]"; - if [[ -z "${strictDeps-}" ]]; then - local visitedPkgs=""; - for pkg in "${pkgsBuildBuild[@]}" "${pkgsBuildHost[@]}" "${pkgsBuildTarget[@]}" "${pkgsHostHost[@]}" "${pkgsHostTarget[@]}" "${pkgsTargetTarget[@]}"; - do - if [[ "$visitedPkgs" = *"$pkg"* ]]; then - continue; - fi; - runHook "${!hookRef}" "$pkg"; - visitedPkgs+=" $pkg"; - done; - else - local pkgsRef="${pkgsVar}[$depTargetOffset - $depHostOffset]"; - local pkgsSlice="${!pkgsRef}[@]"; - for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; - do - runHook "${!hookRef}" "$pkg"; - done; - fi; - done; - done -} -_allFlags () -{ - - export system pname name version; - while IFS='' read -r varName; do - nixTalkativeLog "@${varName}@ -> ${!varName}"; - args+=("--subst-var" "$varName"); - done < <(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }') -} -_assignFirst () -{ - - local varName="$1"; - local _var; - local REMOVE=REMOVE; - shift; - for _var in "$@"; - do - if [ -n "${!_var-}" ]; then - eval "${varName}"="${_var}"; - return; - fi; - done; - echo; - echo "error: _assignFirst: could not find a non-empty variable whose name to assign to ${varName}."; - echo " The following variables were all unset or empty:"; - echo " $*"; - if [ -z "${out:-}" ]; then - echo ' If you do not want an "out" output in your derivation, make sure to define'; - echo ' the other specific required outputs. This can be achieved by picking one'; - echo " of the above as an output."; - echo ' You do not have to remove "out" if you want to have a different default'; - echo ' output, because the first output is taken as a default.'; - echo; - fi; - return 1 -} -_callImplicitHook () -{ - - local def="$1"; - local hookName="$2"; - if declare -F "$hookName" > /dev/null; then - nixTalkativeLog "calling implicit '$hookName' function hook"; - "$hookName"; - else - if type -p "$hookName" > /dev/null; then - nixTalkativeLog "sourcing implicit '$hookName' script hook"; - source "$hookName"; - else - if [ -n "${!hookName:-}" ]; then - nixTalkativeLog "evaling implicit '$hookName' string hook"; - eval "${!hookName}"; - else - return "$def"; - fi; - fi; - fi -} -_defaultUnpack () -{ - - local fn="$1"; - local destination; - if [ -d "$fn" ]; then - destination="$(stripHash "$fn")"; - if [ -e "$destination" ]; then - echo "Cannot copy $fn to $destination: destination already exists!"; - echo "Did you specify two \"srcs\" with the same \"name\"?"; - return 1; - fi; - cp -r --preserve=mode,timestamps --reflink=auto -- "$fn" "$destination"; - else - case "$fn" in - *.tar.xz | *.tar.lzma | *.txz) - ( XZ_OPT="--threads=$NIX_BUILD_CORES" xz -d < "$fn"; - true ) | tar xf - --mode=+w --warning=no-timestamp - ;; - *.tar | *.tar.* | *.tgz | *.tbz2 | *.tbz) - tar xf "$fn" --mode=+w --warning=no-timestamp - ;; - *) - return 1 - ;; - esac; - fi -} -_doStrip () -{ - - local -ra flags=(dontStripHost dontStripTarget); - local -ra debugDirs=(stripDebugList stripDebugListTarget); - local -ra allDirs=(stripAllList stripAllListTarget); - local -ra stripCmds=(STRIP STRIP_FOR_TARGET); - local -ra ranlibCmds=(RANLIB RANLIB_FOR_TARGET); - stripDebugList=${stripDebugList[*]:-lib lib32 lib64 libexec bin sbin}; - stripDebugListTarget=${stripDebugListTarget[*]:-}; - stripAllList=${stripAllList[*]:-}; - stripAllListTarget=${stripAllListTarget[*]:-}; - local i; - for i in ${!stripCmds[@]}; - do - local -n flag="${flags[$i]}"; - local -n debugDirList="${debugDirs[$i]}"; - local -n allDirList="${allDirs[$i]}"; - local -n stripCmd="${stripCmds[$i]}"; - local -n ranlibCmd="${ranlibCmds[$i]}"; - if [[ -n "${dontStrip-}" || -n "${flag-}" ]] || ! type -f "${stripCmd-}" 2> /dev/null 1>&2; then - continue; - fi; - stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags[*]:--S -p}"; - stripDirs "$stripCmd" "$ranlibCmd" "$allDirList" "${stripAllFlags[*]:--s -p}"; - done -} -_eval () -{ - - if declare -F "$1" > /dev/null 2>&1; then - "$@"; - else - eval "$1"; - fi -} -_logHook () -{ - - if [[ -z ${NIX_LOG_FD-} ]]; then - return; - fi; - local hookKind="$1"; - local hookExpr="$2"; - shift 2; - if declare -F "$hookExpr" > /dev/null 2>&1; then - nixTalkativeLog "calling '$hookKind' function hook '$hookExpr'" "$@"; - else - if type -p "$hookExpr" > /dev/null; then - nixTalkativeLog "sourcing '$hookKind' script hook '$hookExpr'"; - else - if [[ "$hookExpr" != "_callImplicitHook"* ]]; then - local exprToOutput; - if [[ ${NIX_DEBUG:-0} -ge 5 ]]; then - exprToOutput="$hookExpr"; - else - local hookExprLine; - while IFS= read -r hookExprLine; do - hookExprLine="${hookExprLine#"${hookExprLine%%[![:space:]]*}"}"; - if [[ -n "$hookExprLine" ]]; then - exprToOutput+="$hookExprLine\\n "; - fi; - done <<< "$hookExpr"; - exprToOutput="${exprToOutput%%\\n }"; - fi; - nixTalkativeLog "evaling '$hookKind' string hook '$exprToOutput'"; - fi; - fi; - fi -} -_makeSymlinksRelative () -{ - - local symlinkTarget; - if [ "${dontRewriteSymlinks-}" ] || [ ! -e "$prefix" ]; then - return; - fi; - while IFS= read -r -d '' f; do - symlinkTarget=$(readlink "$f"); - if [[ "$symlinkTarget"/ != "$prefix"/* ]]; then - continue; - fi; - if [ ! -e "$symlinkTarget" ]; then - echo "the symlink $f is broken, it points to $symlinkTarget (which is missing)"; - fi; - echo "rewriting symlink $f to be relative to $prefix"; - ln -snrf "$symlinkTarget" "$f"; - done < <(find $prefix -type l -print0) -} -_makeSymlinksRelativeInAllOutputs () -{ - - local output; - for output in $(getAllOutputNames); - do - prefix="${!output}" _makeSymlinksRelative; - done -} -_moveLib64 () -{ - - if [ "${dontMoveLib64-}" = 1 ]; then - return; - fi; - if [ ! -e "$prefix/lib64" -o -L "$prefix/lib64" ]; then - return; - fi; - echo "moving $prefix/lib64/* to $prefix/lib"; - mkdir -p $prefix/lib; - shopt -s dotglob; - for i in $prefix/lib64/*; - do - mv --no-clobber "$i" $prefix/lib; - done; - shopt -u dotglob; - rmdir $prefix/lib64; - ln -s lib $prefix/lib64 -} -_moveSbin () -{ - - if [ "${dontMoveSbin-}" = 1 ]; then - return; - fi; - if [ ! -e "$prefix/sbin" -o -L "$prefix/sbin" ]; then - return; - fi; - echo "moving $prefix/sbin/* to $prefix/bin"; - mkdir -p $prefix/bin; - shopt -s dotglob; - for i in $prefix/sbin/*; - do - mv "$i" $prefix/bin; - done; - shopt -u dotglob; - rmdir $prefix/sbin; - ln -s bin $prefix/sbin -} -_moveSystemdUserUnits () -{ - - if [ "${dontMoveSystemdUserUnits:-0}" = 1 ]; then - return; - fi; - if [ ! -e "${prefix:?}/lib/systemd/user" ]; then - return; - fi; - local source="$prefix/lib/systemd/user"; - local target="$prefix/share/systemd/user"; - echo "moving $source/* to $target"; - mkdir -p "$target"; - ( shopt -s dotglob; - for i in "$source"/*; - do - mv "$i" "$target"; - done ); - rmdir "$source"; - ln -s "$target" "$source" -} -_moveToShare () -{ - - if [ -n "$__structuredAttrs" ]; then - if [ -z "${forceShare-}" ]; then - forceShare=(man doc info); - fi; - else - forceShare=(${forceShare:-man doc info}); - fi; - if [[ -z "$out" ]]; then - return; - fi; - for d in "${forceShare[@]}"; - do - if [ -d "$out/$d" ]; then - if [ -d "$out/share/$d" ]; then - echo "both $d/ and share/$d/ exist!"; - else - echo "moving $out/$d to $out/share/$d"; - mkdir -p $out/share; - mv $out/$d $out/share/; - fi; - fi; - done -} -_multioutConfig () -{ - - if [ "$(getAllOutputNames)" = "out" ] || [ -z "${setOutputFlags-1}" ]; then - return; - fi; - if [ -z "${shareDocName:-}" ]; then - local confScript="${configureScript:-}"; - if [ -z "$confScript" ] && [ -x ./configure ]; then - confScript=./configure; - fi; - if [ -f "$confScript" ]; then - local shareDocName="$(sed -n "s/^PACKAGE_TARNAME='\(.*\)'$/\1/p" < "$confScript")"; - fi; - if [ -z "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-]'; then - shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')"; - fi; - fi; - prependToVar configureFlags --bindir="${!outputBin}"/bin --sbindir="${!outputBin}"/sbin --includedir="${!outputInclude}"/include --oldincludedir="${!outputInclude}"/include --mandir="${!outputMan}"/share/man --infodir="${!outputInfo}"/share/info --docdir="${!outputDoc}"/share/doc/"${shareDocName}" --libdir="${!outputLib}"/lib --libexecdir="${!outputLib}"/libexec --localedir="${!outputLib}"/share/locale; - prependToVar installFlags pkgconfigdir="${!outputDev}"/lib/pkgconfig m4datadir="${!outputDev}"/share/aclocal aclocaldir="${!outputDev}"/share/aclocal -} -_multioutDevs () -{ - - if [ "$(getAllOutputNames)" = "out" ] || [ -z "${moveToDev-1}" ]; then - return; - fi; - moveToOutput include "${!outputInclude}"; - moveToOutput lib/pkgconfig "${!outputDev}"; - moveToOutput share/pkgconfig "${!outputDev}"; - moveToOutput lib/cmake "${!outputDev}"; - moveToOutput share/aclocal "${!outputDev}"; - for f in "${!outputDev}"/{lib,share}/pkgconfig/*.pc; - do - echo "Patching '$f' includedir to output ${!outputInclude}"; - sed -i "/^includedir=/s,=\${prefix},=${!outputInclude}," "$f"; - done -} -_multioutDocs () -{ - - local REMOVE=REMOVE; - moveToOutput share/info "${!outputInfo}"; - moveToOutput share/doc "${!outputDoc}"; - moveToOutput share/gtk-doc "${!outputDevdoc}"; - moveToOutput share/devhelp/books "${!outputDevdoc}"; - moveToOutput share/man "${!outputMan}"; - moveToOutput share/man/man3 "${!outputDevman}" -} -_multioutPropagateDev () -{ - - if [ "$(getAllOutputNames)" = "out" ]; then - return; - fi; - local outputFirst; - for outputFirst in $(getAllOutputNames); - do - break; - done; - local propagaterOutput="$outputDev"; - if [ -z "$propagaterOutput" ]; then - propagaterOutput="$outputFirst"; - fi; - if [ -z "${propagatedBuildOutputs+1}" ]; then - local po_dirty="$outputBin $outputInclude $outputLib"; - set +o pipefail; - propagatedBuildOutputs=`echo "$po_dirty" | tr -s ' ' '\n' | grep -v -F "$propagaterOutput" | sort -u | tr '\n' ' ' `; - set -o pipefail; - fi; - if [ -z "$propagatedBuildOutputs" ]; then - return; - fi; - mkdir -p "${!propagaterOutput}"/nix-support; - for output in $propagatedBuildOutputs; - do - echo -n " ${!output}" >> "${!propagaterOutput}"/nix-support/propagated-build-inputs; - done -} -_overrideFirst () -{ - - if [ -z "${!1-}" ]; then - _assignFirst "$@"; - fi -} -_pruneLibtoolFiles () -{ - - if [ "${dontPruneLibtoolFiles-}" ] || [ ! -e "$prefix" ]; then - return; - fi; - find "$prefix" -type f -name '*.la' -exec grep -q '^# Generated by .*libtool' {} \; -exec grep -q "^old_library=''" {} \; -exec sed -i {} -e "/^dependency_libs='[^']/ c dependency_libs='' #pruned" \; -} -_updateSourceDateEpochFromSourceRoot () -{ - - if [ -n "$sourceRoot" ]; then - updateSourceDateEpoch "$sourceRoot"; - fi -} -activatePackage () -{ - - local pkg="$1"; - local -r hostOffset="$2"; - local -r targetOffset="$3"; - (( hostOffset <= targetOffset )) || exit 1; - if [ -f "$pkg" ]; then - nixTalkativeLog "sourcing setup hook '$pkg'"; - source "$pkg"; - fi; - if [[ -z "${strictDeps-}" || "$hostOffset" -le -1 ]]; then - addToSearchPath _PATH "$pkg/bin"; - fi; - if (( hostOffset <= -1 )); then - addToSearchPath _XDG_DATA_DIRS "$pkg/share"; - fi; - if [[ "$hostOffset" -eq 0 && -d "$pkg/bin" ]]; then - addToSearchPath _HOST_PATH "$pkg/bin"; - fi; - if [[ -f "$pkg/nix-support/setup-hook" ]]; then - nixTalkativeLog "sourcing setup hook '$pkg/nix-support/setup-hook'"; - source "$pkg/nix-support/setup-hook"; - fi -} -addEnvHooks () -{ - - local depHostOffset="$1"; - shift; - local pkgHookVarsSlice="${pkgHookVarVars[$depHostOffset + 1]}[@]"; - local pkgHookVar; - for pkgHookVar in "${!pkgHookVarsSlice}"; - do - eval "${pkgHookVar}s"'+=("$@")'; - done -} -addToSearchPath () -{ - - addToSearchPathWithCustomDelimiter ":" "$@" -} -addToSearchPathWithCustomDelimiter () -{ - - local delimiter="$1"; - local varName="$2"; - local dir="$3"; - if [[ -d "$dir" && "${!varName:+${delimiter}${!varName}${delimiter}}" != *"${delimiter}${dir}${delimiter}"* ]]; then - export "${varName}=${!varName:+${!varName}${delimiter}}${dir}"; - fi -} -appendToVar () -{ - - local -n nameref="$1"; - local useArray type; - if [ -n "$__structuredAttrs" ]; then - useArray=true; - else - useArray=false; - fi; - if type=$(declare -p "$1" 2> /dev/null); then - case "${type#* }" in - -A*) - echo "appendToVar(): ERROR: trying to use appendToVar on an associative array, use variable+=([\"X\"]=\"Y\") instead." 1>&2; - return 1 - ;; - -a*) - useArray=true - ;; - *) - useArray=false - ;; - esac; - fi; - shift; - if $useArray; then - nameref=(${nameref+"${nameref[@]}"} "$@"); - else - nameref="${nameref-} $*"; - fi -} -auditTmpdir () -{ - - local dir="$1"; - [ -e "$dir" ] || return 0; - echo "checking for references to $TMPDIR/ in $dir..."; - local i; - find "$dir" -type f -print0 | while IFS= read -r -d '' i; do - if [[ "$i" =~ .build-id ]]; then - continue; - fi; - if isELF "$i"; then - if { - printf :; - patchelf --print-rpath "$i" - } | grep -q -F ":$TMPDIR/"; then - echo "RPATH of binary $i contains a forbidden reference to $TMPDIR/"; - exit 1; - fi; - fi; - if isScript "$i"; then - if [ -e "$(dirname "$i")/.$(basename "$i")-wrapped" ]; then - if grep -q -F "$TMPDIR/" "$i"; then - echo "wrapper script $i contains a forbidden reference to $TMPDIR/"; - exit 1; - fi; - fi; - fi; - done -} -bintoolsWrapper_addLDVars () -{ - - local role_post; - getHostRoleEnvHook; - if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then - export NIX_LDFLAGS${role_post}+=" -L$1/lib64"; - fi; - if [[ -d "$1/lib" ]]; then - local -a glob=($1/lib/lib*); - if [ "${#glob[*]}" -gt 0 ]; then - export NIX_LDFLAGS${role_post}+=" -L$1/lib"; - fi; - fi -} -buildPhase () -{ - - runHook preBuild; - if [[ -z "${makeFlags-}" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then - echo "no Makefile or custom buildPhase, doing nothing"; - else - foundMakefile=1; - local flagsArray=(${enableParallelBuilding:+-j${NIX_BUILD_CORES}} SHELL="$SHELL"); - concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray; - echoCmd 'build flags' "${flagsArray[@]}"; - make ${makefile:+-f $makefile} "${flagsArray[@]}"; - unset flagsArray; - fi; - runHook postBuild -} -ccWrapper_addCVars () -{ - - local role_post; - getHostRoleEnvHook; - if [ -d "$1/include" ]; then - export NIX_CFLAGS_COMPILE${role_post}+=" -isystem $1/include"; - fi; - if [ -d "$1/Library/Frameworks" ]; then - export NIX_CFLAGS_COMPILE${role_post}+=" -iframework $1/Library/Frameworks"; - fi -} -checkPhase () -{ - - runHook preCheck; - if [[ -z "${foundMakefile:-}" ]]; then - echo "no Makefile or custom checkPhase, doing nothing"; - runHook postCheck; - return; - fi; - if [[ -z "${checkTarget:-}" ]]; then - if make -n ${makefile:+-f $makefile} check > /dev/null 2>&1; then - checkTarget="check"; - else - if make -n ${makefile:+-f $makefile} test > /dev/null 2>&1; then - checkTarget="test"; - fi; - fi; - fi; - if [[ -z "${checkTarget:-}" ]]; then - echo "no check/test target in ${makefile:-Makefile}, doing nothing"; - else - local flagsArray=(${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL="$SHELL"); - concatTo flagsArray makeFlags makeFlagsArray checkFlags=VERBOSE=y checkFlagsArray checkTarget; - echoCmd 'check flags' "${flagsArray[@]}"; - make ${makefile:+-f $makefile} "${flagsArray[@]}"; - unset flagsArray; - fi; - runHook postCheck -} -compressManPages () -{ - - local dir="$1"; - if [ -L "$dir"/share ] || [ -L "$dir"/share/man ] || [ ! -d "$dir/share/man" ]; then - return; - fi; - echo "gzipping man pages under $dir/share/man/"; - find "$dir"/share/man/ -type f -a '!' -regex '.*\.\(bz2\|gz\|xz\)$' -print0 | while IFS= read -r -d '' f; do - if gzip -c -n "$f" > "$f".gz; then - rm "$f"; - else - rm "$f".gz; - fi; - done; - find "$dir"/share/man/ -type l -a '!' -regex '.*\.\(bz2\|gz\|xz\)$' -print0 | sort -z | while IFS= read -r -d '' f; do - local target; - target="$(readlink -f "$f")"; - if [ -f "$target".gz ]; then - ln -sf "$target".gz "$f".gz && rm "$f"; - fi; - done -} -concatStringsSep () -{ - - local sep="$1"; - local name="$2"; - local type oldifs; - if type=$(declare -p "$name" 2> /dev/null); then - local -n nameref="$name"; - case "${type#* }" in - -A*) - echo "concatStringsSep(): ERROR: trying to use concatStringsSep on an associative array." 1>&2; - return 1 - ;; - -a*) - local IFS="$(printf '\036')" - ;; - *) - local IFS=" " - ;; - esac; - local ifs_separated="${nameref[*]}"; - echo -n "${ifs_separated//"$IFS"/"$sep"}"; - fi -} -concatTo () -{ - - local -; - set -o noglob; - local -n targetref="$1"; - shift; - local arg default name type; - for arg in "$@"; - do - IFS="=" read -r name default <<< "$arg"; - local -n nameref="$name"; - if [[ -z "${nameref[*]}" && -n "$default" ]]; then - targetref+=("$default"); - else - if type=$(declare -p "$name" 2> /dev/null); then - case "${type#* }" in - -A*) - echo "concatTo(): ERROR: trying to use concatTo on an associative array." 1>&2; - return 1 - ;; - -a*) - targetref+=("${nameref[@]}") - ;; - *) - if [[ "$name" = *"Array" ]]; then - nixErrorLog "concatTo(): $name is not declared as array, treating as a singleton. This will become an error in future"; - targetref+=(${nameref+"${nameref[@]}"}); - else - targetref+=(${nameref-}); - fi - ;; - esac; - fi; - fi; - done -} -configurePhase () -{ - - runHook preConfigure; - : "${configureScript=}"; - if [[ -z "$configureScript" && -x ./configure ]]; then - configureScript=./configure; - fi; - if [ -z "${dontFixLibtool:-}" ]; then - export lt_cv_deplibs_check_method="${lt_cv_deplibs_check_method-pass_all}"; - local i; - find . -iname "ltmain.sh" -print0 | while IFS='' read -r -d '' i; do - echo "fixing libtool script $i"; - fixLibtool "$i"; - done; - CONFIGURE_MTIME_REFERENCE=$(mktemp configure.mtime.reference.XXXXXX); - find . -executable -type f -name configure -exec grep -l 'GNU Libtool is free software; you can redistribute it and/or modify' {} \; -exec touch -r {} "$CONFIGURE_MTIME_REFERENCE" \; -exec sed -i s_/usr/bin/file_file_g {} \; -exec touch -r "$CONFIGURE_MTIME_REFERENCE" {} \;; - rm -f "$CONFIGURE_MTIME_REFERENCE"; - fi; - if [[ -z "${dontAddPrefix:-}" && -n "$prefix" ]]; then - prependToVar configureFlags "${prefixKey:---prefix=}$prefix"; - fi; - if [[ -f "$configureScript" ]]; then - if [ -z "${dontAddDisableDepTrack:-}" ]; then - if grep -q dependency-tracking "$configureScript"; then - prependToVar configureFlags --disable-dependency-tracking; - fi; - fi; - if [ -z "${dontDisableStatic:-}" ]; then - if grep -q enable-static "$configureScript"; then - prependToVar configureFlags --disable-static; - fi; - fi; - if [ -z "${dontPatchShebangsInConfigure:-}" ]; then - patchShebangs --build "$configureScript"; - fi; - fi; - if [ -n "$configureScript" ]; then - local -a flagsArray; - concatTo flagsArray configureFlags configureFlagsArray; - echoCmd 'configure flags' "${flagsArray[@]}"; - $configureScript "${flagsArray[@]}"; - unset flagsArray; - else - echo "no configure script, doing nothing"; - fi; - runHook postConfigure -} -consumeEntire () -{ - - if IFS='' read -r -d '' "$1"; then - echo "consumeEntire(): ERROR: Input null bytes, won't process" 1>&2; - return 1; - fi -} -distPhase () -{ - - runHook preDist; - local flagsArray=(); - concatTo flagsArray distFlags distFlagsArray distTarget=dist; - echo 'dist flags: %q' "${flagsArray[@]}"; - make ${makefile:+-f $makefile} "${flagsArray[@]}"; - if [ "${dontCopyDist:-0}" != 1 ]; then - mkdir -p "$out/tarballs"; - cp -pvd ${tarballs[*]:-*.tar.gz} "$out/tarballs"; - fi; - runHook postDist -} -dumpVars () -{ - - if [ "${noDumpEnvVars:-0}" != 1 ]; then - { - install -m 0600 /dev/null "$NIX_BUILD_TOP/env-vars" && export 2> /dev/null >| "$NIX_BUILD_TOP/env-vars" - } || true; - fi -} -echoCmd () -{ - - printf "%s:" "$1"; - shift; - printf ' %q' "$@"; - echo -} -exitHandler () -{ - - exitCode="$?"; - set +e; - if [ -n "${showBuildStats:-}" ]; then - read -r -d '' -a buildTimes < <(times); - echo "build times:"; - echo "user time for the shell ${buildTimes[0]}"; - echo "system time for the shell ${buildTimes[1]}"; - echo "user time for all child processes ${buildTimes[2]}"; - echo "system time for all child processes ${buildTimes[3]}"; - fi; - if (( "$exitCode" != 0 )); then - runHook failureHook; - if [ -n "${succeedOnFailure:-}" ]; then - echo "build failed with exit code $exitCode (ignored)"; - mkdir -p "$out/nix-support"; - printf "%s" "$exitCode" > "$out/nix-support/failed"; - exit 0; - fi; - else - runHook exitHook; - fi; - return "$exitCode" -} -findInputs () -{ - - local -r pkg="$1"; - local -r hostOffset="$2"; - local -r targetOffset="$3"; - (( hostOffset <= targetOffset )) || exit 1; - local varVar="${pkgAccumVarVars[hostOffset + 1]}"; - local varRef="$varVar[$((targetOffset - hostOffset))]"; - local var="${!varRef}"; - unset -v varVar varRef; - local varSlice="$var[*]"; - case " ${!varSlice-} " in - *" $pkg "*) - return 0 - ;; - esac; - unset -v varSlice; - eval "$var"'+=("$pkg")'; - if ! [ -e "$pkg" ]; then - echo "build input $pkg does not exist" 1>&2; - exit 1; - fi; - function mapOffset () - { - local -r inputOffset="$1"; - local -n outputOffset="$2"; - if (( inputOffset <= 0 )); then - outputOffset=$((inputOffset + hostOffset)); - else - outputOffset=$((inputOffset - 1 + targetOffset)); - fi - }; - local relHostOffset; - for relHostOffset in "${allPlatOffsets[@]}"; - do - local files="${propagatedDepFilesVars[relHostOffset + 1]}"; - local hostOffsetNext; - mapOffset "$relHostOffset" hostOffsetNext; - (( -1 <= hostOffsetNext && hostOffsetNext <= 1 )) || continue; - local relTargetOffset; - for relTargetOffset in "${allPlatOffsets[@]}"; - do - (( "$relHostOffset" <= "$relTargetOffset" )) || continue; - local fileRef="${files}[$relTargetOffset - $relHostOffset]"; - local file="${!fileRef}"; - unset -v fileRef; - local targetOffsetNext; - mapOffset "$relTargetOffset" targetOffsetNext; - (( -1 <= hostOffsetNext && hostOffsetNext <= 1 )) || continue; - [[ -f "$pkg/nix-support/$file" ]] || continue; - local pkgNext; - read -r -d '' pkgNext < "$pkg/nix-support/$file" || true; - for pkgNext in $pkgNext; - do - findInputs "$pkgNext" "$hostOffsetNext" "$targetOffsetNext"; - done; - done; - done -} -fixLibtool () -{ - - local search_path; - for flag in $NIX_LDFLAGS; - do - case $flag in - -L*) - search_path+=" ${flag#-L}" - ;; - esac; - done; - sed -i "$1" -e "s^eval \(sys_lib_search_path=\).*^\1'${search_path:-}'^" -e 's^eval sys_lib_.+search_path=.*^^' -} -fixupPhase () -{ - - local output; - for output in $(getAllOutputNames); - do - if [ -e "${!output}" ]; then - chmod -R u+w,u-s,g-s "${!output}"; - fi; - done; - runHook preFixup; - local output; - for output in $(getAllOutputNames); - do - prefix="${!output}" runHook fixupOutput; - done; - recordPropagatedDependencies; - if [ -n "${setupHook:-}" ]; then - mkdir -p "${!outputDev}/nix-support"; - substituteAll "$setupHook" "${!outputDev}/nix-support/setup-hook"; - fi; - if [ -n "${setupHooks:-}" ]; then - mkdir -p "${!outputDev}/nix-support"; - local hook; - for hook in ${setupHooks[@]}; - do - local content; - consumeEntire content < "$hook"; - substituteAllStream content "file '$hook'" >> "${!outputDev}/nix-support/setup-hook"; - unset -v content; - done; - unset -v hook; - fi; - if [ -n "${propagatedUserEnvPkgs:-}" ]; then - mkdir -p "${!outputBin}/nix-support"; - printWords $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages"; - fi; - runHook postFixup -} -genericBuild () -{ - - export GZIP_NO_TIMESTAMPS=1; - if [ -f "${buildCommandPath:-}" ]; then - source "$buildCommandPath"; - return; - fi; - if [ -n "${buildCommand:-}" ]; then - eval "$buildCommand"; - return; - fi; - if [ -z "${phases[*]:-}" ]; then - phases="${prePhases[*]:-} unpackPhase patchPhase ${preConfigurePhases[*]:-} configurePhase ${preBuildPhases[*]:-} buildPhase checkPhase ${preInstallPhases[*]:-} installPhase ${preFixupPhases[*]:-} fixupPhase installCheckPhase ${preDistPhases[*]:-} distPhase ${postPhases[*]:-}"; - fi; - for curPhase in ${phases[*]}; - do - runPhase "$curPhase"; - done -} -getAllOutputNames () -{ - - if [ -n "$__structuredAttrs" ]; then - echo "${!outputs[*]}"; - else - echo "$outputs"; - fi -} -getHostRole () -{ - - getRole "$hostOffset" -} -getHostRoleEnvHook () -{ - - getRole "$depHostOffset" -} -getRole () -{ - - case $1 in - -1) - role_post='_FOR_BUILD' - ;; - 0) - role_post='' - ;; - 1) - role_post='_FOR_TARGET' - ;; - *) - echo "pkg-config-wrapper-0.29.2: used as improper sort of dependency" 1>&2; - return 1 - ;; - esac -} -getTargetRole () -{ - - getRole "$targetOffset" -} -getTargetRoleEnvHook () -{ - - getRole "$depTargetOffset" -} -getTargetRoleWrapper () -{ - - case $targetOffset in - -1) - export NIX_PKG_CONFIG_WRAPPER_TARGET_BUILD_x86_64_unknown_linux_gnu=1 - ;; - 0) - export NIX_PKG_CONFIG_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu=1 - ;; - 1) - export NIX_PKG_CONFIG_WRAPPER_TARGET_TARGET_x86_64_unknown_linux_gnu=1 - ;; - *) - echo "pkg-config-wrapper-0.29.2: used as improper sort of dependency" 1>&2; - return 1 - ;; - esac -} -installCheckPhase () -{ - - runHook preInstallCheck; - if [[ -z "${foundMakefile:-}" ]]; then - echo "no Makefile or custom installCheckPhase, doing nothing"; - else - if [[ -z "${installCheckTarget:-}" ]] && ! make -n ${makefile:+-f $makefile} "${installCheckTarget:-installcheck}" > /dev/null 2>&1; then - echo "no installcheck target in ${makefile:-Makefile}, doing nothing"; - else - local flagsArray=(${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL="$SHELL"); - concatTo flagsArray makeFlags makeFlagsArray installCheckFlags installCheckFlagsArray installCheckTarget=installcheck; - echoCmd 'installcheck flags' "${flagsArray[@]}"; - make ${makefile:+-f $makefile} "${flagsArray[@]}"; - unset flagsArray; - fi; - fi; - runHook postInstallCheck -} -installPhase () -{ - - runHook preInstall; - if [[ -z "${makeFlags-}" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then - echo "no Makefile or custom installPhase, doing nothing"; - runHook postInstall; - return; - else - foundMakefile=1; - fi; - if [ -n "$prefix" ]; then - mkdir -p "$prefix"; - fi; - local flagsArray=(${enableParallelInstalling:+-j${NIX_BUILD_CORES}} SHELL="$SHELL"); - concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets=install; - echoCmd 'install flags' "${flagsArray[@]}"; - make ${makefile:+-f $makefile} "${flagsArray[@]}"; - unset flagsArray; - runHook postInstall -} -isELF () -{ - - local fn="$1"; - local fd; - local magic; - exec {fd}< "$fn"; - read -r -n 4 -u "$fd" magic; - exec {fd}>&-; - if [ "$magic" = 'ELF' ]; then - return 0; - else - return 1; - fi -} -isMachO () -{ - - local fn="$1"; - local fd; - local magic; - exec {fd}< "$fn"; - read -r -n 4 -u "$fd" magic; - exec {fd}>&-; - if [[ "$magic" = $(echo -ne "\xfe\xed\xfa\xcf") || "$magic" = $(echo -ne "\xcf\xfa\xed\xfe") ]]; then - return 0; - else - if [[ "$magic" = $(echo -ne "\xfe\xed\xfa\xce") || "$magic" = $(echo -ne "\xce\xfa\xed\xfe") ]]; then - return 0; - else - if [[ "$magic" = $(echo -ne "\xca\xfe\xba\xbe") || "$magic" = $(echo -ne "\xbe\xba\xfe\xca") ]]; then - return 0; - else - return 1; - fi; - fi; - fi -} -isScript () -{ - - local fn="$1"; - local fd; - local magic; - exec {fd}< "$fn"; - read -r -n 2 -u "$fd" magic; - exec {fd}>&-; - if [[ "$magic" =~ \#! ]]; then - return 0; - else - return 1; - fi -} -mapOffset () -{ - - local -r inputOffset="$1"; - local -n outputOffset="$2"; - if (( inputOffset <= 0 )); then - outputOffset=$((inputOffset + hostOffset)); - else - outputOffset=$((inputOffset - 1 + targetOffset)); - fi -} -moveToOutput () -{ - - local patt="$1"; - local dstOut="$2"; - local output; - for output in $(getAllOutputNames); - do - if [ "${!output}" = "$dstOut" ]; then - continue; - fi; - local srcPath; - for srcPath in "${!output}"/$patt; - do - if [ ! -e "$srcPath" ] && [ ! -L "$srcPath" ]; then - continue; - fi; - if [ "$dstOut" = REMOVE ]; then - echo "Removing $srcPath"; - rm -r "$srcPath"; - else - local dstPath="$dstOut${srcPath#${!output}}"; - echo "Moving $srcPath to $dstPath"; - if [ -d "$dstPath" ] && [ -d "$srcPath" ]; then - rmdir "$srcPath" --ignore-fail-on-non-empty; - if [ -d "$srcPath" ]; then - mv -t "$dstPath" "$srcPath"/*; - rmdir "$srcPath"; - fi; - else - mkdir -p "$(readlink -m "$dstPath/..")"; - mv "$srcPath" "$dstPath"; - fi; - fi; - local srcParent="$(readlink -m "$srcPath/..")"; - if [ -n "$(find "$srcParent" -maxdepth 0 -type d -empty 2> /dev/null)" ]; then - echo "Removing empty $srcParent/ and (possibly) its parents"; - rmdir -p --ignore-fail-on-non-empty "$srcParent" 2> /dev/null || true; - fi; - done; - done -} -nixChattyLog () -{ - - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 5 ]]; then - return; - fi; - printf "%s\n" "$*" >&"$NIX_LOG_FD" -} -nixDebugLog () -{ - - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 6 ]]; then - return; - fi; - printf "%s\n" "$*" >&"$NIX_LOG_FD" -} -nixErrorLog () -{ - - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 0 ]]; then - return; - fi; - printf "%s\n" "$*" >&"$NIX_LOG_FD" -} -nixInfoLog () -{ - - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 3 ]]; then - return; - fi; - printf "%s\n" "$*" >&"$NIX_LOG_FD" -} -nixNoticeLog () -{ - - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 2 ]]; then - return; - fi; - printf "%s\n" "$*" >&"$NIX_LOG_FD" -} -nixTalkativeLog () -{ - - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 4 ]]; then - return; - fi; - printf "%s\n" "$*" >&"$NIX_LOG_FD" -} -nixVomitLog () -{ - - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 7 ]]; then - return; - fi; - printf "%s\n" "$*" >&"$NIX_LOG_FD" -} -nixWarnLog () -{ - - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 1 ]]; then - return; - fi; - printf "%s\n" "$*" >&"$NIX_LOG_FD" -} -patchELF () -{ - - local dir="$1"; - [ -e "$dir" ] || return 0; - echo "shrinking RPATHs of ELF executables and libraries in $dir"; - local i; - while IFS= read -r -d '' i; do - if [[ "$i" =~ .build-id ]]; then - continue; - fi; - if ! isELF "$i"; then - continue; - fi; - echo "shrinking $i"; - patchelf --shrink-rpath "$i" || true; - done < <(find "$dir" -type f -print0) -} -patchPhase () -{ - - runHook prePatch; - local -a patchesArray; - concatTo patchesArray patches; - for i in "${patchesArray[@]}"; - do - echo "applying patch $i"; - local uncompress=cat; - case "$i" in - *.gz) - uncompress="gzip -d" - ;; - *.bz2) - uncompress="bzip2 -d" - ;; - *.xz) - uncompress="xz -d" - ;; - *.lzma) - uncompress="lzma -d" - ;; - esac; - local -a flagsArray; - concatTo flagsArray patchFlags=-p1; - $uncompress < "$i" 2>&1 | patch "${flagsArray[@]}"; - done; - runHook postPatch -} -patchShebangs () -{ - - local pathName; - local update; - while [[ $# -gt 0 ]]; do - case "$1" in - --host) - pathName=HOST_PATH; - shift - ;; - --build) - pathName=PATH; - shift - ;; - --update) - update=true; - shift - ;; - --) - shift; - break - ;; - -* | --*) - echo "Unknown option $1 supplied to patchShebangs" 1>&2; - return 1 - ;; - *) - break - ;; - esac; - done; - echo "patching script interpreter paths in $@"; - local f; - local oldPath; - local newPath; - local arg0; - local args; - local oldInterpreterLine; - local newInterpreterLine; - if [[ $# -eq 0 ]]; then - echo "No arguments supplied to patchShebangs" 1>&2; - return 0; - fi; - local f; - while IFS= read -r -d '' f; do - isScript "$f" || continue; - read -r oldInterpreterLine < "$f" || [ "$oldInterpreterLine" ]; - read -r oldPath arg0 args <<< "${oldInterpreterLine:2}"; - if [[ -z "${pathName:-}" ]]; then - if [[ -n $strictDeps && $f == "$NIX_STORE"* ]]; then - pathName=HOST_PATH; - else - pathName=PATH; - fi; - fi; - if [[ "$oldPath" == *"/bin/env" ]]; then - if [[ $arg0 == "-S" ]]; then - arg0=${args%% *}; - args=${args#* }; - newPath="$(PATH="${!pathName}" type -P "env" || true)"; - args="-S $(PATH="${!pathName}" type -P "$arg0" || true) $args"; - else - if [[ $arg0 == "-"* || $arg0 == *"="* ]]; then - echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" 1>&2; - exit 1; - else - newPath="$(PATH="${!pathName}" type -P "$arg0" || true)"; - fi; - fi; - else - if [[ -z $oldPath ]]; then - oldPath="/bin/sh"; - fi; - newPath="$(PATH="${!pathName}" type -P "$(basename "$oldPath")" || true)"; - args="$arg0 $args"; - fi; - newInterpreterLine="$newPath $args"; - newInterpreterLine=${newInterpreterLine%${newInterpreterLine##*[![:space:]]}}; - if [[ -n "$oldPath" && ( "$update" == true || "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ) ]]; then - if [[ -n "$newPath" && "$newPath" != "$oldPath" ]]; then - echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\""; - escapedInterpreterLine=${newInterpreterLine//\\/\\\\}; - timestamp=$(stat --printf "%y" "$f"); - sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f"; - touch --date "$timestamp" "$f"; - fi; - fi; - done < <(find "$@" -type f -perm -0100 -print0) -} -patchShebangsAuto () -{ - - if [[ -z "${dontPatchShebangs-}" && -e "$prefix" ]]; then - if [[ "$output" != out && "$output" = "$outputDev" ]]; then - patchShebangs --build "$prefix"; - else - patchShebangs --host "$prefix"; - fi; - fi -} -pkgConfigWrapper_addPkgConfigPath () -{ - - local role_post; - getHostRoleEnvHook; - addToSearchPath "PKG_CONFIG_PATH${role_post}" "$1/lib/pkgconfig"; - addToSearchPath "PKG_CONFIG_PATH${role_post}" "$1/share/pkgconfig" -} -prependToVar () -{ - - local -n nameref="$1"; - local useArray type; - if [ -n "$__structuredAttrs" ]; then - useArray=true; - else - useArray=false; - fi; - if type=$(declare -p "$1" 2> /dev/null); then - case "${type#* }" in - -A*) - echo "prependToVar(): ERROR: trying to use prependToVar on an associative array." 1>&2; - return 1 - ;; - -a*) - useArray=true - ;; - *) - useArray=false - ;; - esac; - fi; - shift; - if $useArray; then - nameref=("$@" ${nameref+"${nameref[@]}"}); - else - nameref="$* ${nameref-}"; - fi -} -printLines () -{ - - (( "$#" > 0 )) || return 0; - printf '%s\n' "$@" -} -printWords () -{ - - (( "$#" > 0 )) || return 0; - printf '%s ' "$@" -} -recordPropagatedDependencies () -{ - - declare -ra flatVars=(depsBuildBuildPropagated propagatedNativeBuildInputs depsBuildTargetPropagated depsHostHostPropagated propagatedBuildInputs depsTargetTargetPropagated); - declare -ra flatFiles=("${propagatedBuildDepFiles[@]}" "${propagatedHostDepFiles[@]}" "${propagatedTargetDepFiles[@]}"); - local propagatedInputsIndex; - for propagatedInputsIndex in "${!flatVars[@]}"; - do - local propagatedInputsSlice="${flatVars[$propagatedInputsIndex]}[@]"; - local propagatedInputsFile="${flatFiles[$propagatedInputsIndex]}"; - [[ -n "${!propagatedInputsSlice}" ]] || continue; - mkdir -p "${!outputDev}/nix-support"; - printWords ${!propagatedInputsSlice} > "${!outputDev}/nix-support/$propagatedInputsFile"; - done -} -runHook () -{ - - local hookName="$1"; - shift; - local hooksSlice="${hookName%Hook}Hooks[@]"; - local hook; - for hook in "_callImplicitHook 0 $hookName" ${!hooksSlice+"${!hooksSlice}"}; - do - _logHook "$hookName" "$hook" "$@"; - _eval "$hook" "$@"; - done; - return 0 -} -runOneHook () -{ - - local hookName="$1"; - shift; - local hooksSlice="${hookName%Hook}Hooks[@]"; - local hook ret=1; - for hook in "_callImplicitHook 1 $hookName" ${!hooksSlice+"${!hooksSlice}"}; - do - _logHook "$hookName" "$hook" "$@"; - if _eval "$hook" "$@"; then - ret=0; - break; - fi; - done; - return "$ret" -} -runPhase () -{ - - local curPhase="$*"; - if [[ "$curPhase" = unpackPhase && -n "${dontUnpack:-}" ]]; then - return; - fi; - if [[ "$curPhase" = patchPhase && -n "${dontPatch:-}" ]]; then - return; - fi; - if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then - return; - fi; - if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then - return; - fi; - if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then - return; - fi; - if [[ "$curPhase" = installPhase && -n "${dontInstall:-}" ]]; then - return; - fi; - if [[ "$curPhase" = fixupPhase && -n "${dontFixup:-}" ]]; then - return; - fi; - if [[ "$curPhase" = installCheckPhase && -z "${doInstallCheck:-}" ]]; then - return; - fi; - if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then - return; - fi; - showPhaseHeader "$curPhase"; - dumpVars; - local startTime endTime; - startTime=$(date +"%s"); - eval "${!curPhase:-$curPhase}"; - endTime=$(date +"%s"); - showPhaseFooter "$curPhase" "$startTime" "$endTime"; - if [ "$curPhase" = unpackPhase ]; then - [ -n "${sourceRoot:-}" ] && chmod +x -- "${sourceRoot}"; - cd -- "${sourceRoot:-.}"; - fi -} -showPhaseFooter () -{ - - local phase="$1"; - local startTime="$2"; - local endTime="$3"; - local delta=$(( endTime - startTime )); - (( delta < 30 )) && return; - local H=$((delta/3600)); - local M=$((delta%3600/60)); - local S=$((delta%60)); - echo -n "$phase completed in "; - (( H > 0 )) && echo -n "$H hours "; - (( M > 0 )) && echo -n "$M minutes "; - echo "$S seconds" -} -showPhaseHeader () -{ - - local phase="$1"; - echo "Running phase: $phase"; - if [[ -z ${NIX_LOG_FD-} ]]; then - return; - fi; - printf "@nix { \"action\": \"setPhase\", \"phase\": \"%s\" }\n" "$phase" >&"$NIX_LOG_FD" -} -stripDirs () -{ - - local cmd="$1"; - local ranlibCmd="$2"; - local paths="$3"; - local stripFlags="$4"; - local excludeFlags=(); - local pathsNew=; - [ -z "$cmd" ] && echo "stripDirs: Strip command is empty" 1>&2 && exit 1; - [ -z "$ranlibCmd" ] && echo "stripDirs: Ranlib command is empty" 1>&2 && exit 1; - local pattern; - if [ -n "${stripExclude:-}" ]; then - for pattern in "${stripExclude[@]}"; - do - excludeFlags+=(-a '!' '(' -name "$pattern" -o -wholename "$prefix/$pattern" ')'); - done; - fi; - local p; - for p in ${paths}; - do - if [ -e "$prefix/$p" ]; then - pathsNew="${pathsNew} $prefix/$p"; - fi; - done; - paths=${pathsNew}; - if [ -n "${paths}" ]; then - echo "stripping (with command $cmd and flags $stripFlags) in $paths"; - local striperr; - striperr="$(mktemp --tmpdir="$TMPDIR" 'striperr.XXXXXX')"; - find $paths -type f "${excludeFlags[@]}" -a '!' -path "$prefix/lib/debug/*" -printf '%D-%i,%p\0' | sort -t, -k1,1 -u -z | cut -d, -f2- -z | xargs -r -0 -n1 -P "$NIX_BUILD_CORES" -- $cmd $stripFlags 2> "$striperr" || exit_code=$?; - [[ "$exit_code" = 123 || -z "$exit_code" ]] || ( cat "$striperr" 1>&2 && exit 1 ); - rm "$striperr"; - find $paths -name '*.a' -type f -exec $ranlibCmd '{}' \; 2> /dev/null; - fi -} -stripHash () -{ - - local strippedName casematchOpt=0; - strippedName="$(basename -- "$1")"; - shopt -q nocasematch && casematchOpt=1; - shopt -u nocasematch; - if [[ "$strippedName" =~ ^[a-z0-9]{32}- ]]; then - echo "${strippedName:33}"; - else - echo "$strippedName"; - fi; - if (( casematchOpt )); then - shopt -s nocasematch; - fi -} -substitute () -{ - - local input="$1"; - local output="$2"; - shift 2; - if [ ! -f "$input" ]; then - echo "substitute(): ERROR: file '$input' does not exist" 1>&2; - return 1; - fi; - local content; - consumeEntire content < "$input"; - if [ -e "$output" ]; then - chmod +w "$output"; - fi; - substituteStream content "file '$input'" "$@" > "$output" -} -substituteAll () -{ - - local input="$1"; - local output="$2"; - local -a args=(); - _allFlags; - substitute "$input" "$output" "${args[@]}" -} -substituteAllInPlace () -{ - - local fileName="$1"; - shift; - substituteAll "$fileName" "$fileName" "$@" -} -substituteAllStream () -{ - - local -a args=(); - _allFlags; - substituteStream "$1" "$2" "${args[@]}" -} -substituteInPlace () -{ - - local -a fileNames=(); - for arg in "$@"; - do - if [[ "$arg" = "--"* ]]; then - break; - fi; - fileNames+=("$arg"); - shift; - done; - if ! [[ "${#fileNames[@]}" -gt 0 ]]; then - echo "substituteInPlace called without any files to operate on (files must come before options!)" 1>&2; - return 1; - fi; - for file in "${fileNames[@]}"; - do - substitute "$file" "$file" "$@"; - done -} -substituteStream () -{ - - local var=$1; - local description=$2; - shift 2; - while (( "$#" )); do - local replace_mode="$1"; - case "$1" in - --replace) - if ! "$_substituteStream_has_warned_replace_deprecation"; then - echo "substituteStream() in derivation $name: WARNING: '--replace' is deprecated, use --replace-{fail,warn,quiet}. ($description)" 1>&2; - _substituteStream_has_warned_replace_deprecation=true; - fi; - replace_mode='--replace-warn' - ;& - --replace-quiet | --replace-warn | --replace-fail) - pattern="$2"; - replacement="$3"; - shift 3; - local savedvar; - savedvar="${!var}"; - eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}'; - if [ "$pattern" != "$replacement" ]; then - if [ "${!var}" == "$savedvar" ]; then - if [ "$replace_mode" == --replace-warn ]; then - printf "substituteStream() in derivation $name: WARNING: pattern %q doesn't match anything in %s\n" "$pattern" "$description" 1>&2; - else - if [ "$replace_mode" == --replace-fail ]; then - printf "substituteStream() in derivation $name: ERROR: pattern %q doesn't match anything in %s\n" "$pattern" "$description" 1>&2; - return 1; - fi; - fi; - fi; - fi - ;; - --subst-var) - local varName="$2"; - shift 2; - if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then - echo "substituteStream() in derivation $name: ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." 1>&2; - return 1; - fi; - if [ -z ${!varName+x} ]; then - echo "substituteStream() in derivation $name: ERROR: variable \$$varName is unset" 1>&2; - return 1; - fi; - pattern="@$varName@"; - replacement="${!varName}"; - eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}' - ;; - --subst-var-by) - pattern="@$2@"; - replacement="$3"; - eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}'; - shift 3 - ;; - *) - echo "substituteStream() in derivation $name: ERROR: Invalid command line argument: $1" 1>&2; - return 1 - ;; - esac; - done; - printf "%s" "${!var}" -} -unpackFile () -{ - - curSrc="$1"; - echo "unpacking source archive $curSrc"; - if ! runOneHook unpackCmd "$curSrc"; then - echo "do not know how to unpack source archive $curSrc"; - exit 1; - fi -} -unpackPhase () -{ - - runHook preUnpack; - if [ -z "${srcs:-}" ]; then - if [ -z "${src:-}" ]; then - echo 'variable $src or $srcs should point to the source'; - exit 1; - fi; - srcs="$src"; - fi; - local -a srcsArray; - concatTo srcsArray srcs; - local dirsBefore=""; - for i in *; - do - if [ -d "$i" ]; then - dirsBefore="$dirsBefore $i "; - fi; - done; - for i in "${srcsArray[@]}"; - do - unpackFile "$i"; - done; - : "${sourceRoot=}"; - if [ -n "${setSourceRoot:-}" ]; then - runOneHook setSourceRoot; - else - if [ -z "$sourceRoot" ]; then - for i in *; - do - if [ -d "$i" ]; then - case $dirsBefore in - *\ $i\ *) - - ;; - *) - if [ -n "$sourceRoot" ]; then - echo "unpacker produced multiple directories"; - exit 1; - fi; - sourceRoot="$i" - ;; - esac; - fi; - done; - fi; - fi; - if [ -z "$sourceRoot" ]; then - echo "unpacker appears to have produced no directories"; - exit 1; - fi; - echo "source root is $sourceRoot"; - if [ "${dontMakeSourcesWritable:-0}" != 1 ]; then - chmod -R u+w -- "$sourceRoot"; - fi; - runHook postUnpack -} -updateAutotoolsGnuConfigScriptsPhase () -{ - - if [ -n "${dontUpdateAutotoolsGnuConfigScripts-}" ]; then - return; - fi; - for script in config.sub config.guess; - do - for f in $(find . -type f -name "$script"); - do - echo "Updating Autotools / GNU config script to a newer upstream version: $f"; - cp -f "/nix/store/1m67ipsk39xvhyqrxnzv2m2p48pil8kl-gnu-config-2024-01-01/$script" "$f"; - done; - done -} -updateSourceDateEpoch () -{ - - local path="$1"; - [[ $path == -* ]] && path="./$path"; - local -a res=($(find "$path" -type f -not -newer "$NIX_BUILD_TOP/.." -printf '%T@ %p\0' | sort -n --zero-terminated | tail -n1 --zero-terminated | head -c -1)); - local time="${res[0]//\.[0-9]*/}"; - local newestFile="${res[1]}"; - if [ "${time:-0}" -gt "$SOURCE_DATE_EPOCH" ]; then - echo "setting SOURCE_DATE_EPOCH to timestamp $time of file $newestFile"; - export SOURCE_DATE_EPOCH="$time"; - local now="$(date +%s)"; - if [ "$time" -gt $((now - 60)) ]; then - echo "warning: file $newestFile may be generated; SOURCE_DATE_EPOCH may be non-deterministic"; - fi; - fi -} -PATH="$PATH${nix_saved_PATH:+:$nix_saved_PATH}" -XDG_DATA_DIRS="$XDG_DATA_DIRS${nix_saved_XDG_DATA_DIRS:+:$nix_saved_XDG_DATA_DIRS}" -export NIX_BUILD_TOP="$(mktemp -d -t nix-shell.XXXXXX)" -export TMP="$NIX_BUILD_TOP" -export TMPDIR="$NIX_BUILD_TOP" -export TEMP="$NIX_BUILD_TOP" -export TEMPDIR="$NIX_BUILD_TOP" -eval "${shellHook:-}" diff --git a/.gitignore b/.gitignore index 550c01b..d60cdaf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /result -.vscode/ +/.vscode +/.direnv # Added by cargo diff --git a/src/main.rs b/src/main.rs index 4140e2c..194bb06 100644 --- a/src/main.rs +++ b/src/main.rs @@ -72,7 +72,7 @@ fn main() -> Result<(), Box> { "--arg", "height=30", "--config", - CONFIG_DIR, //TODO make this path implicit + CONFIG_DIR, ]) .spawn() .expect("failed to execute process"); From bdd0854f2b2e7bf9218953316d9c14ad0a288270 Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 14 Jan 2025 17:23:02 +0100 Subject: [PATCH 6/8] remove old files --- .../index/clients.cpp.B5776BD65D73C3BD.idx | Bin 6018 -> 0 bytes .../index/clients.cpp.BD74FDEF364138EC.idx | Bin 3032 -> 0 bytes .../index/clients.hpp.05172D18DA9F7845.idx | Bin 252 -> 0 bytes .../index/clients.hpp.55D0C4BD3B990C00.idx | Bin 254 -> 0 bytes .../clangd/index/main.cpp.0F1D16B47EEF5CD3.idx | Bin 1268 -> 0 bytes .../clangd/index/main.cpp.17644C8C1E1C6067.idx | Bin 1092 -> 0 bytes 6 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .cache/clangd/index/clients.cpp.B5776BD65D73C3BD.idx delete mode 100644 .cache/clangd/index/clients.cpp.BD74FDEF364138EC.idx delete mode 100644 .cache/clangd/index/clients.hpp.05172D18DA9F7845.idx delete mode 100644 .cache/clangd/index/clients.hpp.55D0C4BD3B990C00.idx delete mode 100644 .cache/clangd/index/main.cpp.0F1D16B47EEF5CD3.idx delete mode 100644 .cache/clangd/index/main.cpp.17644C8C1E1C6067.idx diff --git a/.cache/clangd/index/clients.cpp.B5776BD65D73C3BD.idx b/.cache/clangd/index/clients.cpp.B5776BD65D73C3BD.idx deleted file mode 100644 index 162f6cfc8e49c8cb181496280e70d538e6b22cc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6018 zcmWIYbaSf`XJBwn@vO*AElFfyU|=1}d>)x9k(l4r~h+wXUfw^!`> z`#{Vsv2gXyiWOnnE%KdBGk3&AJAR8Tc@W^oIU{4vcFpNOr-)z8INWB-&c(4#>xYO! zVBdzqlXWMjuXTHz@UagmD-HK~2MVdg-C+{3{Pya#aPE=v z35Q}|#!ax_%qq3=tn=UQn2|_R-weNk0ERHSHes}!B?1k?884udTa}-zRCe<-AFkIYT_c8J7Ykpn^ zbp{3@QE5?CFu?!?$4})kKYrvc&%+?kz#!zx>M8;zpt20sMvX?1)(pBl3G3jXGB5}UvkHrX37E7?WckM&w_pn%1|c1_mKPHbE{h0h4y;l->2h??M3&gCYZiPzNJx2csyIf+_KSd346-mapZ! z3>pj!LgLcmdSC)3y}p9!L8CqQd>#g61_q%OjI1jdxuFzH$%CR3_xl$yAK_sTWMB|7 z;4u&e6ENw5522nfP5U13GN>>x2#F|*Xn_fs^u`Z$mp3gs@q>qfUw}dA3M20oMiF5~ z7DjFcPDVxsRX&EI)U@KmLJSON9xPaxKY1?$Ba2WABWDYv1T1L2T|dZCc5)&sBahGn zM*atkqA(*hHG^Mq$M|rv^9W65)SJv`1P>0Ob&P!L7=_@T6WYQkx`j~^!Qag&x*M5) zkWus?GXFTE=y7EJ8Aj1F2)C0X+br7@-Pz*DbKCQBwCf>)_fsRfIGjWIWj7WME8aqtL5b4K$b z`-5{cBQLT)ICmlQ4={2bK;|D~p=1Pf0d zp-x8mPDT}&&tZv*nG2<$;}M#~s5Obv45o}nXg;ISd`3GM-`{a(jqJr#dqx(a8r2$g zm?``9g6A7O?RH>d5sKA})rC2MMd&Xh?_Wj65JooN-jzgcV*@g5@8kL zfEB+yLZYmq9I(93BP7l$&H?jhVDmH{DXBC!a0x2^fKdxpILC5z+?SMj;=#xx^oEh` z4I?isz!YD`T-lu9;={-y6etiV2=mhv@pAdrzqsGm`(pHUSS4yp!w=Z7h+322{6*ykL}u@qaoleWlRtm&3#( z*(Bt~_Dz)jFi6v6Z0^?=7Wk5CFz3L7jid4y8LQ=}2R4BiYu1TT*vj|G;7d4%$W z^289le5QOh1h12ksgscn7QmnaLb8)l7RHCs99(EE86Kfcj4YcNMG$4+PDYlU$o&0` zEc=o9M;Td;BJ)o%vYbNZpJ!w_kIcW$$aI}i2o_lUzReDwW2)P=u8gT@#PPh)q zhB}ivQ-oY2qi`c5lI%oA*@=vDun+|$W!Xu{{CSKj^AI_TMQA>w%6tSrG-#%wlFg|i zMi!y(j8fkjWnm!$D_5AgP}-6_LNge-W*}mcM`$La_)JDEnEfly@~upXSyTZphG6DR z6>k@FtP`nYVi7XtGltjfEJD8+1%5F~!<5~evheYSn+xk0S%kz5#f@ODn6c=j(WHF) zdPW|hmyAp=898Cf9C!_dJMk$!YL+*R$XS*^sF!2bzV`O=U(7_|r z%EZ*l#12#FvcR94bHlG5MjoLw-ZUXtVh`qY-J6>#&?m|xB*G^mf+&JTq(u}FJW*j$ zNu&aqPh14%WF8>{Rs(KW5x^s4AZZ|v;2E*da4z{<9oNtl&jZB=4Oz>LP?(Irxh49I18F_@B zGjcvhv?2vvGs5@Daj)ZG5h|7{mPTaoGO02oUZq^6JVLHYt_q1)CsQYjkZWX=X=Fs= zPh!-V#Ha}ibx_7Pn9pbkA5PrE$RcFRYYT63 zyp*baz`XPL9!4IauZ+@P5e?qs-)2e4F?H`_Vga|?VO1rIP(FJ;ydvXGmom>>Epvd8 zMJSptS^(zUKc8%miPRVzVB`_{!zl0v5eoZu?fNX1Iqwi7kC33apfs#Rvw}w`ML9(a79yZ3Q?-*(2NqvvJbKn1JS%vPkw?gp$&mwQzEa=% zq>_ZgxEJFQ^(*2Aw2>Hp3Dw7eF3#eJEG=)(aCU5F|w$>$F>>4AF zkTsVzAIuLs+@@Bnb9jD(gGI=K+X9}`ScKeE-7FD43KI+SLGU6tBDfK}6zvoTgsVFl zbvqedV77u51>D7k75XqyW-hQISgPj{ie-s~JCH}HPOeTBmY{tTVixdBNq)%6B2+9>4DW)o z2$ji{A@Qmds`Ox5K-IeWBt{3A(?Ge|emG8I?9Os=!KZ7NK2?O1qHx2N;zO zAoGtgDjh@SpJr4#jm*EmsB{6De}hrs2BQ)zQ!mOj&y8#Asau|wIa}q(ZTwIh~Jez@mfl;XQ_==Su*S$W) zBP}B3?9=4sbgSZ5QEYT3=AR&CcGEGz#xGTl|wLP5KK`76W&>1V30zH giX)hk2xf9_N)9gr0|OT~4>KzZCp#}22NO2~0Kha>@c;k- diff --git a/.cache/clangd/index/clients.cpp.BD74FDEF364138EC.idx b/.cache/clangd/index/clients.cpp.BD74FDEF364138EC.idx deleted file mode 100644 index 43bd2ac3bdeabb623476805fc740223710aa676b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3032 zcmWIYbaT7F&A{NC;#rZKT9U}Zz`!8Pz`#&kQj~d>k%8eGD+5EtoUK#NcHK4*Y5i){ z%I6riXo;Nqgri#mX1KoCl@VqIFLSPHCDXIjJz)YemO| zg`L+P>NRnt+;0^6Uv5${Ppi?yFy)Trmv^UX_v$sTSluYSZF%nJJKXNF!M@3#4o|X< zDeUW?XF0tnLT7WTnR>OslR3xwWwW372N=b?)SOViI#ulBS?yUypwgd$01cI zhvR36`uwlg-tXCNAR+zi>jZI!g)3t{=Vvc0c9WdD{;1Xy&7LpkESBBO>YHvUwn;r< z$Ey~Vhf}yB?wy!%^}BlcvwK(0In3I@zw&TI*0b7Z9@hxR_kKO=_Lwi?)iq^0wteCZ zw}(xS<6nH=azf?v5w_nJWm&Hi3;35+@yO&X@?IwIeErShiTju>Y(8BJzBkq6(q@hL z%hPvz_r`p)&Q_TEOZ%w!(z@vTEXQ~7q(9u{T>5LWMrXpO=1!0Mdk%W?y-BmnKCb;T zTs&6%qWqNU>=q2gmAOgrj0_AHx7U44{Q8=omqD3*RdgF(>%bOOR_`$=#%f}#a zg^~9Pqlh3Q3nMoJCnF<+5)T7IQEFQ8K6VC%Z`TiUl%1T&%E%+|fRXjC|`Dh2V}B*up5fg;5g0-_0nx8<~HQQS=}(|2U)Qab*4(M$t0}zEj8q z_amuce2hE-FBsWhFbcw4u*&No=e5VBAc;SW0)H6AVG`$*t2>(Pg84ak1kAO}_25Az zu$fV7Gov2DVY?W$b|Lc*Flrq@<{x9!I)=jEf5%|l<`B#LFY|}|np99UGMTW!4En#-yj0~`L>3b$+loD4l!ZAJl!-)MFiOMt zu)>Oi3$2La5!l4YvWZay5tus}S#~1x_cOBWN9G@8WI2k=KgGy$3YmYNk>xxx|2iYn zbw(kWM?!;U8Y_2_|7QxolzDh0V^vRxlqc;m1p@@ro=3&fJX*Q{Z#RGF~>TQ zIwlqYV?JYe!e$Zp#VGKLQ5vRf#-fu(lk)BB8F>U=GBUkn}K|jM|FjpRa|rhBagrrMy4+azv^@>+kgMh<5es?0_L3NaP>R_ zj~F>0A-nf2Bj;OWej^iSBNIHC+r3>Wtq?wWEhCS>b4JeRh^#l?V`KiNz=91-JOZ~F z#cv~Gn@8Xdqxc;Jzs=5nRcPj%jZC0u;(v)K=uv@Rcth1 z>3hcmfK^{K+T=QyW*n4^#i=lkG8)8iNBESrZnwj9e%+@EMPuwFl1%o@3+@aAb1ifT=QdK3nS&E_RKP zN5GoPnhz!ntFIZkQ0nQu|80!k7|#00#3Nv+YN!QM4f4CnOGZtY+h8;!7ql+VvNE|F zU@#}AC^aV$6cWWn$;JI3hB%0TU{G5b!eS7D(hLj?QV6C9f+>n%!b=VY1~IrOvq0zZ z6)Qikdwq&qLQ+avR7_k*SVWLP60U$j5W$o{Fq3mra<~~77&th&nAusmS=g9382}qg BNTC1# diff --git a/.cache/clangd/index/clients.hpp.05172D18DA9F7845.idx b/.cache/clangd/index/clients.hpp.05172D18DA9F7845.idx deleted file mode 100644 index c642cc2cffc1ed3c126de0c8ac7a27a612688191..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 252 zcmWIYbaVT{z`)>~;#rZKT9U}Zz`!8Pz`#&kQj{6Nz`!t#fq|i7&fL?Ed=3sg3 ze^)T8Z=dnL&CjFi??2r)i&;;1xv5QYWp0uK0|P^rmC4-zgE=`&Ow0@rz{bGEAjrT8 z;cWa+cX`vI6F+zum{}NDuQ2jnVH9CwWMSlH;ACWEU}s_|N=+*kXJBA}DP-gXOT&z1 dC`!#q1Q}Ialw8aWVzBAHzbX~;_aqMk0{{&9PJaLZ diff --git a/.cache/clangd/index/clients.hpp.55D0C4BD3B990C00.idx b/.cache/clangd/index/clients.hpp.55D0C4BD3B990C00.idx deleted file mode 100644 index 1679b90f47e8baf6f9146f3f46878b9db70fff53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 254 zcmWIYbaVU0z`)>~;#rZKT9U}Zz`!8Pz`#&kQj{6Rz`!t#fq|i7&fL=*1se=F7#xmW zJal1mV{(PZ6k*SE4|eVo+tqM2oIjS|M|s1_iY@+1C$gM6c1(-?5M+FIa`K}`k>Ycf z<_5khXp1^rX0Xq=aP9v0zhb^NNDCyITqv&0O>$shV92sExf@_GCx?lNnE?XW7`PY& z88{)FjUVbRZ(4NX2M+@?3j^y_M&7H8B5aH-jNA;IjEoHIObkV-X~p6U3=A-ZjGSO; gn6V5+sX2)tql$}?i@8AzHr@AErDFb`ksd)X`>@7Yq&2-k!XM4?Cf}B?JSgdrgR=*mz zKCFeyNp_*5t2x`k6-PF(cN-r$$jZ96*QP9XU#-yb*nJ`0E52Tmsm_^pIL4G!v@P0q zb5rUXhGx|{(i22mjyb;DDjUA~&qRl}R;=tMY}$E^oax$E6hd>@pTD$N&>7H|@g#S# zA;$}gD78K6`@i^oUDvhg+U5;=&iwvXImzz(oh@tcnq@y+Db^&%^xdv?!rGg&Y@IsA z`~vsXe+sKz5NJ5lA+`NPkW{^&q5CS64@?D{Pie36bNavg_uCJ(bholbTxE!V7!enH;fkb@C$*A z;}qqE3G?tsa7rNY)VbC95pvqx+DJTIZe2KUOTGSM1?eJV78V{gK{a8R78V{2F%1a> zPfJV-iKio`1Lu8wS;|zNe8HHJg@>1ummlWq{d&Rkjh=QpFtPB+$;infOj40nk%#dP zySz)``FgOGk%dP^UPS>W9L(vuH#b$FkA;VaU65TIW+V>}r!c1^f+xo#Cj`^N!=u8f z0{0Y5l#vT1R(H5ftyt&q{01Wn54R{c+$5NZOk60D%)=uiA_I4L&ys0(^J`w-W@O>v zl;%`~>3Lhcd)w*?^@of+Jlx#eA~4~FIo>Q@fo+diS$ITMMb%;MVd0TblYqx73y->< zx&cB?TSi+B!P8aHRf6%XHn^ z7tY)Gq3-ggMJIkR^6+T#Yl^{)D@x5t1f}reqU2(C5JLb&KrlCi0+GBR0)qJ=6axbT rGta+cHFHh)WiPPu^6?9BGw{Ks7?N{SazOgoIXRiwSh$#3895jLh}yDK diff --git a/.cache/clangd/index/main.cpp.17644C8C1E1C6067.idx b/.cache/clangd/index/main.cpp.17644C8C1E1C6067.idx deleted file mode 100644 index 400dbd3292c62b6995a9e9afbfe719cac0c19bcd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1092 zcmWIYbaS&|VPJ4h@vO*AElFfyU|RH+h##hf?FWKMP7)xHGdb#;q_!PELkhMNjbC zWSi}2c5@|Mmq=H+hFy@7$~$5Hbp7Ro&Odt}RWiNxv~8aD|Jtj$3byRRoY@z<@3CxK zqa74n5FRQSd+qMBqSub%SH4N}wsACuA79J6^0?=emJL}3Pv-r-KL5|Eea&HZJdCG& z?6~sw1iCV3IUN>v`WOH7^CS6i4EC{fSMH3A6k++wMPgu;ffpIoDsNh(BhJiz{=JOg@pr5Fu*`jYFaTL69dElRE=n(9oyKMdH6VZID}x*JbZjSd`LV= z9!WTlQ}_2T<2#2q8F~1GgoV^$HU(VU{P$n@XCX!wJ{~0=9hh)TY!mPIE?ZG1RAClA zAq^p8n4&-5W~y;y45k#r8bEjTVI4UtG((TXE(U-XPqYT6xu$nd>zp51)vzh!V^OD}h6Ex6Um8$H>Dc z#v%p}*_kbFK}Ri*{YUd*QEE;i$c@EC$;J8%3=E8X8mAB0wQtw+XBH6TXAlI*L9hUX g0+IY60)mrsQ*!ti7#O&Cc$ipNnK{{c**F-v0T17Qc>n+a From e9f8b03cd7c38b72d372c554df2f16f2bc5adaa1 Mon Sep 17 00:00:00 2001 From: willifan Date: Wed, 15 Jan 2025 18:07:16 +0100 Subject: [PATCH 7/8] made ewwbar actually independand of host filesystem --- src/main.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 194bb06..561feb5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,6 +19,15 @@ fn main() -> Result<(), Box> { // Set `RUST_LOG=debug` to see extra debug information. env_logger::init(); + let exe_path = std::env::current_exe()? + .parent() + .unwrap() + .to_str() + .unwrap() + .to_owned(); + let config_path = exe_path + "/eww"; + println!("Path: {}", config_path); + // Try to connect to the Wayland server. let conn = Connection::connect_to_env()?; @@ -72,7 +81,7 @@ fn main() -> Result<(), Box> { "--arg", "height=30", "--config", - CONFIG_DIR, + &config_path, ]) .spawn() .expect("failed to execute process"); From b500fa26a1cfd34a9fc5cf4c79950024a2811214 Mon Sep 17 00:00:00 2001 From: willifan Date: Wed, 15 Jan 2025 18:08:15 +0100 Subject: [PATCH 8/8] bump version to 0.1.2 --- Cargo.toml | 2 +- default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 79dacfe..7e9dac9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ewwbar" -version = "0.1.0" +version = "0.1.2" edition = "2021" [dependencies] diff --git a/default.nix b/default.nix index d01b345..38e69f1 100644 --- a/default.nix +++ b/default.nix @@ -2,7 +2,7 @@ pkgs.rustPlatform.buildRustPackage { pname = "ewwbar"; - version = "1.0.0"; + version = "0.1.2"; src = builtins.path { path = ./.; name = "ewwbar"; }; @@ -30,6 +30,6 @@ pkgs.rustPlatform.buildRustPackage { license = licenses.gpl3; platforms = platforms.unix; mainProgram = "ewwbar"; - }; + }; }