From f838cbb63f85e98226b9c328acb9a342a22709f2 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 6 May 2026 21:03:43 +0200 Subject: [PATCH] Use proper .desktop files --- applications/foot-server.desktop | 4 ---- applications/footclient.desktop | 4 ---- applications/hidden/foot-server.desktop | 2 ++ applications/hidden/footclient.desktop | 2 ++ bin/omarchy-install-terminal | 5 ++++- bin/omarchy-refresh-applications | 4 ++++ {applications => default/foot}/foot.desktop | 0 migrations/1778008689.sh | 6 +++--- 8 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 applications/foot-server.desktop delete mode 100644 applications/footclient.desktop create mode 100644 applications/hidden/foot-server.desktop create mode 100644 applications/hidden/footclient.desktop rename {applications => default/foot}/foot.desktop (100%) diff --git a/applications/foot-server.desktop b/applications/foot-server.desktop deleted file mode 100644 index 0ab86d65..00000000 --- a/applications/foot-server.desktop +++ /dev/null @@ -1,4 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Foot Server -NoDisplay=true diff --git a/applications/footclient.desktop b/applications/footclient.desktop deleted file mode 100644 index e4590087..00000000 --- a/applications/footclient.desktop +++ /dev/null @@ -1,4 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Foot Client -NoDisplay=true diff --git a/applications/hidden/foot-server.desktop b/applications/hidden/foot-server.desktop new file mode 100644 index 00000000..e1e3e173 --- /dev/null +++ b/applications/hidden/foot-server.desktop @@ -0,0 +1,2 @@ +[Desktop Entry] +Hidden=true diff --git a/applications/hidden/footclient.desktop b/applications/hidden/footclient.desktop new file mode 100644 index 00000000..e1e3e173 --- /dev/null +++ b/applications/hidden/footclient.desktop @@ -0,0 +1,2 @@ +[Desktop Entry] +Hidden=true diff --git a/bin/omarchy-install-terminal b/bin/omarchy-install-terminal index 15a869d1..2fb040dd 100755 --- a/bin/omarchy-install-terminal +++ b/bin/omarchy-install-terminal @@ -28,9 +28,12 @@ echo "Installing $package..." # Install package if omarchy-pkg-add $package; then # Copy custom desktop entries with X-TerminalArg* keys - if [[ $package == "alacritty" || $package == "foot" ]]; then + if [[ $package == "alacritty" ]]; then mkdir -p ~/.local/share/applications cp "$OMARCHY_PATH/applications/$desktop_id" ~/.local/share/applications/ + elif [[ $package == "foot" ]]; then + mkdir -p ~/.local/share/applications + cp "$OMARCHY_PATH/default/foot/$desktop_id" ~/.local/share/applications/ fi # Copy default config for optional terminals when missing diff --git a/bin/omarchy-refresh-applications b/bin/omarchy-refresh-applications index 50c55ed2..9eb4e9de 100755 --- a/bin/omarchy-refresh-applications +++ b/bin/omarchy-refresh-applications @@ -11,6 +11,10 @@ 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 omarchy-cmd-present foot; then + cp ~/.local/share/omarchy/default/foot/foot.desktop ~/.local/share/applications/ +fi + # Refresh the webapps, TUIs, and npx wrappers bash $OMARCHY_PATH/install/packaging/icons.sh bash $OMARCHY_PATH/install/packaging/webapps.sh diff --git a/applications/foot.desktop b/default/foot/foot.desktop similarity index 100% rename from applications/foot.desktop rename to default/foot/foot.desktop diff --git a/migrations/1778008689.sh b/migrations/1778008689.sh index dbe97743..de066e72 100644 --- a/migrations/1778008689.sh +++ b/migrations/1778008689.sh @@ -31,9 +31,9 @@ fi if omarchy-cmd-present foot; then mkdir -p ~/.local/share/applications rm -f ~/.local/share/applications/org.codeberg.dnkl.foot.desktop - cp -Rpf "$OMARCHY_PATH/applications/foot.desktop" ~/.local/share/applications/ - cp -Rpf "$OMARCHY_PATH/applications/footclient.desktop" ~/.local/share/applications/ - cp -Rpf "$OMARCHY_PATH/applications/foot-server.desktop" ~/.local/share/applications/ + cp -Rpf "$OMARCHY_PATH/default/foot/foot.desktop" ~/.local/share/applications/ + cp -Rpf "$OMARCHY_PATH/applications/hidden/footclient.desktop" ~/.local/share/applications/ + cp -Rpf "$OMARCHY_PATH/applications/hidden/foot-server.desktop" ~/.local/share/applications/ fi if [[ -f ~/.config/hypr/input.conf ]]; then