Omakube 1.0.0-rc1

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+charset = utf-8

applications/install/cursor.sh

@@ -14,7 +14,7 @@ sudo bash -c "cat > $DESKTOP_FILE" <<EOL
 Name=Cursor
 Comment=AI-powered code editor
 Exec=/opt/cursor.appimage --no-sandbox
-Icon=/home/$USER/.local/share/omakub/applications/icons/cursor.png
+Icon=/home/$USER/.local/share/omakub/applications/desktop/icons/cursor.png
 Type=Application
 Categories=Development;IDE;
 EOL

applications/install/discord.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# A Communication platform for voice, video, and text messaging https://discord.com/
 cd /tmp
 wget https://discord.com/api/download?platform=linux -O discord.deb
 sudo apt install ./discord.deb -y

applications/install/docker.sh

@@ -22,6 +22,11 @@ sudo tee /etc/docker/daemon.json >/dev/null <<'EOF'
 }
 EOF
 
+# Expose systemd-resolved to our Docker network
+sudo mkdir -p /etc/systemd/resolved.conf.d
+echo -e '[Resolve]\nDNSStubListenerExtra=172.17.0.1' | sudo tee /etc/systemd/resolved.conf.d/20-docker-dns.conf >/dev/null
+sudo systemctl restart systemd-resolved
+
 # Start Docker automatically
 sudo systemctl enable docker
 

applications/install/dropbox.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 
-# Sync files across machines using https://dropbox.com
 sudo apt install -y nautilus-dropbox >/dev/null

applications/install/firefox.sh

@@ -1,10 +1,11 @@
 #!/bin/bash
 
-# Install latest version of Firefox https://www.mozilla.org/firefox/
+# Check if the Mozilla PPA is already added
 if ! grep -q "^deb .*\bmozillateam/ppa\b" /etc/apt/sources.list /etc/apt/sources.list.d/* 2>/dev/null; then
   sudo add-apt-repository -y ppa:mozillateam/ppa
 fi
 
+# Create or update the APT preferences file to prioritize Mozilla packages
 if [ ! -f /etc/apt/preferences.d/mozilla ]; then
   sudo tee /etc/apt/preferences.d/mozilla > /dev/null <<EOF
 Package: *
@@ -13,4 +14,4 @@ Pin-Priority: 1001
 EOF
 fi
 
-sudo apt-get update && sudo apt-get install -y firefox
+sudo apt update && sudo apt install -y firefox

applications/install/flameshot.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 
-# Flameshot is a nice step-up over the default Gnome screenshot tool
 sudo apt install flameshot -y

applications/install/gitlab-cli.sh

@@ -5,6 +5,6 @@
       DEB_FILE=$(basename "$LATEST_URL")
       curl -L -o "/tmp/$DEB_FILE" "$LATEST_URL"
       sudo dpkg -i "/tmp/$DEB_FILE"
-      sudo apt-get install -f -y
+      sudo apt install -f -y
       rm "/tmp/$DEB_FILE"
   fi

applications/install/kitty.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Install Kitty terminal emulator
+curl -L https://sw.kovidgoyal.net/kitty/installer.sh | sh /dev/stdin
+
+# Create symbolic links to add kitty and kitten to PATH (assuming ~/.local/bin is in
+# your system-wide PATH)
+ln -sf ~/.local/kitty.app/bin/kitty ~/.local/kitty.app/bin/kitten ~/.local/bin/
+# Place the kitty.desktop file somewhere it can be found by the OS
+cp ~/.local/kitty.app/share/applications/kitty.desktop ~/.local/share/applications/
+# If you want to open text files and images in kitty via your file manager also add the kitty-open.desktop file
+cp ~/.local/kitty.app/share/applications/kitty-open.desktop ~/.local/share/applications/
+# Update the paths to the kitty and its icon in the kitty desktop file(s)
+sed -i "s|Icon=kitty|Icon=$(readlink -f ~)/.local/kitty.app/share/icons/hicolor/256x256/apps/kitty.png|g" ~/.local/share/applications/kitty*.desktop
+sed -i "s|Exec=kitty|Exec=$(readlink -f ~)/.local/kitty.app/bin/kitty|g" ~/.local/share/applications/kitty*.desktop
+# Make xdg-terminal-exec (and hence desktop environments that support it use kitty)
+echo 'kitty.desktop' > ~/.config/xdg-terminals.list

applications/install/libreoffice.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 
-# Work with Word, Excel, Powerpoint files
 sudo apt install -y libreoffice

applications/install/neovim.sh

@@ -1,23 +1,20 @@
 #!/bin/bash
 
-if ! command -v nvim &>/dev/null; then
-  # Install Neovim
-  cd /tmp
-  wget -O nvim.tar.gz "https://github.com/neovim/neovim/releases/download/stable/nvim-linux-x86_64.tar.gz"
-  tar -xf nvim.tar.gz
-  sudo install nvim-linux-x86_64/bin/nvim /usr/local/bin/nvim
-  sudo cp -R nvim-linux-x86_64/lib /usr/local/
-  sudo cp -R nvim-linux-x86_64/share /usr/local/
-  rm -rf nvim-linux-x86_64 nvim.tar.gz
-  cd -
+cd /tmp
+wget -O nvim.tar.gz "https://github.com/neovim/neovim/releases/download/stable/nvim-linux-x86_64.tar.gz"
+tar -xf nvim.tar.gz
+sudo install nvim-linux-x86_64/bin/nvim /usr/local/bin/nvim
+sudo cp -R nvim-linux-x86_64/lib /usr/local/
+sudo cp -R nvim-linux-x86_64/share /usr/local/
+rm -rf nvim-linux-x86_64 nvim.tar.gz
+cd -
 
-  # Install luarocks and tree-sitter-cli to resolve lazyvim :checkhealth warnings
-  sudo apt install -y luarocks tree-sitter-cli
+# Install luarocks and tree-sitter-cli to resolve lazyvim :checkhealth warnings
+sudo apt install -y luarocks tree-sitter-cli
 
-  # Use LazyVim
-  rm -rf ~/.config/nvim
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  cp -R ~/.local/share/omakub/config/nvim/* ~/.config/nvim/
-  rm -rf ~/.config/nvim/.git
-  echo "vim.opt.relativenumber = false" >>~/.config/nvim/lua/config/options.lua
-fi
+# Use LazyVim
+rm -rf ~/.config/nvim
+git clone https://github.com/LazyVim/starter ~/.config/nvim
+cp -R ~/.local/share/omakub/config/nvim/* ~/.config/nvim/
+rm -rf ~/.config/nvim/.git
+echo "vim.opt.relativenumber = false" >>~/.config/nvim/lua/config/options.lua

applications/install/obs-studio.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 
-# OBS Studio is a screen recording application that allows you to capture both display and webcam in the same recording
 sudo apt install -y obs-studio

applications/install/obsidian.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
 
-# Obsidian is a multi-platform note taking application. See https://obsidian.md
 gum spin --spinner meter --title "Obsidian installation about to start. It may take up to 20 minutes on some systems!" -- sleep 3
 flatpak install -y flathub md.obsidian.Obsidian

applications/install/signal.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 
-wget -qO- https://updates.signal.org/desktop/apt/keys.asc | gpg --dearmor >signal-desktop-keyring.gpg
-cat signal-desktop-keyring.gpg | sudo tee /usr/share/keyrings/signal-desktop-keyring.gpg >/dev/null
-echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/signal-desktop-keyring.gpg] https://updates.signal.org/desktop/apt xenial main' |
-	sudo tee /etc/apt/sources.list.d/signal-xenial.list
+
+wget -O- https://updates.signal.org/desktop/apt/keys.asc | gpg --dearmor > signal-desktop-keyring.gpg;
+cat signal-desktop-keyring.gpg | sudo tee /usr/share/keyrings/signal-desktop-keyring.gpg > /dev/null
+wget -O signal-desktop.sources https://updates.signal.org/static/desktop/apt/signal-desktop.sources;
+cat signal-desktop.sources | sudo tee /etc/apt/sources.list.d/signal-desktop.sources > /dev/null
 rm signal-desktop-keyring.gpg
 sudo apt update
 sudo apt install -y signal-desktop

applications/install/spotify.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# Stream music using https://spotify.com
 curl -sS https://download.spotify.com/debian/pubkey_C85668DF69375001.gpg | sudo gpg --dearmor --yes -o /etc/apt/trusted.gpg.d/spotify.gpg
 echo "deb [signed-by=/etc/apt/trusted.gpg.d/spotify.gpg] https://repository.spotify.com stable non-free" | sudo tee /etc/apt/sources.list.d/spotify.list
 sudo apt update -y

applications/install/starship.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 
-# Install Starship
 curl -sS https://starship.rs/install.sh | sh -s -- -y

applications/install/steam.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# Play games from https://store.steampowered.com/
 cd /tmp
 wget https://cdn.akamai.steamstatic.com/client/installer/steam.deb
 sudo apt install -y ./steam.deb

applications/install/typora.sh

@@ -1,15 +1,5 @@
 #!/bin/bash
 
-# Temporarily switch away from using Typora repo which is broken.
-#
-# wget -qO - https://typora.io/linux/public-key.asc | sudo tee /etc/apt/trusted.gpg.d/typora.asc >/dev/null || true
-#
-# sudo add-apt-repository -y 'deb https://typora.io/linux ./'
-# sudo add-apt-repository -y 'deb https://typora.io/linux ./'
-# sudo apt update -y
-# sudo apt install -y typora
-
-# Install with db
 cd /tmp
 wget -O typora.deb "https://downloads.typora.io/linux/typora_1.10.8_amd64.deb"
 sudo apt install -y /tmp/typora.deb

applications/install/visual-studio-code.sh

@@ -1,11 +1,13 @@
 #!/bin/bash
 
-cd /tmp
-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
-cd -
+if [ ! -f /etc/apt/keyrings/packages.microsoft.gpg ] || [ ! -f /usr/share/keyrings/microsoft.gpg ]; then
+  cd /tmp
+  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
+  cd -
+fi
 
 sudo apt update -y
 sudo apt install -y code

applications/install/zen.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+cd /tmp
+curl -s https://updates.zen-browser.app/install.sh -o zen-install.sh 2>/dev/null
+chmod +x zen-install.sh 2>/dev/null
+bash zen-install.sh >/dev/null 2>&1
+rm -f zen-install.sh 2>/dev/null
+cd -

applications/install/zoom.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# Make video calls using https://zoom.us/
 cd /tmp
 wget https://zoom.us/client/latest/zoom_amd64.deb
 sudo apt install -y ./zoom_amd64.deb

applications/remove/1password.sh

@@ -4,4 +4,4 @@ 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
+sudo apt remove --purge -y 1password 1password-cli

applications/remove/kitty.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Kitty terminal installation script removal
+rm -rf ~/.local/kitty.app
+rm -f ~/.local/bin/kitty
+rm -f ~/.local/bin/kitten
+rm -f ~/.local/share/applications/kitty.desktop
+rm -f ~/.local/share/applications/kitty-open.desktop
+rm -f ~/.config/xdg-terminals.list

applications/remove/libreoffice.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-sudo apt-get remove --purge -y "libreoffice*"
-sudo apt-get -y clean
-sudo apt-get -y autoremove
+sudo apt remove --purge -y "libreoffice*"
+sudo apt -y clean
+sudo apt -y autoremove

applications/remove/neovim.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-sudo apt purge -y neovim neovim-runtime
-rm ~/.local/share/applications/Neovim.desktop
+sudo rm /usr/local/bin/nvim
+sudo rm -r /usr/local/share/nvim/
 rm -rf ~/.config/nvim
 rm -rf ~/.local/share/nvim
 rm -rf ~/.local/state/nvim

applications/remove/zen.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sudo apt purge -y zen

bin/omakub-app-folder-add

@@ -3,6 +3,8 @@
 # omakub-app-folder-add: Move a .desktop file to a specified app folder.
 # Usage: omakub-app-folder-add <desktop_file.desktop> <folder_name>
 
+DESKTOP_DIR="$HOME/.local/share/applications"
+
 if [ "$#" -ne 2 ]; then
   echo -e "\e[32mLet's add an app to a folder in the app grid!\n\e[0m"
   DESKTOP_FILE=$(gum input --prompt "Name> " --placeholder "A desktop file app (e.g., Spotify.desktop, no full path!)")
@@ -17,18 +19,50 @@ if [[ -z "$DESKTOP_FILE" || -z "$FOLDER_NAME" ]]; then
   exit 1
 fi
 
-if ! locate "$DESKTOP_FILE" &> /dev/null; then
+if [ ! -f "$DESKTOP_DIR/$DESKTOP_FILE" ]; then
   echo "Desktop file '$DESKTOP_FILE' not found!"
   exit 1
 fi
 
-# Convert to lowercase immediately for consistency
-FOLDER=$(echo "$FOLDER_NAME" | tr -d ' ' | tr '[:upper:]' '[:lower:]')
-SCHEMA="org.gnome.desktop.app-folders.folder:/org/gnome/desktop/app-folders/folders/$FOLDER/"
+# Get current folders list
 CURRENT_FOLDERS=$(gsettings get org.gnome.desktop.app-folders folder-children)
 
-# Check if folder exists using the lowercase version
-if [[ "$CURRENT_FOLDERS" != *"'$FOLDER'"* ]]; then
+# Convert to different formats for checking
+FOLDER_LOWERCASE=$(echo "$FOLDER_NAME" | tr -d ' ' | tr '[:upper:]' '[:lower:]')
+FOLDER_CAMELCASE=$(echo "$FOLDER_NAME" | tr -d ' ')
+
+# Check if folder exists (try exact name, camelcase, then lowercase)
+EXISTING_FOLDER=""
+if [[ "$CURRENT_FOLDERS" == *"'$FOLDER_NAME'"* ]]; then
+  # Exact name match - use original name for schema
+  EXISTING_FOLDER="$FOLDER_NAME"
+  FOLDER="$FOLDER_NAME"
+elif [[ "$CURRENT_FOLDERS" == *"'$FOLDER_CAMELCASE'"* ]]; then
+  # CamelCase match (like "WebApps") - use camelcase for schema
+  EXISTING_FOLDER="$FOLDER_CAMELCASE"
+  FOLDER="$FOLDER_CAMELCASE"
+elif [[ "$CURRENT_FOLDERS" == *"'$FOLDER_LOWERCASE'"* ]]; then
+  # Lowercase match - use lowercase for schema
+  EXISTING_FOLDER="$FOLDER_LOWERCASE"
+  FOLDER="$FOLDER_LOWERCASE"
+else
+  # No existing folder - will create new one with lowercase schema
+  FOLDER="$FOLDER_LOWERCASE"
+fi
+
+# Set schema and display name based on whether folder exists
+if [ -n "$EXISTING_FOLDER" ]; then
+  # Use existing folder
+  SCHEMA="org.gnome.desktop.app-folders.folder:/org/gnome/desktop/app-folders/folders/$FOLDER/"
+  FOLDER_DISPLAY_NAME=$(gsettings get "$SCHEMA" name | sed 's/^.\(.*\).$/\1/')
+else
+  # Create new folder
+  SCHEMA="org.gnome.desktop.app-folders.folder:/org/gnome/desktop/app-folders/folders/$FOLDER/"
+  FOLDER_DISPLAY_NAME="$FOLDER_NAME"
+fi
+
+# Check if we need to create a new folder
+if [ -z "$EXISTING_FOLDER" ]; then
   # Create new folder
   TRIMMED_FOLDERS=$(echo "$CURRENT_FOLDERS" | sed "s/^\[//;s/\]$//")
 
@@ -38,10 +72,8 @@ if [[ "$CURRENT_FOLDERS" != *"'$FOLDER'"* ]]; then
     gsettings set org.gnome.desktop.app-folders folder-children "['$FOLDER']"
   fi
 
-  gsettings set "$SCHEMA" name "$FOLDER_NAME"
+  gsettings set "$SCHEMA" name "$FOLDER_DISPLAY_NAME"
   gsettings set "$SCHEMA" apps "['$DESKTOP_FILE']"
-
-  echo -e "Created folder '$FOLDER_NAME' and added app '$DESKTOP_FILE' to it\n"
 else
   # Add app to existing folder
   CURRENT_APPS=$(gsettings get "$SCHEMA" apps)
@@ -53,9 +85,5 @@ else
     else
       gsettings set "$SCHEMA" apps "['$DESKTOP_FILE']"
     fi
-
-    echo -e "App '$DESKTOP_FILE' has been added to folder '$FOLDER_NAME'\n"
-  else
-    echo -e "App '$DESKTOP_FILE' is already in folder '$FOLDER_NAME'\n"
   fi
 fi