From aa4217eb0494036f2f0c02de90a73d6cebb128c4 Mon Sep 17 00:00:00 2001
From: Rasmus Lauritsen <rasmus@lauritsen.info>
Date: Mon, 17 Jun 2024 20:53:07 +0200
Subject: [PATCH] Cleaned up scripts

---
 install.sh                         |   7 ++
 install/app-crossftp.sh            |   5 --
 install/app-flatpak-app.sh         |   3 -
 install/app-flatpak-bitwarden.sh   |   1 -
 install/app-flatpak-deluge.sh      |   1 -
 install/app-flatpak-discord.sh     |   1 -
 install/app-flatpak-obsidian.sh    |   1 -
 install/app-flatpak-prusaslicer.sh |   1 -
 install/app-flatpak-remmina.sh     |   1 -
 install/app-flatpak-steam.sh       |   1 -
 install/app-flatpak-vlc.sh         |   1 -
 install/app-flatpak-waterfox.sh    |   1 -
 install/app-helm.sh                |  10 ---
 install/app-teamviewer.sh          |  10 ---
 install/app-unrarall.sh            |   6 --
 install/app-vscode.sh              |  10 ---
 omakub-custom.sh                   | 101 +++++++++++++++++++++++------
 readme.md                          |   8 +++
 set-dock.sh                        |  42 ++++++++++++
 19 files changed, 137 insertions(+), 74 deletions(-)
 create mode 100644 install.sh
 delete mode 100755 install/app-crossftp.sh
 delete mode 100755 install/app-flatpak-app.sh
 delete mode 100644 install/app-flatpak-bitwarden.sh
 delete mode 100644 install/app-flatpak-deluge.sh
 delete mode 100644 install/app-flatpak-discord.sh
 delete mode 100644 install/app-flatpak-obsidian.sh
 delete mode 100644 install/app-flatpak-prusaslicer.sh
 delete mode 100644 install/app-flatpak-remmina.sh
 delete mode 100644 install/app-flatpak-steam.sh
 delete mode 100644 install/app-flatpak-vlc.sh
 delete mode 100644 install/app-flatpak-waterfox.sh
 delete mode 100755 install/app-helm.sh
 delete mode 100755 install/app-teamviewer.sh
 delete mode 100644 install/app-unrarall.sh
 delete mode 100755 install/app-vscode.sh
 create mode 100644 readme.md
 create mode 100644 set-dock.sh

diff --git a/install.sh b/install.sh
new file mode 100644
index 0000000..6b7576e
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,7 @@
+echo "Installing git..."
+sudo apt-get update > /dev/null
+sudo apt-get install -y git > /dev/null
+
+echo "Cloning stable omakub-custom..."
+git clone https://git.cbo.dk/rasmus/omakub-custom.git ~/.local/share/omakub-custom > /dev/null
+source ~/.local/share/omakub-custom/omakub-custom.sh
\ No newline at end of file
diff --git a/install/app-crossftp.sh b/install/app-crossftp.sh
deleted file mode 100755
index 0dc4edd..0000000
--- a/install/app-crossftp.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-cd /tmp
-wget https://www.crossftp.com/crossftp_1.99.9.deb
-sudo apt install -y ./crossftp_1.99.9.deb
-rm crossftp_1.99.9.deb
-cd -
\ No newline at end of file
diff --git a/install/app-flatpak-app.sh b/install/app-flatpak-app.sh
deleted file mode 100755
index 9cdd75b..0000000
--- a/install/app-flatpak-app.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-sudo apt install -y flatpak
-sudo apt install -y gnome-software-plugin-flatpak
-sudo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
\ No newline at end of file
diff --git a/install/app-flatpak-bitwarden.sh b/install/app-flatpak-bitwarden.sh
deleted file mode 100644
index 87dc95f..0000000
--- a/install/app-flatpak-bitwarden.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo flatpak install -y com.bitwarden.desktop
\ No newline at end of file
diff --git a/install/app-flatpak-deluge.sh b/install/app-flatpak-deluge.sh
deleted file mode 100644
index e5815ff..0000000
--- a/install/app-flatpak-deluge.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo flatpak install -y org.deluge_torrent.deluge
\ No newline at end of file
diff --git a/install/app-flatpak-discord.sh b/install/app-flatpak-discord.sh
deleted file mode 100644
index 60c7115..0000000
--- a/install/app-flatpak-discord.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo flatpak install -y com.discordapp.Discord
\ No newline at end of file
diff --git a/install/app-flatpak-obsidian.sh b/install/app-flatpak-obsidian.sh
deleted file mode 100644
index 513c4bd..0000000
--- a/install/app-flatpak-obsidian.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo flatpak install -y md.obsidian.Obsidian
\ No newline at end of file
diff --git a/install/app-flatpak-prusaslicer.sh b/install/app-flatpak-prusaslicer.sh
deleted file mode 100644
index ad0d2c1..0000000
--- a/install/app-flatpak-prusaslicer.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo flatpak install -y com.prusa3d.PrusaSlicer
\ No newline at end of file
diff --git a/install/app-flatpak-remmina.sh b/install/app-flatpak-remmina.sh
deleted file mode 100644
index c737439..0000000
--- a/install/app-flatpak-remmina.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo flatpak install -y org.remmina.Remmina
\ No newline at end of file
diff --git a/install/app-flatpak-steam.sh b/install/app-flatpak-steam.sh
deleted file mode 100644
index 0cd91b9..0000000
--- a/install/app-flatpak-steam.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo flatpak install -y com.valvesoftware.Steam
\ No newline at end of file
diff --git a/install/app-flatpak-vlc.sh b/install/app-flatpak-vlc.sh
deleted file mode 100644
index 351faaa..0000000
--- a/install/app-flatpak-vlc.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo flatpak install -y org.videolan.VLC
\ No newline at end of file
diff --git a/install/app-flatpak-waterfox.sh b/install/app-flatpak-waterfox.sh
deleted file mode 100644
index 0571eec..0000000
--- a/install/app-flatpak-waterfox.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo flatpak install -y net.waterfox.waterfox
\ No newline at end of file
diff --git a/install/app-helm.sh b/install/app-helm.sh
deleted file mode 100755
index f94dc30..0000000
--- a/install/app-helm.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-sudo install -m 0755 -d /etc/apt/keyrings
-sudo apt-get install -y apt-transport-https wget gpg > /dev/null
-
-wget -qO- https://baltocdn.com/helm/signing.asc | gpg --dearmor > packages.helm.gpg
-sudo install -D -o root -g root -m 644 packages.helm.gpg /etc/apt/keyrings/packages.helm.gpg
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/packages.helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" | sudo tee /etc/apt/sources.list.d/helm.list > /dev/null
-rm -f packages.helm.gpg
-
-sudo apt update
-sudo apt install -y helm
\ No newline at end of file
diff --git a/install/app-teamviewer.sh b/install/app-teamviewer.sh
deleted file mode 100755
index 838ebfd..0000000
--- a/install/app-teamviewer.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-sudo install -m 0755 -d /etc/apt/keyrings
-sudo apt-get install -y apt-transport-https wget gpg > /dev/null
-
-wget -qO- https://download.teamviewer.com/download/linux/signature/TeamViewer2017.asc | gpg --dearmor > packages.teamviewer.gpg
-sudo install -D -o root -g root -m 644 packages.teamviewer.gpg /etc/apt/keyrings/packages.teamviewer.gpg
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/packages.teamviewer.gpg] http://linux.teamviewer.com/deb stable main" | sudo tee /etc/apt/sources.list.d/teamviewer.list > /dev/null
-rm -f packages.teamviewer.gpg
-
-sudo apt update
-sudo apt install -y teamviewer
\ No newline at end of file
diff --git a/install/app-unrarall.sh b/install/app-unrarall.sh
deleted file mode 100644
index 3c7fa13..0000000
--- a/install/app-unrarall.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-cd /tmp
-wget -O unrarall https://raw.githubusercontent.com/arfoll/unrarall/master/unrarall
-sudo chmod 0777 unrarall
-sudo chown root:root unrarall
-sudo mv unrarall /usr/bin/unrarall
-cd -
\ No newline at end of file
diff --git a/install/app-vscode.sh b/install/app-vscode.sh
deleted file mode 100755
index 0cd9a07..0000000
--- a/install/app-vscode.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-sudo install -m 0755 -d /etc/apt/keyrings
-
-sudo apt-get install -y apt-transport-https wget gpg > /dev/null
-wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg
-sudo install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg
-echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" |sudo tee /etc/apt/sources.list.d/vscode.list > /dev/null
-rm -f packages.microsoft.gpg
-
-sudo apt update
-sudo apt install -y code
\ No newline at end of file
diff --git a/omakub-custom.sh b/omakub-custom.sh
index 4d4fcf4..ad6bb86 100755
--- a/omakub-custom.sh
+++ b/omakub-custom.sh
@@ -1,7 +1,27 @@
 # Install Omakube dev-version (main branch)
+echo "Installing Omakub"
 wget -qO- https://omakub.org/install-dev | bash
 
+echo "Removing things I don't want or need.."
+# Remove Web-shortcuts from Omakub
+rm ~/.local/share/applications/Basecamp.desktop
+rm ~/.local/share/applications/HEY.desktop
+rm ~/.local/share/applications/WhatsApp.desktop
+
+# Remove Apps from Omakub
+sudo apt remove --purge -y signal-desktop
+sudo apt remove -y spotify-client
+sudo apt remove -y zoom
+
+# 1Password
+sudo rm /etc/apt/sources.list.d/1password.list
+sudo rm /usr/share/keyrings/1password-archive-keyring.gpg
+sudo rm /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg
+sudo rm -r /etc/debsig/policies/AC2D62742012EA22/
+sudo apt-get remove --purge -y 1password 1password-cli
+
 # Install VSCode extensions
+echo "Install more VSCode extensions.."
 code --install-extension esbenp.prettier-vscode
 code --install-extension golang.go
 code --install-extension ms-azuretools.vscode-docker
@@ -26,37 +46,76 @@ code --install-extension redhat.vscode-yaml
 code --install-extension vscjava.vscode-java-debug
 
 # Install missings apps
+echo "Installing a few more applications from apt..."
 sudo apt install -y apt-transport-https ca-certificates cifs-utils cksfv curl dirmgr gnupg mc nano pipx python3 sshpass unrar unzip wget
 sudo apt install -y doublecmd-common
 sudo apt install -y mc
 sudo apt install -y nextcloud-desktop
+sudo apt install -y notepadqq
+sudo apt install -y openscad
+sudo apt install -y rpi-imager
 sudo apt install -y solaar
+
+echo "Installing applications from Snap..."
 sudo snap install kubectl --classic
 sudo snap install slack
 
-# Overvej:
-#Raspberry Pi Imager
-#OpenSCAD
-#Microsoft Edge
-#Notepadqq
+# Flatpak and flathub repo
+sudo apt install -y flatpak gnome-software-plugin-flatpak
+sudo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 
+# Flatpak applications
+sudo flatpak install -y com.bitwarden.desktop
+sudo flatpak install -y com.discordapp.Discord
+sudo flatpak install -y com.prusa3d.PrusaSlicer
+sudo flatpak install -y com.valvesoftware.Steam
+sudo flatpak install -y md.obsidian.Obsidian
+sudo flatpak install -y net.waterfox.waterfox
+sudo flatpak install -y org.deluge_torrent.deluge
+sudo flatpak install -y org.remmina.Remmina
+sudo flatpak install -y org.videolan.VLC
 
-# Install games
+# Helm
+sudo install -m 0755 -d /etc/apt/keyrings
+sudo apt-get install -y apt-transport-https wget gpg > /dev/null
+wget -qO- https://baltocdn.com/helm/signing.asc | gpg --dearmor > packages.helm.gpg
+sudo install -D -o root -g root -m 644 packages.helm.gpg /etc/apt/keyrings/packages.helm.gpg
+echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/packages.helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" | sudo tee /etc/apt/sources.list.d/helm.list > /dev/null
+rm -f packages.helm.gpg
+sudo apt update
+sudo apt install -y helm
+
+# Teamviewer
+sudo install -m 0755 -d /etc/apt/keyrings
+sudo apt-get install -y apt-transport-https wget gpg > /dev/null
+wget -qO- https://download.teamviewer.com/download/linux/signature/TeamViewer2017.asc | gpg --dearmor > packages.teamviewer.gpg
+sudo install -D -o root -g root -m 644 packages.teamviewer.gpg /etc/apt/keyrings/packages.teamviewer.gpg
+echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/packages.teamviewer.gpg] http://linux.teamviewer.com/deb stable main" | sudo tee /etc/apt/sources.list.d/teamviewer.list > /dev/null
+rm -f packages.teamviewer.gpg
+sudo apt update
+sudo apt install -y teamviewer
+
+# Unrarall
+wget -O unrarall https://raw.githubusercontent.com/arfoll/unrarall/master/unrarall
+sudo chmod 0777 unrarall
+sudo chown root:root unrarall
+sudo mv unrarall /usr/bin/unrarall
+
+# VSCode
+sudo install -m 0755 -d /etc/apt/keyrings
+sudo apt-get install -y apt-transport-https wget gpg > /dev/null
+wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg
+sudo install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg
+echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" |sudo tee /etc/apt/sources.list.d/vscode.list > /dev/null
+rm -f packages.microsoft.gpg
+sudo apt update
+sudo apt install -y code
+
+# OpenRA - Red Alert Engine
 sudo snap install openra
 
-# Remove Web-shortcuts from Omakub
-rm ~/.local/share/applications/Basecamp.desktop
-rm ~/.local/share/applications/HEY.desktop
-rm ~/.local/share/applications/WhatsApp.desktop
+# CrossFTP
+wget -O /tmp/crossftp.deb https://www.crossftp.com/crossftp_1.99.9.deb && sudo apt install -y /tmp/crossftp.deb && rm /tmp/crossftp.deb
 
-# Remove Apps from Omakub
-sudo apt remove --purge -y signal-desktop
-sudo apt remove -y spotify-client
-sudo apt remove -y zoom
-
-# 1Password
-sudo rm /etc/apt/sources.list.d/1password.list
-sudo rm /usr/share/keyrings/1password-archive-keyring.gpg
-sudo rm /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg
-sudo rm -r /etc/debsig/policies/AC2D62742012EA22/
-sudo apt-get remove --purge -y 1password 1password-cli
+# Set favorite apps
+source set-dock.sh
\ No newline at end of file
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..22d67c4
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,8 @@
+# Omakub-custom
+Turn a fresh Ubuntu installation into a fully configured desktop by running a single command.
+It will install Omakub (dev), remove a few things I don't want and then install a bunch of other things I need.
+
+Getting starting is simple - just run:
+```bash
+wget -qO- https://git.cbo.dk/rasmus/omakub-custom/raw/branch/main/install.sh | bash
+```
\ No newline at end of file
diff --git a/set-dock.sh b/set-dock.sh
new file mode 100644
index 0000000..e58cd82
--- /dev/null
+++ b/set-dock.sh
@@ -0,0 +1,42 @@
+# Favorite apps for dock
+apps=(
+    "firefox_firefox.desktop"
+    "net.waterfox.waterfox.desktop"
+	"google-chrome.desktop"
+    "doublecmd.desktop"
+	"Alacritty.desktop"
+	"code.desktop"
+	"typora.desktop"
+	"pinta_pinta.desktop"
+	"com.github.xournalpp.xournalpp.desktop"
+	"steam.desktop"
+	"org.gnome.Settings.desktop"
+	"org.gnome.Nautilus.desktop"
+)
+
+# Array to hold installed favorite apps
+installed_apps=()
+
+# Directory where .desktop files are typically stored
+desktop_dirs=(
+	"/usr/share/applications"
+	"/usr/local/share/applications"
+	"$HOME/.local/share/applications"
+)
+
+# Check if a .desktop file exists for each app
+for app in "${apps[@]}"; do
+	for dir in "${desktop_dirs[@]}"; do
+		if [ -f "$dir/$app" ]; then
+			installed_apps+=("$app")
+			break
+		fi
+	done
+done
+
+# Convert the array to a format suitable for gsettings
+favorites_list=$(printf "'%s'," "${installed_apps[@]}")
+favorites_list="[${favorites_list%,}]"
+
+# Set the favorite apps
+gsettings set org.gnome.shell favorite-apps "$favorites_list"