diff options
Diffstat (limited to '')
| -rwxr-xr-x | scripts/setup-config-alpine | 3 | ||||
| -rwxr-xr-x | scripts/status-linux | 9 |
2 files changed, 3 insertions, 9 deletions
diff --git a/scripts/setup-config-alpine b/scripts/setup-config-alpine index 8ea2347..a013dcb 100755 --- a/scripts/setup-config-alpine +++ b/scripts/setup-config-alpine | |||
| @@ -62,7 +62,7 @@ doas mv "$tmp_xorg_file" /etc/X11/xorg.conf.d/40-libinput.conf | |||
| 62 | 62 | ||
| 63 | tmp_doas_file=$(mktemp) | 63 | tmp_doas_file=$(mktemp) |
| 64 | cp /etc/doas.d/20-wheel.conf "$tmp_doas_file" | 64 | cp /etc/doas.d/20-wheel.conf "$tmp_doas_file" |
| 65 | for c in poweroff reboot; do | 65 | for c in poweroff reboot ip udhcpc; do |
| 66 | printf 'permit nopass :wheel as root cmd %s\n' "$c" >> "$tmp_doas_file" | 66 | printf 'permit nopass :wheel as root cmd %s\n' "$c" >> "$tmp_doas_file" |
| 67 | done | 67 | done |
| 68 | doas cp "$tmp_doas_file" /etc/doas.d/20-wheel.conf | 68 | doas cp "$tmp_doas_file" /etc/doas.d/20-wheel.conf |
| @@ -116,6 +116,7 @@ NameResolvingService=resolvconf | |||
| 116 | EOF | 116 | EOF |
| 117 | 117 | ||
| 118 | doas mv "$tmp_iwd_file" /etc/iwd/main.conf | 118 | doas mv "$tmp_iwd_file" /etc/iwd/main.conf |
| 119 | doas cp /dev/null /etc/network/interfaces | ||
| 119 | 120 | ||
| 120 | doas rc-update add iwd boot | 121 | doas rc-update add iwd boot |
| 121 | doas rc-update del networking boot | 122 | doas rc-update del networking boot |
diff --git a/scripts/status-linux b/scripts/status-linux index a88649c..5fa4e13 100755 --- a/scripts/status-linux +++ b/scripts/status-linux | |||
| @@ -27,17 +27,10 @@ else | |||
| 27 | battery="No battery" | 27 | battery="No battery" |
| 28 | fi | 28 | fi |
| 29 | 29 | ||
| 30 | # NetworkManager has a dreadful command line interface | ||
| 31 | # It makes cry every time | ||
| 32 | # pls help | ||
| 33 | #nwline="$(nmcli device status | head -n 2 | tail -n 1)" | ||
| 34 | #nwclean="$(echo "$nwline" | sed 's/ *$//' | sed 's/.* //')" | ||
| 35 | #network="Network: $nwclean" | ||
| 36 | |||
| 37 | # Thank you iwctl for saving us from this dreadful existence | 30 | # Thank you iwctl for saving us from this dreadful existence |
| 38 | network="$(iwctl station wlan0 show | grep 'Connected network' | \ | 31 | network="$(iwctl station wlan0 show | grep 'Connected network' | \ |
| 39 | awk '{$1=$2=""; $0=$0; print}' | sed 's/^ .//')" | 32 | awk '{$1=$2=""; $0=$0; print}' | sed 's/^ .//')" |
| 40 | if [ "$(cat /sys/class/net/eth0/carrier 2>/dev/null)" = 1 ]; then | 33 | if [ "$(cat /sys/class/net/eth1/carrier 2>/dev/null)" = 1 ]; then |
| 41 | if [ -z "$network" ]; then | 34 | if [ -z "$network" ]; then |
| 42 | network="eth" | 35 | network="eth" |
| 43 | else | 36 | else |
