Skip to content

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
* master:
  Dont show file system by default
  Acknowledge compatibility with 24.10
  Prepare for 1.1.6 release
  Revert "Add the julia programming language"
  Remove trailing whitespace
  Dont enable go for lazyvim since it may not be installed
  Set default PHP version to 8.4 on installation
  Set Default Ruby version to 3.4 on installation
  Add julia
  fix cursor parameter and apt related commands
  Cursor AI Editor
  Fix shell completion for 'ls' alias by setting '--icons=auto'
  • Loading branch information
dhh committed Feb 4, 2025
2 parents fda7e85 + 8a75729 commit f3d7223
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 12 deletions.
Binary file added applications/icons/cursor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions bin/omakub-sub/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CHOICES=(
"1password Manage your passwords securely across devices"
"Audacity Record and edit audio"
"Brave Chrome-based browser with built-in ad blocking"
"Cursor The AI Code Editor"
"Doom Emacs Emacs framework with curated list of packages"
"Dropbox Sync files across computers with ease"
"OBS Studio Record screencasts with inputs from both display + webcam"
Expand Down
2 changes: 1 addition & 1 deletion boot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ascii_art='________ __ ___.
'

echo -e "$ascii_art"
echo "=> Omakub is for fresh Ubuntu 24.04 installations only!"
echo "=> Omakub is for fresh Ubuntu 24.04+ installations only!"
echo -e "\nBegin installation (or abort with ctrl+c)..."

sudo apt-get update >/dev/null
Expand Down
4 changes: 0 additions & 4 deletions configs/neovim/lazyvim.json

This file was deleted.

2 changes: 1 addition & 1 deletion defaults/bash/aliases
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# File system
alias ls='eza -lh --group-directories-first --icons'
alias ls='eza -lh --group-directories-first --icons=auto'
alias lsa='ls -a'
alias lt='eza --tree --level=2 --long --icons --git'
alias lta='lt -a'
Expand Down
24 changes: 24 additions & 0 deletions install/desktop/optional/app-cursor.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
cd /tmp
curl -L --output cursor.appimage https://downloader.cursor.sh/linux/x64
sudo mv cursor.appimage /opt/cursor.appimage
sudo chmod +x /opt/cursor.appimage
sudo apt install -y fuse3
sudo apt install -y libfuse2t64

DESKTOP_FILE="/usr/share/applications/cursor.desktop"

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

if [ -f "$DESKTOP_FILE" ]; then
echo "cursor.desktop created successfully"
else
echo "Failed to create cursor.desktop"
fi
1 change: 1 addition & 0 deletions install/desktop/set-gnome-extensions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ gsettings set org.gnome.shell.extensions.tophat show-icons false
gsettings set org.gnome.shell.extensions.tophat show-cpu false
gsettings set org.gnome.shell.extensions.tophat show-disk false
gsettings set org.gnome.shell.extensions.tophat show-mem false
gsettings set org.gnome.shell.extensions.tophat show-fs false
gsettings set org.gnome.shell.extensions.tophat network-usage-unit bits

# Configure AlphabeticalAppGrid
Expand Down
3 changes: 0 additions & 3 deletions install/terminal/app-neovim.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ if [ ! -d "$HOME/.config/nvim" ]; then

# Default to Tokyo Night theme
cp ~/.local/share/omakub/themes/tokyo-night/neovim.lua ~/.config/nvim/lua/plugins/theme.lua

# Enable default extras
cp ~/.local/share/omakub/configs/neovim/lazyvim.json ~/.config/nvim/lazyvim.json
fi

# Replace desktop launcher with one running inside Alacritty
Expand Down
4 changes: 2 additions & 2 deletions install/terminal/select-dev-language.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if [[ -n "$languages" ]]; then
for language in $languages; do
case $language in
Ruby)
mise use --global ruby@3.3
mise use --global ruby@3.4
mise x ruby -- gem install rails --no-document
;;
Node.js)
Expand All @@ -21,7 +21,7 @@ if [[ -n "$languages" ]]; then
;;
PHP)
sudo add-apt-repository -y ppa:ondrej/php
sudo apt -y install php8.3 php8.3-{curl,apcu,intl,mbstring,opcache,pgsql,mysql,sqlite3,redis,xml,zip}
sudo apt -y install php8.4 php8.4-{curl,apcu,intl,mbstring,opcache,pgsql,mysql,sqlite3,redis,xml,zip}
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
php composer-setup.php --quiet && sudo mv composer.phar /usr/local/bin/composer
rm composer-setup.php
Expand Down
2 changes: 2 additions & 0 deletions uninstall/app-cursor.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sudo rm /opt/cursor.appimage
sudo rm /usr/share/applications/cursor.desktop
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.5
1.1.6

0 comments on commit f3d7223

Please sign in to comment.