From 47bda308a1f1521fd8c7dea1d2c42c588ab8f68e Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 16 Apr 2023 23:11:28 -0500 Subject: [PATCH 1/5] remove connman from ajh-base --- installers/arch/ajh-base/PKGBUILD | 3 +-- installers/arch/files/aur-programs.list | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/installers/arch/ajh-base/PKGBUILD b/installers/arch/ajh-base/PKGBUILD index a0196d2..69427a1 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 From 50f6b832c68bed6aacdb0675212e9de87c4738e5 Mon Sep 17 00:00:00 2001 From: Alex Hubbard Date: Tue, 18 Apr 2023 21:15:31 -0500 Subject: [PATCH 2/5] fix swaybar --- sway-bar.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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) " } From d5998fb3de3a70cd1c88c99207877fc7759b967c Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 18 Apr 2023 23:01:01 -0500 Subject: [PATCH 3/5] add nvchad.sh install --- installers/arch/scripts/nvchad.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 installers/arch/scripts/nvchad.sh 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/ From b7d9b47c3da6c5342b77e8bd37b3a8ed481f8320 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 18 Apr 2023 23:19:12 -0500 Subject: [PATCH 4/5] add systemd-networkd config script to repo --- .../arch/files/systemd/network/basic/20-wired.network | 11 +++++++++++ .../files/systemd/network/basic/20-wireless.network | 11 +++++++++++ installers/arch/scripts/systemd-networkd.sh | 11 +++++++++++ 3 files changed, 33 insertions(+) create mode 100644 installers/arch/files/systemd/network/basic/20-wired.network create mode 100644 installers/arch/files/systemd/network/basic/20-wireless.network create mode 100644 installers/arch/scripts/systemd-networkd.sh 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/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 From 8e352fcc803e2af90b71417ce86d9ca21d5e1be5 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 18 Apr 2023 23:27:18 -0500 Subject: [PATCH 5/5] remove connman config from arch install.sh --- installers/arch/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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."