deb_bugger.sh

@@ -7,8 +7,8 @@ apt-get update
 
 # Networking & Firewall
 apt-get -y install network-manager netcat-openbsd rsync curl wget \
-        avahi-daemon net-tools ufw whois network-manager-openvpn sipcalc \
+        avahi-daemon net-tools ufw whois ifupdown- connman- cmst- \
-        ifupdown- connman- cmst- netcat-traditional-
+        netcat-traditional-
 
 if [ -w /etc/network/interfaces ]; then
     mv /etc/network/interfaces /etc/network/interfaces.OLD
@@ -36,14 +36,6 @@ until nc -w 5 -z mirror.swagg.net 80; do
     sleep 5
 done
 
-# NTP
-cat >> /etc/systemd/timesyncd.conf <<'EOF'
-NTP=pfswagg.swaggnet.real swaggcore0.swaggnet.real
-FallbackNTP=time-a-g.nist.gov time-b-g.nist.gov time-c-g.nist.gov time-d-g.nist.gov time-e-g.nist.gov
-EOF
-
-systemctl restart systemd-timesyncd
-
 # Shared drives
 if grep -q 'swaggnet\.real' /etc/resolv.conf; then
     apt-get -y install cifs-utils smbclient autofs
@@ -82,7 +74,7 @@ apt-get -y install git libsecret-1-0 libsecret-1-dev build-essential vim \
         elpa-dockerfile-mode elpa-web-mode elpa-yaml-mode docker-compose-
 
 # Need this for rootless podman
-if grep -q '^daniel:' /etc/shadow; then
+if grep -q '^daniel' /etc/shadow; then
     loginctl enable-linger daniel
 fi
 
@@ -98,49 +90,42 @@ if [ -d /var/log/journal ]; then
 fi
 
 # Firmware (if available)
-if apt-get -s install firmware-linux-nonfree > /dev/null 2>&1; then
+if apt-get -s install firmware-linux-nonfree 2>&1 > /dev/null; then
     apt-get -y install firmware-linux-nonfree
 fi
 
 # Various things
 apt-get -y install unifont bsdgames fortune-mod fortunes-bofh-excuses      \
         fortunes-mario fortunes fortunes-min neofetch screen beep apt-file \
-        htop iftop lm-sensors gcal pinentry-curses
+        htop iftop lm-sensors
 
 apt-file update
 
 # systemd cope
 perl -i.bak -pe 's/^#// if /Timeout/ && /\ds$/' /etc/systemd/system.conf
 
-# fwupd
-apt-get -y install udisks2 fwupd
-
-# Set locale for date/time display
-localectl set-locale LC_TIME='en_GB.UTF-8'
-
 # Stop here if there's no graphical UI
 if [ "$(systemctl is-active display-manager)" = 'inactive' ]; then
     apt-get -y autoremove
     exit
 fi
 
-# User-specific DESKTOP stuff
+# fwupd
-if who -u | grep '\(:0\)' | grep -q '^daniel'; then
+apt-get -y install udisks2 fwupd
-    # PipeWire
-    apt-get -y install wireplumber libspa-0.2-bluetooth \
-            pipewire-media-session- pulseaudio-
-    apt-mark hold pulseaudio
-    systemctl --user -M daniel@ enable wireplumber.service
 
-    # Flatpak
+# PipeWire
-    apt-get -y install flatpak
+apt-get -y install wireplumber libspa-0.2-bluetooth pipewire-media-session-
-    su daniel -c 'flatpak --user remote-add --if-not-exists flathub \
+
-            "https://flathub.org/repo/flathub.flatpakrepo"'
+if grep -q '^daniel' /etc/shadow; then
-    su daniel -c 'flatpak -y install com.slack.Slack im.riot.Riot \
+    systemctl --user -M daniel@ enable wireplumber.service
-            com.discordapp.Discord com.sindresorhus.Caprine       \
-            com.bitwarden.desktop'
 fi
 
+# Flatpak
+apt-get -y install flatpak
+
+flatpak remote-add --if-not-exists flathub \
+        'https://flathub.org/repo/flathub.flatpakrepo'
+
 # Various DESKTOP things
 apt-get -y install lxqt-archiver caffeine picom vlc thunderbird redshift   \
         kitty libopengl-xscreensaver-perl xscreensaver-data-extra          \
@@ -150,18 +135,8 @@ apt-get -y install lxqt-archiver caffeine picom vlc thunderbird redshift   \
         transmission-qt liblxqt-backlight-helper xserver-xorg-video-intel- \
         openbox obconf-qt menu xfwm4-
 
-# Steam (if available)
+flatpak -y install com.bitwarden.desktop com.discordapp.Discord \
-(cd /tmp
+        com.sindresorhus.Caprine com.slack.Slack im.riot.Riot
- # I can't do a simulated install due to the multilib requirement
- if apt-get download steam-installer > /dev/null 2>&1; then
-     dpkg --add-architecture i386
-     apt-get update
-     apt-file update
-
-     apt-get -y install steam-installer
-
-     rm ./steam-installer*.deb
- fi)
 
 # Laptop stuff
 if ! command -v laptop-detect > /dev/null 2>&1; then
@@ -172,5 +147,18 @@ if laptop-detect; then
     apt-get -y install tlp modemmanager modem-manager-gui powertop-
 fi
 
+# Steam (if available)
+(cd /tmp
+ # I can't do a simulated install due to the multilib requirement
+ if apt-get download steam-installer 2>&1 > /dev/null; then
+     dpkg --add-architecture i386
+     apt-get update
+     apt-file update
+
+     apt-get -y install steam-installer
+
+     rm ./steam-installer*.deb
+ fi)
+
 # Clean up before exiting
 apt-get -y autoremove

deb_linode.sh

@@ -6,9 +6,8 @@ set -e
 apt-get update
 
 # Networking & Firewall
-apt-get -y install network-manager netcat-openbsd rsync curl wget ufw \
+apt-get -y install network-manager netcat-openbsd rsync curl wget \
-        whois net-tools network-manager-openvpn sipcalc ifupdown- connman- \
+        net-tools ufw whois ifupdown- connman- cmst- netcat-traditional-
-        cmst- netcat-traditional-
 
 if [ -w /etc/network/interfaces ]; then
     mv /etc/network/interfaces /etc/network/interfaces.OLD
@@ -24,7 +23,7 @@ ufw limit ssh
 ufw --force enable
 
 # Disallow root login via ssh
-echo 'PermitRootLogin no' > /etc/ssh/sshd_config.d/permit_root_login.conf
+echo 'PermitRootLogin no' > /etc/ssh/sshd_config.d/permit_root_login
 systemctl restart sshd
 
 # Make sure NetworkMangler is doing its thing
@@ -56,9 +55,6 @@ fi
 # Various things
 apt-get -y install unifont bsdgames fortune-mod fortunes-bofh-excuses      \
         fortunes-mario fortunes fortunes-min neofetch screen apt-file \
-        htop iftop gcal pinentry-curses
+        htop iftop
 
 apt-file update
-
-# Set locale for date/time display
-localectl set-locale LC_TIME='en_GB.UTF-8'