cleanup, and atomicity

5 files changed, 4 insertions, 23 deletions

diff --git a/.gitmodules b/.gitmodules
index bdc752b..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "Projects/aur.archlinux.org/paru"]
-	path = Projects/aur.archlinux.org/paru
-	url = https://aur.archlinux.org/paru.git
diff --git a/Projects/aur.archlinux.org/paru b/Projects/aur.archlinux.org/paru
deleted file mode 160000
-Subproject 329be2113c590046cb29858c23d9b96a8d7bd58
diff --git a/etc.bash b/etc.bash
index 4bbf093..9e5a253 100755
--- a/etc.bash
+++ b/etc.bash
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 sudo cp -v ./etc/keyd/keyd.conf /etc/keyd/
-sudo cp -v ./etc/fail2ban/jail.d/sshd.conf /etc/fail2ban/jail.d/
 sudo cp -v ./etc/pacman.conf /etc/
 sudo cp -v ./etc/kernel/cmdline /etc/kernel/
 sudo cp -v ./etc/modprobe.d/blacklist-security.conf /etc/modprobe.d/
@@ -27,7 +26,7 @@ sudo ufw enable
 sudo systemctl enable --now ufw
 
 # fail2ban
-sudo cp ./etc/fail2ban/sshd.local /etc/fail2ban
+sudo cp -v ./etc/fail2ban/jail.d/sshd.conf /etc/fail2ban/jail.d/
 sudo systemctl enable --now fail2ban
 
 # fs trim
diff --git a/packages.bash b/packages.bash
index b7dbee0..4e00663 100755
--- a/packages.bash
+++ b/packages.bash
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-pacman -S --needed base-devel git
+sudo pacman -S --needed base-devel git
 pushd aur.archlinux.org/paru
 git pull
-makepkg -si
+paru --version >/dev/null || makepkg -si
 popd
-paru -S $(<all)
+paru -S --needed $(<all)
 
 sudo reflector --country 'Austria' --latest 10 --sort rate --save /etc/pacman.d/mirrorlist
 sudo systemctl enable --now reflector.timer
diff --git a/update.bash b/update.bash
deleted file mode 100755
index 68afa5c..0000000
--- a/update.bash
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-paru -S $(<all)
-
-sudo reflector --country 'Austria' --latest 10 --sort rate --save /etc/pacman.d/mirrorlist
-sudo systemctl enable --now reflector.timer
-
-paru -Rns $(paru -Qqdt)
-sudo systemctl enable paccache.timer
-
-./dotfiles.bash
-
-./etc.bash
-
-./sysctl.bash