From bec7f8bbaa8a05a42e25bd6a6b99730216856738 Mon Sep 17 00:00:00 2001 From: Aminda Suomalainen Date: Sat, 20 Apr 2024 11:59:43 +0300 Subject: [PATCH] separate local/share/applications & etc/xdg/autostart --- conf/.gitignore | 3 +- conf/autostart | 1 + etc/xdg/.gitignore | 1 - etc/xdg/autostart | 1 - etc/xdg/autostart/.gitignore | 1 + etc/xdg/autostart/README.md | 3 ++ .../xdg/autostart/easyeffects-service.desktop | 2 +- etc/xdg/autostart/org.telegram.desktop | 1 + etc/xdg/autostart/wlsunset-kotka.desktop | 5 +++ local/share/applications/README.md | 33 ++++++++++++++----- local/share/applications/a-jami.desktop | 5 --- local/share/applications/a-telegram.desktop | 5 --- 12 files changed, 38 insertions(+), 23 deletions(-) create mode 120000 conf/autostart delete mode 100644 etc/xdg/.gitignore delete mode 120000 etc/xdg/autostart create mode 100644 etc/xdg/autostart/.gitignore create mode 100644 etc/xdg/autostart/README.md rename local/share/applications/com.github.wwmm.easyeffects.desktop => etc/xdg/autostart/easyeffects-service.desktop (88%) create mode 120000 etc/xdg/autostart/org.telegram.desktop create mode 100644 etc/xdg/autostart/wlsunset-kotka.desktop delete mode 100644 local/share/applications/a-jami.desktop delete mode 100644 local/share/applications/a-telegram.desktop diff --git a/conf/.gitignore b/conf/.gitignore index f34b0903..cca97265 100644 --- a/conf/.gitignore +++ b/conf/.gitignore @@ -1,2 +1,3 @@ -librewolf.overrides.cfg +librewolf.overrides.cfg.js wireplumber +autostart diff --git a/conf/autostart b/conf/autostart new file mode 120000 index 00000000..38de66be --- /dev/null +++ b/conf/autostart @@ -0,0 +1 @@ +../etc/xdg/autostart \ No newline at end of file diff --git a/etc/xdg/.gitignore b/etc/xdg/.gitignore deleted file mode 100644 index 1ccb22bd..00000000 --- a/etc/xdg/.gitignore +++ /dev/null @@ -1 +0,0 @@ -autostart diff --git a/etc/xdg/autostart b/etc/xdg/autostart deleted file mode 120000 index 214158c4..00000000 --- a/etc/xdg/autostart +++ /dev/null @@ -1 +0,0 @@ -../../local/share/applications \ No newline at end of file diff --git a/etc/xdg/autostart/.gitignore b/etc/xdg/autostart/.gitignore new file mode 100644 index 00000000..e2474e6a --- /dev/null +++ b/etc/xdg/autostart/.gitignore @@ -0,0 +1 @@ +org.telegram.desktop diff --git a/etc/xdg/autostart/README.md b/etc/xdg/autostart/README.md new file mode 100644 index 00000000..863f684f --- /dev/null +++ b/etc/xdg/autostart/README.md @@ -0,0 +1,3 @@ +# Autostart files for graphical desktop environments + +This mostly caters for my family. diff --git a/local/share/applications/com.github.wwmm.easyeffects.desktop b/etc/xdg/autostart/easyeffects-service.desktop similarity index 88% rename from local/share/applications/com.github.wwmm.easyeffects.desktop rename to etc/xdg/autostart/easyeffects-service.desktop index 383d2450..94694d0e 100644 --- a/local/share/applications/com.github.wwmm.easyeffects.desktop +++ b/etc/xdg/autostart/easyeffects-service.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=PulseEffects +Name=EasyEffects Exec=/usr/bin/flatpak run com.github.wwmm.easyeffects --gapplication-service Type=Application Icon=com.github.wwmm.easyeffects diff --git a/etc/xdg/autostart/org.telegram.desktop b/etc/xdg/autostart/org.telegram.desktop new file mode 120000 index 00000000..1fb7f683 --- /dev/null +++ b/etc/xdg/autostart/org.telegram.desktop @@ -0,0 +1 @@ +/var/lib/flatpak/exports/bin/org.telegram.desktop \ No newline at end of file diff --git a/etc/xdg/autostart/wlsunset-kotka.desktop b/etc/xdg/autostart/wlsunset-kotka.desktop new file mode 100644 index 00000000..57083320 --- /dev/null +++ b/etc/xdg/autostart/wlsunset-kotka.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Type=Application +Exec=wlsunset -l 60.46742 -L 26.94508 -t 1000 +Name=wlsunset @ Kotka +Icon=wlsunset diff --git a/local/share/applications/README.md b/local/share/applications/README.md index f03ef8a4..4ee282bc 100644 --- a/local/share/applications/README.md +++ b/local/share/applications/README.md @@ -1,21 +1,36 @@ -# `.desktop` entries +# Custom app menu entries -These can be used for many things such as +These can be used for either `~/.local/share/applications` or +`/usr/local/share/applications` which are read by graphical desktop +environments for their app menus and default applications selections. -- `~/.local/share/applications` (graphical desktop environments populate app - menu from here) -- `~/.config/autostart` (graphical desktop environments read user autostarts - here) -- `/usr/local/share/applications` (global version of above) -- `/etc/xdg/autostart` (global version of the above) +Additionally `~/.config/autostart` or `/etc/xdg/autostart` could symlink here +so graphical desktop environments started the apps on login. + + + + + + + +- [`a-*.desktop`](#a-desktop) +- [Refreshing the menus](#refreshing-the-menus) + + + + + ## `a-*.desktop` These files are companions to my script repos `bash/usr-local-bin/*` belonging to `/usr/local/share/applications` and are named so to avoid masking package manager. They have clearly different names such as using -all caps. To refresh them: +all caps. + +## Refreshing the menus ```bash +update-desktop-database -v ~/.local/share/applications sudo update-desktop-database -v /usr/local/share/applications ``` diff --git a/local/share/applications/a-jami.desktop b/local/share/applications/a-jami.desktop deleted file mode 100644 index 7b3b3c73..00000000 --- a/local/share/applications/a-jami.desktop +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Name=JAMI -Exec=flatpak run --env=TZ=UTC net.jami.Jami -Icon=net.jami.Jami -Type=Application diff --git a/local/share/applications/a-telegram.desktop b/local/share/applications/a-telegram.desktop deleted file mode 100644 index 5c21cc08..00000000 --- a/local/share/applications/a-telegram.desktop +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Name=TELEGRAM -Exec=/usr/local/bin/telegram-desktop -Icon=telegram -Type=Application