From a64c0505ecb35ca7b02cc3d00429a79e56a8aeb3 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 10 Jul 2025 12:28:42 -0700 Subject: [PATCH] Add a bare mode with almost no default applications beyond system basics --- .../{ => hidden}/avahi-discover.desktop | 0 applications/{ => hidden}/bssh.desktop | 0 applications/{ => hidden}/bvnc.desktop | 0 applications/{ => hidden}/cmake-gui.desktop | 0 applications/{ => hidden}/electron34.desktop | 0 .../{ => hidden}/fcitx5-configtool.desktop | 0 .../{ => hidden}/kbd-layout-viewer5.desktop | 0 applications/{ => hidden}/kcm_fcitx5.desktop | 0 .../{ => hidden}/kcm_kaccounts.desktop | 0 .../{ => hidden}/kvantummanager.desktop | 0 .../{ => hidden}/org.fcitx.Fcitx5.desktop | 0 .../org.fcitx.fcitx5-config-qt.desktop | 0 .../org.fcitx.fcitx5-migrator.desktop | 0 .../org.fcitx.fcitx5-qt5-gui-wrapper.desktop | 0 .../org.fcitx.fcitx5-qt6-gui-wrapper.desktop | 0 applications/{ => hidden}/qv4l2.desktop | 0 applications/{ => hidden}/qvidcap.desktop | 0 applications/{ => hidden}/xgps.desktop | 0 applications/{ => hidden}/xgpsspeed.desktop | 0 applications/{ => xtras}/Basecamp.desktop | 0 applications/{ => xtras}/HEY.desktop | 0 applications/{ => xtras}/Zoom.desktop | 0 applications/{ => xtras}/dropbox.desktop | 0 bin/omarchy-sync-applications | 6 ++++++ install/asdcontrol.sh | 2 +- install/desktop.sh | 11 ++++------ install/webapps.sh | 20 ++++++++++--------- install/xtras.sh | 12 +++++++---- 28 files changed, 30 insertions(+), 21 deletions(-) rename applications/{ => hidden}/avahi-discover.desktop (100%) rename applications/{ => hidden}/bssh.desktop (100%) rename applications/{ => hidden}/bvnc.desktop (100%) rename applications/{ => hidden}/cmake-gui.desktop (100%) rename applications/{ => hidden}/electron34.desktop (100%) rename applications/{ => hidden}/fcitx5-configtool.desktop (100%) rename applications/{ => hidden}/kbd-layout-viewer5.desktop (100%) rename applications/{ => hidden}/kcm_fcitx5.desktop (100%) rename applications/{ => hidden}/kcm_kaccounts.desktop (100%) rename applications/{ => hidden}/kvantummanager.desktop (100%) rename applications/{ => hidden}/org.fcitx.Fcitx5.desktop (100%) rename applications/{ => hidden}/org.fcitx.fcitx5-config-qt.desktop (100%) rename applications/{ => hidden}/org.fcitx.fcitx5-migrator.desktop (100%) rename applications/{ => hidden}/org.fcitx.fcitx5-qt5-gui-wrapper.desktop (100%) rename applications/{ => hidden}/org.fcitx.fcitx5-qt6-gui-wrapper.desktop (100%) rename applications/{ => hidden}/qv4l2.desktop (100%) rename applications/{ => hidden}/qvidcap.desktop (100%) rename applications/{ => hidden}/xgps.desktop (100%) rename applications/{ => hidden}/xgpsspeed.desktop (100%) rename applications/{ => xtras}/Basecamp.desktop (100%) rename applications/{ => xtras}/HEY.desktop (100%) rename applications/{ => xtras}/Zoom.desktop (100%) rename applications/{ => xtras}/dropbox.desktop (100%) diff --git a/applications/avahi-discover.desktop b/applications/hidden/avahi-discover.desktop similarity index 100% rename from applications/avahi-discover.desktop rename to applications/hidden/avahi-discover.desktop diff --git a/applications/bssh.desktop b/applications/hidden/bssh.desktop similarity index 100% rename from applications/bssh.desktop rename to applications/hidden/bssh.desktop diff --git a/applications/bvnc.desktop b/applications/hidden/bvnc.desktop similarity index 100% rename from applications/bvnc.desktop rename to applications/hidden/bvnc.desktop diff --git a/applications/cmake-gui.desktop b/applications/hidden/cmake-gui.desktop similarity index 100% rename from applications/cmake-gui.desktop rename to applications/hidden/cmake-gui.desktop diff --git a/applications/electron34.desktop b/applications/hidden/electron34.desktop similarity index 100% rename from applications/electron34.desktop rename to applications/hidden/electron34.desktop diff --git a/applications/fcitx5-configtool.desktop b/applications/hidden/fcitx5-configtool.desktop similarity index 100% rename from applications/fcitx5-configtool.desktop rename to applications/hidden/fcitx5-configtool.desktop diff --git a/applications/kbd-layout-viewer5.desktop b/applications/hidden/kbd-layout-viewer5.desktop similarity index 100% rename from applications/kbd-layout-viewer5.desktop rename to applications/hidden/kbd-layout-viewer5.desktop diff --git a/applications/kcm_fcitx5.desktop b/applications/hidden/kcm_fcitx5.desktop similarity index 100% rename from applications/kcm_fcitx5.desktop rename to applications/hidden/kcm_fcitx5.desktop diff --git a/applications/kcm_kaccounts.desktop b/applications/hidden/kcm_kaccounts.desktop similarity index 100% rename from applications/kcm_kaccounts.desktop rename to applications/hidden/kcm_kaccounts.desktop diff --git a/applications/kvantummanager.desktop b/applications/hidden/kvantummanager.desktop similarity index 100% rename from applications/kvantummanager.desktop rename to applications/hidden/kvantummanager.desktop diff --git a/applications/org.fcitx.Fcitx5.desktop b/applications/hidden/org.fcitx.Fcitx5.desktop similarity index 100% rename from applications/org.fcitx.Fcitx5.desktop rename to applications/hidden/org.fcitx.Fcitx5.desktop diff --git a/applications/org.fcitx.fcitx5-config-qt.desktop b/applications/hidden/org.fcitx.fcitx5-config-qt.desktop similarity index 100% rename from applications/org.fcitx.fcitx5-config-qt.desktop rename to applications/hidden/org.fcitx.fcitx5-config-qt.desktop diff --git a/applications/org.fcitx.fcitx5-migrator.desktop b/applications/hidden/org.fcitx.fcitx5-migrator.desktop similarity index 100% rename from applications/org.fcitx.fcitx5-migrator.desktop rename to applications/hidden/org.fcitx.fcitx5-migrator.desktop diff --git a/applications/org.fcitx.fcitx5-qt5-gui-wrapper.desktop b/applications/hidden/org.fcitx.fcitx5-qt5-gui-wrapper.desktop similarity index 100% rename from applications/org.fcitx.fcitx5-qt5-gui-wrapper.desktop rename to applications/hidden/org.fcitx.fcitx5-qt5-gui-wrapper.desktop diff --git a/applications/org.fcitx.fcitx5-qt6-gui-wrapper.desktop b/applications/hidden/org.fcitx.fcitx5-qt6-gui-wrapper.desktop similarity index 100% rename from applications/org.fcitx.fcitx5-qt6-gui-wrapper.desktop rename to applications/hidden/org.fcitx.fcitx5-qt6-gui-wrapper.desktop diff --git a/applications/qv4l2.desktop b/applications/hidden/qv4l2.desktop similarity index 100% rename from applications/qv4l2.desktop rename to applications/hidden/qv4l2.desktop diff --git a/applications/qvidcap.desktop b/applications/hidden/qvidcap.desktop similarity index 100% rename from applications/qvidcap.desktop rename to applications/hidden/qvidcap.desktop diff --git a/applications/xgps.desktop b/applications/hidden/xgps.desktop similarity index 100% rename from applications/xgps.desktop rename to applications/hidden/xgps.desktop diff --git a/applications/xgpsspeed.desktop b/applications/hidden/xgpsspeed.desktop similarity index 100% rename from applications/xgpsspeed.desktop rename to applications/hidden/xgpsspeed.desktop diff --git a/applications/Basecamp.desktop b/applications/xtras/Basecamp.desktop similarity index 100% rename from applications/Basecamp.desktop rename to applications/xtras/Basecamp.desktop diff --git a/applications/HEY.desktop b/applications/xtras/HEY.desktop similarity index 100% rename from applications/HEY.desktop rename to applications/xtras/HEY.desktop diff --git a/applications/Zoom.desktop b/applications/xtras/Zoom.desktop similarity index 100% rename from applications/Zoom.desktop rename to applications/xtras/Zoom.desktop diff --git a/applications/dropbox.desktop b/applications/xtras/dropbox.desktop similarity index 100% rename from applications/dropbox.desktop rename to applications/xtras/dropbox.desktop diff --git a/bin/omarchy-sync-applications b/bin/omarchy-sync-applications index 65fb779..6f8c6b1 100755 --- a/bin/omarchy-sync-applications +++ b/bin/omarchy-sync-applications @@ -8,4 +8,10 @@ gtk-update-icon-cache ~/.local/share/icons/hicolor &>/dev/null # Copy .desktop declarations mkdir -p ~/.local/share/applications cp ~/.local/share/omarchy/applications/*.desktop ~/.local/share/applications/ +cp ~/.local/share/omarchy/applications/hidden/*.desktop ~/.local/share/applications/ + +if [ -z "$OMARCHY_BARE" ]; then + cp ~/.local/share/omarchy/applications/xtras/*.desktop ~/.local/share/applications/ +fi + update-desktop-database ~/.local/share/applications diff --git a/install/asdcontrol.sh b/install/asdcontrol.sh index ae840bd..3b8548e 100644 --- a/install/asdcontrol.sh +++ b/install/asdcontrol.sh @@ -1,5 +1,5 @@ # Install asdcontrol for controlling brightness on Apple Displays -if ! command -v asdcontrol &>/dev/null; then +if [ -z "$OMARCHY_BARE" ] && ! command -v asdcontrol &>/dev/null; then git clone https://github.com/nikosdion/asdcontrol.git /tmp/asdcontrol cd /tmp/asdcontrol make diff --git a/install/desktop.sh b/install/desktop.sh index 91ad2da..22bd40a 100644 --- a/install/desktop.sh +++ b/install/desktop.sh @@ -1,9 +1,6 @@ yay -S --noconfirm --needed \ brightnessctl playerctl pamixer pavucontrol wireplumber \ - fcitx5 fcitx5-gtk fcitx5-qt fcitx5-configtool \ - wl-clip-persist \ - nautilus sushi ffmpegthumbnailer gnome-calculator \ - 1password-beta 1password-cli gnome-keyring \ - chromium mpv \ - evince imv \ - localsend-bin + fcitx5 fcitx5-gtk fcitx5-qt fcitx5-configtool wl-clip-persist \ + nautilus sushi ffmpegthumbnailer \ + mpv evince imv \ + chromium diff --git a/install/webapps.sh b/install/webapps.sh index befdaec..a77874a 100644 --- a/install/webapps.sh +++ b/install/webapps.sh @@ -1,9 +1,11 @@ -source ~/.local/share/omarchy/default/bash/functions -web2app "WhatsApp" https://web.whatsapp.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/whatsapp.png -web2app "Google Photos" https://photos.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-photos.png -web2app "Google Contacts" https://contacts.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-contacts.png -web2app "Google Messages" https://messages.google.com/web/conversations https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-messages.png -web2app "ChatGPT" https://chatgpt.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/chatgpt.png -web2app "YouTube" https://youtube.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/youtube.png -web2app "GitHub" https://github.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/github-light.png -web2app "X" https://x.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/x-light.png +if [ -z "$OMARCHY_BARE" ]; then + source ~/.local/share/omarchy/default/bash/functions + web2app "WhatsApp" https://web.whatsapp.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/whatsapp.png + web2app "Google Photos" https://photos.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-photos.png + web2app "Google Contacts" https://contacts.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-contacts.png + web2app "Google Messages" https://messages.google.com/web/conversations https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-messages.png + web2app "ChatGPT" https://chatgpt.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/chatgpt.png + web2app "YouTube" https://youtube.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/youtube.png + web2app "GitHub" https://github.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/github-light.png + web2app "X" https://x.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/x-light.png +fi diff --git a/install/xtras.sh b/install/xtras.sh index ba83bc1..c4272e8 100644 --- a/install/xtras.sh +++ b/install/xtras.sh @@ -1,7 +1,11 @@ -yay -S --noconfirm --needed \ - signal-desktop spotify dropbox-cli zoom \ - obsidian-bin typora libreoffice obs-studio kdenlive \ - pinta xournalpp +if [ -z "$OMARCHY_BARE" ]; then + yay -S --noconfirm --needed \ + gnome-calculator \ + signal-desktop spotify dropbox-cli zoom \ + obsidian-bin typora libreoffice obs-studio kdenlive \ + 1password-beta 1password-cli gnome-keyring \ + pinta xournalpp localsend-bin +fi # Copy over Omarchy applications source ~/.local/share/omarchy/bin/omarchy-sync-applications || true