fix some things

This commit is contained in:
swagg boi 2023-09-11 18:32:52 -04:00
parent 569bc59db6
commit dbce421b3d
2 changed files with 30 additions and 29 deletions

View file

@ -105,35 +105,38 @@ 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
htop iftop lm-sensors gcal
apt-file update
# systemd cope
perl -i.bak -pe 's/^#// if /Timeout/ && /\ds$/' /etc/systemd/system.conf
# fwupd
apt-get -y install udisks2 fwupd
# Stop here if there's no graphical UI
if [ "$(systemctl is-active display-manager)" = 'inactive' ]; then
apt-get -y autoremove
exit
fi
# fwupd
apt-get -y install udisks2 fwupd
# PipeWire
apt-get -y install wireplumber libspa-0.2-bluetooth pipewire-media-session-
# User-specific DESKTOP stuff
if grep -q '^daniel' /etc/shadow; then
# PipeWire
apt-get -y install wireplumber libspa-0.2-bluetooth \
pipewire-media-session-
systemctl --user -M daniel@ enable wireplumber.service
# Flatpak
apt-get -y install flatpak
su daniel -c 'flatpak --user remote-add --if-not-exists flathub \
"https://flathub.org/repo/flathub.flatpakrepo"'
su daniel -c 'flatpak -y --user install com.slack.Slack im.riot.Riot \
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 \
@ -143,18 +146,6 @@ 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-
flatpak -y install com.bitwarden.desktop com.discordapp.Discord \
com.sindresorhus.Caprine com.slack.Slack im.riot.Riot
# Laptop stuff
if ! command -v laptop-detect > /dev/null 2>&1; then
apt-get -y install laptop-detect
fi
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
@ -168,5 +159,14 @@ fi
rm ./steam-installer*.deb
fi)
# Laptop stuff
if ! command -v laptop-detect > /dev/null 2>&1; then
apt-get -y install laptop-detect
fi
if laptop-detect; then
apt-get -y install tlp modemmanager modem-manager-gui powertop-
fi
# Clean up before exiting
apt-get -y autoremove

View file

@ -6,8 +6,9 @@ set -e
apt-get update
# Networking & Firewall
apt-get -y install network-manager netcat-openbsd rsync curl wget \
net-tools ufw whois ifupdown- connman- cmst- netcat-traditional-
apt-get -y install network-manager netcat-openbsd rsync curl wget ufw \
whois net-tools network-manager-openvpn sipcalc ifupdown- connman- \
cmst- netcat-traditional-
if [ -w /etc/network/interfaces ]; then
mv /etc/network/interfaces /etc/network/interfaces.OLD
@ -23,7 +24,7 @@ ufw limit ssh
ufw --force enable
# Disallow root login via ssh
echo 'PermitRootLogin no' > /etc/ssh/sshd_config.d/permit_root_login
echo 'PermitRootLogin no' > /etc/ssh/sshd_config.d/permit_root_login.conf
systemctl restart sshd
# Make sure NetworkMangler is doing its thing
@ -55,6 +56,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
htop iftop gcal
apt-file update