From e185e12d65a0576913138d11dcfb22898bf5cad1 Mon Sep 17 00:00:00 2001
From: Chris <stofflees@gmail.com>
Date: Sat, 2 Oct 2021 20:01:56 +0100
Subject: [PATCH] Update setup scripts

---
 .local/bin/setup/fixrealtek     | 11 +++++++++++
 .local/bin/setup/setup          |  1 -
 .local/bin/setup/setupkeyring   |  4 ++--
 .local/bin/setup/setupnextcloud |  2 +-
 .local/bin/setup/setupprinter   | 10 +++++-----
 5 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100755 .local/bin/setup/fixrealtek

diff --git a/.local/bin/setup/fixrealtek b/.local/bin/setup/fixrealtek
new file mode 100755
index 0000000..4db4484
--- /dev/null
+++ b/.local/bin/setup/fixrealtek
@@ -0,0 +1,11 @@
+sudo tee /etc/modprobes.d/r8169.conf <<HRD
+# Do not load the r819 realtek module to force it to use r8168 instead for
+# better reliability
+blacklist r8169
+HRD
+
+# Rebuild kernel modules
+sudo mkinitcpio -p linux
+
+echo "Please restart your computer to update kernel modules"
+
diff --git a/.local/bin/setup/setup b/.local/bin/setup/setup
index 4cd23b7..327d6d0 100755
--- a/.local/bin/setup/setup
+++ b/.local/bin/setup/setup
@@ -32,7 +32,6 @@ setupssh
 setupdev
 setupprinter
 setupwacom
-setupmaptool
 setupkeyring
 setupspotify
 setupfirefox
diff --git a/.local/bin/setup/setupkeyring b/.local/bin/setup/setupkeyring
index ed4f338..2c021bf 100755
--- a/.local/bin/setup/setupkeyring
+++ b/.local/bin/setup/setupkeyring
@@ -3,5 +3,5 @@
 echo "Setting up keyring to start at login"
 
 # Start gnome keyring at login
-doas -A sed -i '/auth       include      system-local-login/a auth       optional     pam_gnome_keyring.so' /etc/pam.d/login
-doas -A sed -i '/session    include      system-local-login/a session    optional     pam_gnome_keyring.so auto_start' /etc/pam.d/login
+sudo sed -i '/auth       include      system-local-login/a auth       optional     pam_gnome_keyring.so' /etc/pam.d/login
+sudo sed -i '/session    include      system-local-login/a session    optional     pam_gnome_keyring.so auto_start' /etc/pam.d/login
diff --git a/.local/bin/setup/setupnextcloud b/.local/bin/setup/setupnextcloud
index 9260953..c99321d 100755
--- a/.local/bin/setup/setupnextcloud
+++ b/.local/bin/setup/setupnextcloud
@@ -26,6 +26,6 @@ echo "" | xclip -selection clipboard -i
 
 dwmc toggleview 0
 
-ln -s "$HOME/Tower/Pictures/Wallpapers/Dual 4K" "$HOME/.local/share/wallpapers"
+ln -s "$HOME/Tower/Pictures/Wallpapers/7680x2160" "$HOME/.local/share/wallpapers"
 ln -s "$HOME/Tower/Resources/Fonts" "$HOME/.local/share/fonts"
 
diff --git a/.local/bin/setup/setupprinter b/.local/bin/setup/setupprinter
index b751b13..111a5cf 100755
--- a/.local/bin/setup/setupprinter
+++ b/.local/bin/setup/setupprinter
@@ -1,12 +1,12 @@
 #! /bin/bash
 
-sudo pacman --noconfirm --needed -S python-qt5 hplip nss-mdns >/dev/null 2>&1
+sudo pacman --noconfirm --needed -S python-pyqt5 hplip nss-mdns
 
-sudo sed 's/hosts: files mymachines myhostname resolve [!UNAVAIL=return] dns/hosts: files mymachines myhostname mdns_minimal [NOTFOUND=return] resolve [!UNAVAIL=return] dns'
+sudo sed -i 's/hosts: files mymachines myhostname resolve [!UNAVAIL=return] dns/hosts: files mymachines myhostname mdns_minimal [NOTFOUND=return] resolve [!UNAVAIL=return] dns/' /etc/nsswitch.conf
 
-sudo systemctl enable --now avahi daemon
+sudo systemctl enable --now avahi-daemon
 
-hp-setup -i 192.168.1.20
+# hp-setup -i 192.168.1.20
 
-lpoptions -d DeskJet_3700
+# lpoptions -d DeskJet_3700