diff --git a/installers/arch/ajh-base/PKGBUILD b/installers/arch/ajh-base/PKGBUILD index 7410a38..85df1f0 100644 --- a/installers/arch/ajh-base/PKGBUILD +++ b/installers/arch/ajh-base/PKGBUILD @@ -1,7 +1,7 @@ pkgname="ajh-base" pkgver="1.0.0" pkgver="1" -pkgrel="9" +pkgrel="10" pkgdesc="Install my config for Arch based systems." arch=("any") @@ -20,7 +20,6 @@ depends=( "fuse" "mesa" "libva-mesa-driver" -"connman" "brightnessctl" "cifs-utils" diff --git a/installers/arch/files/aur-programs.list b/installers/arch/files/aur-programs.list index 7f8b0ca..8476746 100644 --- a/installers/arch/files/aur-programs.list +++ b/installers/arch/files/aur-programs.list @@ -8,7 +8,6 @@ sysrq-enabler wlr-randr sfeed ani-cli-git -connman-gtk lf-sixel-git autotiling shellcheck-bin diff --git a/installers/arch/files/systemd/network/basic/20-wired.network b/installers/arch/files/systemd/network/basic/20-wired.network new file mode 100644 index 0000000..4cfdb17 --- /dev/null +++ b/installers/arch/files/systemd/network/basic/20-wired.network @@ -0,0 +1,11 @@ +[Match] +Name=enp3s0 + +[Network] +DHCP=yes + +[DHCPv4] +RouteMetric=10 + +[IPv6AcceptRA] +RouteMetric=10 diff --git a/installers/arch/files/systemd/network/basic/20-wireless.network b/installers/arch/files/systemd/network/basic/20-wireless.network new file mode 100644 index 0000000..e24cee0 --- /dev/null +++ b/installers/arch/files/systemd/network/basic/20-wireless.network @@ -0,0 +1,11 @@ +[Match] +Name=wlan0 + +[Network] +DHCP=yes + +[DHCPv4] +RouteMetric=20 + +[IPv6AcceptRA] +RouteMetric=20 diff --git a/installers/arch/install.sh b/installers/arch/install.sh index 0cc29ec..54706ac 100755 --- a/installers/arch/install.sh +++ b/installers/arch/install.sh @@ -28,7 +28,7 @@ wireless() { sudo systemctl enable tlp.service sudo systemctl enable bluetooth.service - sudo systemctl enable connman.service + #sudo systemctl enable connman.service sudo systemctl enable iwd.service echo "Done installing wireless programs." diff --git a/installers/arch/scripts/nvchad.sh b/installers/arch/scripts/nvchad.sh new file mode 100644 index 0000000..ee0277a --- /dev/null +++ b/installers/arch/scripts/nvchad.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +sudo pacman -S npm cargo + +rm -rf ~/.config/nvim/ +rm -rf ~/.local/share/nvim/ +mkdir ~/.config/nvim + +git clone https://github.com/NvChad/NvChad ~/.config/nvim --depth 1 + +rm -rf ~/.config/nvim/lua/custom/ +ln -s ~/.config/nvchad/custom/ ~/.config/nvim/lua/ diff --git a/installers/arch/scripts/systemd-networkd.sh b/installers/arch/scripts/systemd-networkd.sh new file mode 100644 index 0000000..b8acdff --- /dev/null +++ b/installers/arch/scripts/systemd-networkd.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +echo "copying default systemd-networkd config files located in: " +echo " ../files/systemd/network/basic/ to: /etc/systemd/network/" +echo " modify these files if there is no internet connectivity." +echo " see available network devices (Name=*) with: ls /sys/class/net/" + +sudo cp ../files/systemd/network/basic/* /etc/systemd/network/ + +sudo systemctl enable --now systemd-networkd.service +sudo systemctl enable --now systemd-resolved.service diff --git a/sway-bar.sh b/sway-bar.sh index 83cee11..e52c3f4 100755 --- a/sway-bar.sh +++ b/sway-bar.sh @@ -22,6 +22,8 @@ MAIL_DIR="$HOME/.local/share/mail" SEP=" | " +BATTERY_DEV="$(ls /sys/class/power_supply | grep -v AC)" + ddate () { printf " %s\n" "$(date "+%b %d, %Y ( %I:%M )")" #(%a) } @@ -100,7 +102,7 @@ cputemp() { battery() { #BATT_DIR="/sys/class/power_supply/BAT0" - BATT_DIR="/sys/class/power_supply/cw2015-battery" + BATT_DIR="/sys/class/power_supply/$BATTERY_DEV" if [ -d "$BATT_DIR" ]; then status="$(cat "$BATT_DIR"/status)" charge="$(cat "$BATT_DIR"/capacity)" @@ -123,7 +125,7 @@ crypto() { } update() { - echo " $SEP$(battery)$SEP$(netup)$SEP$(audio)$SEP$(rss)$SEP$(weather)$SEP$(ddate) " + echo " $SEP$(battery)$SEP$(cputemp)$SEP$(netup)$SEP$(audio)$SEP$(rss)$SEP$(weather)$SEP$(ddate) " }