From afb80c536fcf4ae8161ffad0ee813101c00b3cc5 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 16 Jun 2022 20:38:32 -0500 Subject: [PATCH] update arch install --- .config/user-dirs.dirs | 8 +- .local/installers/arch/arch-install.sh | 81 ++++--------------- .local/installers/arch/programs.sh | 6 +- .../arch/services/connman_iwd.service | 22 +++++ .local/installers/arch/services/iwd.service | 10 +++ .local/scripts/update-hosts | 14 ++-- 6 files changed, 63 insertions(+), 78 deletions(-) create mode 100644 .local/installers/arch/services/connman_iwd.service create mode 100644 .local/installers/arch/services/iwd.service diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs index c2b86bd..5149b95 100644 --- a/.config/user-dirs.dirs +++ b/.config/user-dirs.dirs @@ -8,8 +8,8 @@ XDG_DESKTOP_DIR="$HOME/.local/share/desktop" XDG_DOWNLOAD_DIR="$HOME/dl" XDG_DOCUMENTS_DIR="$HOME/docs" -XDG_MUSIC_DIR="$HOME/media/audio/music" +XDG_MUSIC_DIR="$HOME/" XDG_PICTURES_DIR="$HOME/media/img" -XDG_VIDEOS_DIR="$HOME/media/video" -XDG_TEMPLATES_DIR="$HOME/Templates" -XDG_PUBLICSHARE_DIR="$HOME/Public" +XDG_VIDEOS_DIR="$HOME/" +XDG_TEMPLATES_DIR="$HOME/" +XDG_PUBLICSHARE_DIR="$HOME/" diff --git a/.local/installers/arch/arch-install.sh b/.local/installers/arch/arch-install.sh index d656e91..c07dfee 100755 --- a/.local/installers/arch/arch-install.sh +++ b/.local/installers/arch/arch-install.sh @@ -1,6 +1,5 @@ #!/bin/sh -GIT_REPOS_DIR="$HOME/.local/src/" . ./programs.sh @@ -23,39 +22,19 @@ enable_repo() { #TODO only needed to enable multilib for arch enable_repos() { - #enable lib32 - #enable_repo lib32 mirrorlist - sudo pacman -Sy - #add arch linux repos - #sudo pacman -S --noconfirm artix-archlinux-support lib32-artix-archlinux-support - #sudo pacman-key --populate archlinux - #sudo pacman -Sy - #enable artix universe repo - #if [ -z "$(grep "universe" /etc/pacman.conf)" ]; then - # sudo sh -c 'echo "[universe]" >> /etc/pacman.conf' - # sudo sh -c 'echo "Server = https://universe.artixlinux.org/\$arch" >> /etc/pacman.conf' - # sudo sh -c 'echo "Server = https://mirror1.artixlinux.org/universe/\$arch" >> /etc/pacman.conf' - # sudo sh -c 'echo "Server = https://mirror.pascalpuffke.de/artix-universe/\$arch" >> /etc/pacman.conf' - # sudo sh -c 'echo "Server = https://artixlinux.qontinuum.space:4443/universe/os/" >> /etc/pacman.conf' - # sudo sh -c 'echo "Server = https://mirror1.cl.netactuate.com/artix/universe/\$arch" >> /etc/pacman.conf' - # sudo sh -c 'echo "" >> /etc/pacman.conf' - #fi - - - #ENABLE ARCH REPOSITORIES HERE - #enable arch community repo - #enable_repo extra mirrorlist-arch - #enable_repo community mirrorlist-arch - #enable_repo multilib mirrorlist-arch + #enable multilib + sudo sh -c "echo "[multilib]" >> /etc/pacman.conf" + sudo sh -c "echo "Include\ =\ /etc/pacman.d/mirrorlist" >> /etc/pacman.conf" + sudo sh -c "echo "" >> /etc/pacman.conf" sudo pacman -Sy - sudo pacman -S git fakeroot - #install yay for aur support + sudo pacman -S git fakeroot base-devel + mkdir -p ~/.local/src/ git clone https://aur.archlinux.org/yay.git ~/.local/src/yay/ cd ~/.local/src/yay || return @@ -64,46 +43,23 @@ enable_repos() { } -#runit_setup() { -# -# VIRTMGR="" -# WIRELESS="" -# for arg in "$@" -# do -# [ "$arg" = "--virt-manager" ] && VIRTMGR="true" -# [ "$arg" = "--wireless" ] && WIRELESS="true" -# done -# -# sudo ln -s /etc/runit/sv/ufw /run/runit/service/ -# sudo ln -s /etc/runit/sv/cronie /run/runit/service/ -# sudo ln -s /etc/runit/sv/chrony /run/runit/service/ -# sudo ln -s /etc/runit/sv/connmand /run/runit/service/ -# sudo ln -s /etc/runit/sv/socklog /run/runit/service/ -# -# if [ "$VIRTMGR" ]; then -# sudo ln -s /etc/runit/sv/libvirtd /run/runit/service -# sudo ln -s /etc/runit/sv/virtlockd /run/runit/service -# sudo ln -s /etc/runit/sv/virtlogd /run/runit/service -# fi -# -# if [ "$WIRELESS" ]; then -# sudo ln -s /etc/runit/sv/tlp /run/runit/service/ -# sudo ln -s /etc/runit/sv/bluetoothd /run/runit/service/ -# fi -#} - -systemd_setup() { +init_setup() { sudo systemctl enable connman.service sudo systemctl enable ufw.service + sudo systemctl enable cronie.service } #TODO wireless() { - sudo pacman -S --noconfirm wpa_supplicant bluez bluez-utils tlp - sudo pacman -S --noconfirm wpa_supplicant-runit tlp-runit - - #runit_setup --wireless + sudo pacman -S tlp iwd bluez bluez-utils + sudo systemctl enable tlp.service + sudo systemctl enable bluetooth.service + + sudo systemctl disable connman.service + sudo cp ./services/iwd.service /etc/systemd/system/iwd.service + sudo cp ./services/connman_iwd.service /etc/systemd/system/connman_iwd.service + sudo systemctl enable connman_iwd.service } configure() { @@ -167,8 +123,6 @@ configure() { sudo sh -c "echo '$USER hard memlock 2048' >> /etc/security/limits.conf" sudo sh -c "echo '$USER hard memlock 2048' >> /etc/security/limits.conf" - sudo groupadd nogroup #needed to use slock - #fix issue with arduino ide and tiling wms sudo sh -c 'echo "export _JAVA_AWT_WM_NONREPARENTING=1" >> /etc/profile.d/jre.sh' @@ -216,8 +170,7 @@ base() { mkdir -p "$HOME"/.local/share/rofi/ ln -s "$HOME"/.local/src/base16-rofi/themes/ "$HOME"/.local/share/rofi/themes - #runit configuration - #runit_setup + init_setup #configure programs, directories, change shell, etc configure diff --git a/.local/installers/arch/programs.sh b/.local/installers/arch/programs.sh index 0b2ee92..6037cbe 100644 --- a/.local/installers/arch/programs.sh +++ b/.local/installers/arch/programs.sh @@ -24,9 +24,9 @@ ungoogled_chromium() { [ "$1" = "-R" ] && CMD=" -Rs " - sudo pacman "$CMD" ffmpeg4.4 - sudo pacman "$CMD" ungoogled-chromium - sudo pacman "$CMD" ublock-origin + #sudo pacman "$CMD" ffmpeg4.4 + sudo pacman "$CMD" aur/ungoogled-chromium-binary + sudo pacman "$CMD" aur/chromium-ublock-origin yay "$CMD" aur/chromium-extension-web-store yay "$CMD" aur/chromium-widevine diff --git a/.local/installers/arch/services/connman_iwd.service b/.local/installers/arch/services/connman_iwd.service new file mode 100644 index 0000000..20e9cbc --- /dev/null +++ b/.local/installers/arch/services/connman_iwd.service @@ -0,0 +1,22 @@ +[Unit] +Description=Connection service +DefaultDependencies=false +Conflicts=shutdown.target +RequiresMountsFor=/var/lib/connman +After=dbus.service network-pre.target systemd-sysusers.service iwd.service +Before=network.target multi-user.target shutdown.target +Wants=network.target +Requires=iwd.service + +[Service] +Type=dbus +BusName=net.connman +Restart=on-failure +ExecStart=/usr/bin/connmand --wifi=iwd_agent -n +StandardOutput=null +CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW CAP_SYS_TIME CAP_SYS_MODULE +ProtectHome=true +ProtectSystem=true + +[Install] +WantedBy=multi-user.target diff --git a/.local/installers/arch/services/iwd.service b/.local/installers/arch/services/iwd.service new file mode 100644 index 0000000..1a029c2 --- /dev/null +++ b/.local/installers/arch/services/iwd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Internet Wireless Daemon (IWD) +Before=network.target +Wants=network.target + +[Service] +ExecStart=/usr/lib/iwd/iwd + +[Install] +Alias=multi-user.target.wants/iwd.service diff --git a/.local/scripts/update-hosts b/.local/scripts/update-hosts index a69681a..17a9ba9 100755 --- a/.local/scripts/update-hosts +++ b/.local/scripts/update-hosts @@ -26,15 +26,15 @@ update() { fi - curl https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/porn/hosts -o ./.sb_hosts + #curl https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/porn/hosts -o ./.sb_hosts - [ -f "$BLOCKFILE" ] && echo "blocklist file found." && sed 's/^/127.0.0.1 /g' "$BLOCKFILE" > ./blocklist + #[ -f "$BLOCKFILE" ] && echo "blocklist file found." && sed 's/^/127.0.0.1 /g' "$BLOCKFILE" > ./blocklist - if [ -f "./blocklist" ]; then - cat ./.hosts.orig ./.swc_hosts ./.sb_hosts ./blocklist > ./hosts - else - cat ./.hosts.orig ./.swc_hosts ./.sb_hosts > ./hosts - fi + #if [ -f "./blocklist" ]; then + # cat ./.hosts.orig ./.swc_hosts ./.sb_hosts ./blocklist > ./hosts + #else + cat ./.hosts.orig ./.swc_hosts > ./hosts + #fi #cat ./.hosts.orig ./.swc_hosts > ./hosts