Update install script

1 files changed, 48 insertions, 30 deletions

diff --git a/setup.sh b/setup.sh
index 245ad08..c68cccb 100755
--- a/setup.sh
+++ b/setup.sh
@@ -3,40 +3,60 @@
 set -e
 
 echo "Hi noa.  Let's get things set up~"
-echo "This script assumes a debian install."
+echo "This script assumes a kde neon install."
 read -p "Press RET when you are ready to start."
 
 echo
 echo "=== SYSTEM UPDATE ==="
-sudo apt update
-sudo apt upgrade
+pkcon refresh
+pkcon update
 
 echo
-echo "=== INSTALL FONTS ==="
-sudo apt install fonts-noto-core
+echo "=== DISABLE SNAP AND APPARMOR ==="
+sudo apt remove -y plasma-discover-backend-snap
+sudo systemctl stop apparmor
+sudo systemctl disable apparmor
+sudo apt remove apparmor
 
 echo
-echo "=== FETCH CONFIGURATIONS ==="
-sudo apt install git
-git clone http://cgit.tilde.town/~noa/dots/ $HOME/.config
+echo "=== CONFIGURE PLASMA ==="
+
+## Put control at left of space bar
+## Better touchpad settings
+## Night light
+## Faster animations
+## Open krunner instead of application launcher
+## Nicer application launcher
+## Nicer task bar
+
+#echo
+#echo "=== INSTALL FONTS ==="
+#sudo apt install fonts-noto-core
+
+echo "=== SET UP CHINESE INPUT ==="
+sudo apt install -y --install-recommends --install suggests fcitx5
+sudo apt remove -y im-config
 
 echo
-echo "=== SET UP DISPLAY MANAGER ==="
-sudo apt install xdm
-sudo cp $HOME/.config/xdm/* /etc/X11/xdm/
+echo "=== INSTALL DESKTOP PROGRAMS FROM APT ==="
+sudo apt install rclone keepassxc
 
 echo
-echo "=== SET UP GUI ==="
-sudo install jwm brightnessctl picom cbatticon pnmixer nm-tray qlipper fcitx5 fcitx5-chinese-addons x11-xserver-utils
+echo "=== INSTALL DESKTOP PROGRAMS FROM FLATHUB ==="
+flatpak install flathub net.ankiweb.Anki
 
 echo
-echo "=== INSTALL DESKTOP PROGRAMS ==="
-sudo apt install rclone keepassxc firefox webext-ublock-origin-firefox webext-keepassxc-browser mpv
+echo "=== CONFIGURE FIREFOX ==="
+# copy user.js to right location
+# copy userchrome to right location
 
 echo
-echo "=== SET UP FLATPAK ==="
-# TODO---do i need this?
-read -p "Press RET to move to the next step."
+echo "=== INSTALL FIREFOX ADDONS ==="
+# - https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser/
+# - https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/
+# - https://addons.mozilla.org/en-US/firefox/addon/plasma-integration/
+# - https://addons.mozilla.org/en-US/firefox/addon/zhongwen/
+# - single tab?
 
 echo
 echo "=== FETCH FILES ==="
@@ -63,19 +83,17 @@ rclone copy fastmail:noa.gaiwan.org/files/Videos ~/Videos -P
 rclone copy fastmail:noa.gaiwan.org/files/Pictures ~/Pictures -P
 rclone copy fastmail:noa.gaiwan.org/files/Scripts ~/Scripts -P
 
-#echo
-#echo "=== INSTALL ANKI ==="
-#echo "The packaged version of anki is very old, and i'd rather not use the flatpak."
-#echo "First please run:"
-#echo "> sudo apt install libxcb-xinerama0 libxcb-cursor0 libnss3"
-#echo "Then go to https://github.com/ankitects/anki/releases/ and download the latest release."
-#echo "> tar xaf Downloads/anki-2XXX-linux-qt6.tar.zst"
-#echo "> cd anki-2XXX-linux-qt6"
-#echo "> sudo ./install.sh"
-
 echo
-echo "=== DOWNLOAD WIKIPEDIA MIRROR ==="
-echo "Go to https://ftp.halifax.rwth-aachen.de/aarddict/zhwiki/ and download the latest slob file to ~/Documents/Dictionaries."
+echo "=== CONFIGURE MAIL ==="
+echo "Now go to https://app.fastmail.com/settings/security/integrations/devicekeys/new?u=0b814011 and create a new app password with access to imap and smtp."
+read -rp "Fastmail app password: " fastmailpassword
+echo # Read with -s appears not to properly newline
+sed -i "s/!!REDACTED!!/$fastmailpassword/" ~/.config/mbsyncrc
+sed -i "s/!!REDACTED!!/$fastmailpassword/" ~/.config/msmtp/config
+
+#echo
+#echo "=== DOWNLOAD WIKIPEDIA MIRROR ==="
+#echo "Go to https://ftp.halifax.rwth-aachen.de/aarddict/zhwiki/ and download the latest slob file to ~/Documents/Dictionaries."
 
 echo
 echo "Thanks~"