Merge branch 'dev' into dev

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

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

install/desktop.sh

@@ -1,9 +1,6 @@
 yay -S --noconfirm --needed \
   brightnessctl playerctl pamixer pavucontrol wireplumber \
-  fcitx5 fcitx5-gtk fcitx5-qt fcitx5-configtool \
+  fcitx5 fcitx5-gtk fcitx5-qt fcitx5-configtool wl-clip-persist \
-  wl-clip-persist \
+  nautilus sushi ffmpegthumbnailer \
-  nautilus sushi ffmpegthumbnailer gnome-calculator \
+  mpv evince imv \
-  1password-beta 1password-cli gnome-keyring \
+  chromium
-  chromium mpv \
-  evince imv \
-  localsend-bin

install/fonts.sh

@@ -1,4 +1,8 @@
-yay -Sy --noconfirm --needed ttf-font-awesome noto-fonts noto-fonts-emoji noto-fonts-cjk noto-fonts-extra
+if [ -z "$OMARCHY_BARE" ]; then
+  yay -Sy --noconfirm --needed ttf-font-awesome noto-fonts noto-fonts-emoji noto-fonts-cjk noto-fonts-extra
+else
+  yay -Sy --noconfirm --needed ttf-font-awesome noto-fonts noto-fonts-emoji
+fi
 
 mkdir -p ~/.local/share/fonts
 

install/webapps.sh

@@ -1,9 +1,11 @@
-source ~/.local/share/omarchy/default/bash/functions
+if [ -z "$OMARCHY_BARE" ]; then
-web2app "WhatsApp" https://web.whatsapp.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/whatsapp.png
+  source ~/.local/share/omarchy/default/bash/functions
-web2app "Google Photos" https://photos.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-photos.png
+  web2app "WhatsApp" https://web.whatsapp.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/whatsapp.png
-web2app "Google Contacts" https://contacts.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-contacts.png
+  web2app "Google Photos" https://photos.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-photos.png
-web2app "Google Messages" https://messages.google.com/web/conversations https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-messages.png
+  web2app "Google Contacts" https://contacts.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-contacts.png
-web2app "ChatGPT" https://chatgpt.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/chatgpt.png
+  web2app "Google Messages" https://messages.google.com/web/conversations https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-messages.png
-web2app "YouTube" https://youtube.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/youtube.png
+  web2app "ChatGPT" https://chatgpt.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/chatgpt.png
-web2app "GitHub" https://github.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/github-light.png
+  web2app "YouTube" https://youtube.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/youtube.png
-web2app "X" https://x.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/x-light.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

install/xtras.sh

@@ -1,7 +1,11 @@
-yay -S --noconfirm --needed \
+if [ -z "$OMARCHY_BARE" ]; then
-  signal-desktop spotify dropbox-cli zoom \
+  yay -S --noconfirm --needed \
-  obsidian-bin typora libreoffice obs-studio kdenlive \
+    gnome-calculator \
-  pinta xournalpp
+    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