my modifications

README.md

@@ -12,6 +12,16 @@ Please help us improve Omakub's documentation on the [basecamp/omakub-site repos
 
 Omakub is released under the [MIT License](https://opensource.org/licenses/MIT).
 
+## Included Applications and Customization
+
+Omakub now offers an even broader selection of pre-configured applications and enhanced customization options. Recent updates include:
+
+-   **Removed Applications:** HEY, Basecamp, Activity, and WhatsApp.
+-   **New Additions:** uv, nvm, KeepassXC, Syncthing, FFmpeg, fd-find, htop, Solaar, Thunderbird, Thorium, and Firefox.
+-   **Browser Change:** Google Chrome has been replaced with Chromium.
+
+These changes aim to provide a more flexible and comprehensive setup experience.
+
 ## Extras
 
 While omakub is purposed to be an opinionated take, the open source community offers alternative customization, add-ons, extras, that you can use to adjust, replace or enrich your experience.

applications/Activity.sh

@@ -1,12 +0,0 @@
-cat <<EOF >~/.local/share/applications/Activity.desktop
-[Desktop Entry]
-Version=1.0
-Name=Activity
-Comment=System activity from btop
-Exec=alacritty --config-file /home/$USER/.config/alacritty/btop.toml --class=Activity --title=Activity -e btop
-Terminal=false
-Type=Application
-Icon=/home/$USER/.local/share/omakub/applications/icons/Activity.png
-Categories=GTK;
-StartupNotify=false
-EOF

applications/Basecamp.sh

@@ -1,13 +0,0 @@
-cat <<EOF >~/.local/share/applications/Basecamp.desktop
-[Desktop Entry]
-Version=1.0
-Name=Basecamp
-Comment=Basecamp Project Management
-Exec=google-chrome --app="https://launchpad.37signals.com" --name=Basecamp --class=Basecamp
-Terminal=false
-Type=Application
-Icon=/home/$USER/.local/share/omakub/applications/icons/Basecamp.png
-Categories=GTK;
-MimeType=text/html;text/xml;application/xhtml_xml;
-StartupNotify=true
-EOF

applications/Docker.sh

@@ -1,12 +0,0 @@
-cat <<EOF >~/.local/share/applications/Docker.desktop
-[Desktop Entry]
-Version=1.0
-Name=Docker
-Comment=Manage Docker containers with LazyDocker
-Exec=alacritty --config-file /home/$USER/.config/alacritty/pane.toml --class=Docker --title=Docker -e lazydocker
-Terminal=false
-Type=Application
-Icon=/home/$USER/.local/share/omakub/applications/icons/Docker.png
-Categories=GTK;
-StartupNotify=false
-EOF

applications/HEY.sh

@@ -1,13 +0,0 @@
-cat <<EOF >~/.local/share/applications/HEY.desktop
-[Desktop Entry]
-Version=1.0
-Name=HEY
-Comment=HEY Email + Calendar
-Exec=google-chrome --app="https://app.hey.com/" --name=HEY --class=HEY
-Terminal=false
-Type=Application
-Icon=/home/$USER/.local/share/omakub/applications/icons/HEY.png
-Categories=GTK;
-MimeType=text/html;text/xml;application/xhtml_xml;
-StartupNotify=true
-EOF

applications/WhatsApp.sh

@@ -1,13 +0,0 @@
-cat <<EOF >~/.local/share/applications/WhatsApp.desktop
-[Desktop Entry]
-Version=1.0
-Name=WhatsApp
-Comment=WhatsApp Messenger
-Exec=google-chrome --app="https://web.whatsapp.com" --name=WhatsApp --class=Whatsapp
-Terminal=false
-Type=Application
-Icon=/home/$USER/.local/share/omakub/applications/icons/WhatsApp.png
-Categories=GTK;
-MimeType=text/html;text/xml;application/xhtml_xml;
-StartupNotify=true
-EOF

install/desktop/app-chrome.sh

@@ -1,7 +0,0 @@
-# Browse the web with the most popular browser. See https://www.google.com/chrome/
-cd /tmp
-wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-sudo apt install -y ./google-chrome-stable_current_amd64.deb
-rm google-chrome-stable_current_amd64.deb
-xdg-settings set default-web-browser google-chrome.desktop
-cd -

install/desktop/app-chromium.sh

@@ -0,0 +1,2 @@
+echo "Installing Chromium..."
+sudo apt install -y chromium-browser

install/desktop/app-firefox.sh

@@ -0,0 +1,2 @@
+echo "Installing Firefox..."
+sudo apt install -y firefox

install/desktop/app-keepassxc.sh

@@ -0,0 +1,2 @@
+echo "Installing KeepassXC..."
+sudo apt install -y keepassxc

install/desktop/app-solaar.sh

@@ -0,0 +1,2 @@
+echo "Installing Solaar..."
+sudo apt install -y solaar

install/desktop/app-syncthing.sh

@@ -0,0 +1,2 @@
+echo "Installing Syncthing..."
+sudo apt install -y syncthing

install/desktop/app-thorium.sh

@@ -0,0 +1,8 @@
+echo "Installing Thorium..."
+sudo apt install -y curl
+sudo mkdir -p /etc/apt/keyrings
+sudo curl -fsSL https://dl.thorium.rocks/debian/dists/stable/thorium.gpg -o /etc/apt/keyrings/thorium.gpg
+sudo chmod 644 /etc/apt/keyrings/thorium.gpg
+echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/thorium.gpg] https://dl.thorium.rocks/debian stable main" | sudo tee /etc/apt/sources.list.d/thorium.list
+sudo apt update
+sudo apt install -y thorium-browser

install/desktop/app-thunderbird.sh

@@ -0,0 +1,2 @@
+echo "Installing Thunderbird..."
+sudo apt install -y thunderbird

install/first-run-choices.sh

@@ -1,14 +1,14 @@
 # Only ask for default desktop app choices when running Gnome
 if [[ "$XDG_CURRENT_DESKTOP" == *"GNOME"* ]]; then
-  OPTIONAL_APPS=("1password" "Spotify" "Zoom" "Dropbox")
-  DEFAULT_OPTIONAL_APPS='1password,Spotify,Zoom'
+  OPTIONAL_APPS=("Spotify" "Zoom" "Dropbox")
+  DEFAULT_OPTIONAL_APPS='Spotify,Zoom'
   export OMAKUB_FIRST_RUN_OPTIONAL_APPS=$(gum choose "${OPTIONAL_APPS[@]}" --no-limit --selected $DEFAULT_OPTIONAL_APPS --height 7 --header "Select optional apps" | tr ' ' '-')
 fi
 
 AVAILABLE_LANGUAGES=("Ruby on Rails" "Node.js" "Go" "PHP" "Python" "Elixir" "Rust" "Java")
-SELECTED_LANGUAGES="Ruby on Rails","Node.js"
+SELECTED_LANGUAGES="Python","Node.js","Go","Rust"
 export OMAKUB_FIRST_RUN_LANGUAGES=$(gum choose "${AVAILABLE_LANGUAGES[@]}" --no-limit --selected "$SELECTED_LANGUAGES" --height 10 --header "Select programming languages")
 
 AVAILABLE_DBS=("MySQL" "Redis" "PostgreSQL")
-SELECTED_DBS="MySQL,Redis"
+SELECTED_DBS="PostgreSQL,Redis"
 export OMAKUB_FIRST_RUN_DBS=$(gum choose "${AVAILABLE_DBS[@]}" --no-limit --selected "$SELECTED_DBS" --height 5 --header "Select databases (runs in Docker)")

install/terminal/app-fdfind.sh

@@ -0,0 +1,2 @@
+echo "Installing fd-find..."
+sudo apt install -y fd-find

install/terminal/app-ffmpeg.sh

@@ -0,0 +1,2 @@
+echo "Installing FFmpeg..."
+sudo apt install -y ffmpeg

install/terminal/app-htop.sh

@@ -0,0 +1,2 @@
+echo "Installing htop..."
+sudo apt install -y htop

install/terminal/app-nvm.sh

@@ -0,0 +1,2 @@
+echo "Installing nvm..."
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash

install/terminal/app-uv.sh

@@ -0,0 +1,2 @@
+echo "Installing uv..."
+curl -LsSf https://astral.sh/uv/install.sh | sh

migrations/1718359027.sh

@@ -46,13 +46,9 @@ source $OMAKUB_PATH/install/terminal/apps-terminal.sh
 # Add new desktop applications icons
 source $OMAKUB_PATH/applications/Omakub.sh
 source $OMAKUB_PATH/applications/About.sh
-source $OMAKUB_PATH/applications/Activity.sh
 source $OMAKUB_PATH/applications/Docker.sh
 
 # Update icons of apps still installed
-[ -f ~/.local/share/applications/Basecamp.desktop ] && source $OMAKUB_PATH/applications/Basecamp.sh
-[ -f ~/.local/share/applications/HEY.desktop ] && source $OMAKUB_PATH/applications/HEY.sh
-[ -f ~/.local/share/applications/WhatsApp.desktop ] && source $OMAKUB_PATH/applications/WhatsApp.sh
 
 # Set new app grid
 source $OMAKUB_PATH/install/desktop/set-app-grid.sh

migrations/1722091912.sh

@@ -5,10 +5,6 @@ source $OMAKUB_PATH/install/terminal/libraries.sh
 
 # Set name and class for desktop files
 source $OMAKUB_PATH/applications/About.sh
-source $OMAKUB_PATH/applications/Activity.sh
-source $OMAKUB_PATH/applications/Basecamp.sh
-source $OMAKUB_PATH/applications/HEY.sh
 source $OMAKUB_PATH/applications/Docker.sh
 source $OMAKUB_PATH/applications/Neovim.sh
 source $OMAKUB_PATH/applications/Omakub.sh
-source $OMAKUB_PATH/applications/WhatsApp.sh

migrations/1745060743.sh

@@ -4,7 +4,6 @@ cp ~/.local/share/omakub/configs/alacritty/btop.toml ~/.config/alacritty/btop.to
 cp ~/.local/share/omakub/configs/alacritty.toml ~/.config/alacritty/alacritty.toml
 
 source $OMAKUB_PATH/applications/About.sh
-source $OMAKUB_PATH/applications/Activity.sh
 source $OMAKUB_PATH/applications/Neovim.sh
 source $OMAKUB_PATH/applications/Docker.sh
 source $OMAKUB_PATH/applications/Omakub.sh

uninstall/app-chrome.sh

@@ -1 +0,0 @@
-sudo apt remove -y google-chrome-stable

uninstall/app-chromium.sh

@@ -0,0 +1,2 @@
+echo "Uninstalling Chromium..."
+sudo apt remove -y chromium-browser

uninstall/app-fdfind.sh

@@ -0,0 +1,2 @@
+echo "Uninstalling fd-find..."
+sudo apt remove -y fd-find

uninstall/app-ffmpeg.sh

@@ -0,0 +1,2 @@
+echo "Uninstalling FFmpeg..."
+sudo apt remove -y ffmpeg

uninstall/app-firefox.sh

@@ -0,0 +1,2 @@
+echo "Uninstalling Firefox..."
+sudo apt remove -y firefox

uninstall/app-htop.sh

@@ -0,0 +1,2 @@
+echo "Uninstalling htop..."
+sudo apt remove -y htop

uninstall/app-keepassxc.sh

@@ -0,0 +1,2 @@
+echo "Uninstalling KeepassXC..."
+sudo apt remove -y keepassxc

uninstall/app-nvm.sh

@@ -0,0 +1,2 @@
+echo "Uninstalling nvm..."
+rm -rf ~/.nvm

uninstall/app-solaar.sh

@@ -0,0 +1,2 @@
+echo "Uninstalling Solaar..."
+sudo apt remove -y solaar

uninstall/app-syncthing.sh

@@ -0,0 +1,2 @@
+echo "Uninstalling Syncthing..."
+sudo apt remove -y syncthing

uninstall/app-thorium.sh

@@ -0,0 +1,5 @@
+echo "Uninstalling Thorium..."
+sudo apt remove -y thorium-browser
+sudo rm /etc/apt/sources.list.d/thorium.list
+sudo rm /etc/apt/keyrings/thorium.gpg
+sudo apt update

uninstall/app-thunderbird.sh

@@ -0,0 +1,2 @@
+echo "Uninstalling Thunderbird..."
+sudo apt remove -y thunderbird

uninstall/app-uv.sh

@@ -0,0 +1,3 @@
+echo "Uninstalling uv..."
+rm -f ~/.cargo/bin/uv
+rm -f ~/.local/bin/uv

uninstall/apps-web.sh

@@ -1,3 +1 @@
-rm ~/.local/share/applications/WhatsApp.desktop
-rm ~/.local/share/applications/Basecamp.desktop
-rm ~/.local/share/applications/HEY.desktop
+