From c9cad77caf654c3bd30d22d4e8fe4f666f76c800 Mon Sep 17 00:00:00 2001 From: Aminda Suomalainen Date: Sat, 20 Apr 2024 11:18:33 +0300 Subject: [PATCH] move etc/xdg/autostart to more descriptive location of local/share/applications --- etc/xdg/.gitignore | 1 + etc/xdg/autostart | 1 + etc/xdg/autostart/README.md | 19 ----------------- .../autostart/SteamOS-kscreenlocker.desktop | 1 - local/share/applications | 1 - .../share/applications}/.gitignore | 0 local/share/applications/README.md | 21 +++++++++++++++++++ .../share/applications}/a-brave-beta.desktop | 0 .../applications}/a-brave-nightly.desktop | 0 .../share/applications}/a-brave.desktop | 0 .../share/applications}/a-firefox.desktop | 0 .../applications}/a-google-chrome.desktop | 0 .../share/applications}/a-jami.desktop | 0 .../applications}/a-microsoft-edge.desktop | 0 .../share/applications}/a-mpv.desktop | 0 .../share/applications}/a-signal.desktop | 0 .../share/applications}/a-steam.desktop | 0 .../share/applications}/a-syncplay.desktop | 0 .../share/applications}/a-telegram.desktop | 0 .../share/applications}/a-thunderbird.desktop | 0 .../com.github.wwmm.easyeffects.desktop | 0 .../share/applications}/libreawoo.desktop | 0 22 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 etc/xdg/.gitignore create mode 120000 etc/xdg/autostart delete mode 100644 etc/xdg/autostart/README.md delete mode 120000 etc/xdg/autostart/SteamOS-kscreenlocker.desktop delete mode 120000 local/share/applications rename {etc/xdg/autostart => local/share/applications}/.gitignore (100%) create mode 100644 local/share/applications/README.md rename {etc/xdg/autostart => local/share/applications}/a-brave-beta.desktop (100%) rename {etc/xdg/autostart => local/share/applications}/a-brave-nightly.desktop (100%) rename {etc/xdg/autostart => local/share/applications}/a-brave.desktop (100%) rename {etc/xdg/autostart => local/share/applications}/a-firefox.desktop (100%) rename {etc/xdg/autostart => local/share/applications}/a-google-chrome.desktop (100%) rename {etc/xdg/autostart => local/share/applications}/a-jami.desktop (100%) rename {etc/xdg/autostart => local/share/applications}/a-microsoft-edge.desktop (100%) rename {etc/xdg/autostart => local/share/applications}/a-mpv.desktop (100%) rename {etc/xdg/autostart => local/share/applications}/a-signal.desktop (100%) rename {etc/xdg/autostart => local/share/applications}/a-steam.desktop (100%) rename {etc/xdg/autostart => local/share/applications}/a-syncplay.desktop (100%) rename {etc/xdg/autostart => local/share/applications}/a-telegram.desktop (100%) rename {etc/xdg/autostart => local/share/applications}/a-thunderbird.desktop (100%) rename {etc/xdg/autostart => local/share/applications}/com.github.wwmm.easyeffects.desktop (100%) rename {etc/xdg/autostart => local/share/applications}/libreawoo.desktop (100%) diff --git a/etc/xdg/.gitignore b/etc/xdg/.gitignore new file mode 100644 index 00000000..1ccb22bd --- /dev/null +++ b/etc/xdg/.gitignore @@ -0,0 +1 @@ +autostart diff --git a/etc/xdg/autostart b/etc/xdg/autostart new file mode 120000 index 00000000..214158c4 --- /dev/null +++ b/etc/xdg/autostart @@ -0,0 +1 @@ +../../local/share/applications \ No newline at end of file diff --git a/etc/xdg/autostart/README.md b/etc/xdg/autostart/README.md deleted file mode 100644 index 1a59b370..00000000 --- a/etc/xdg/autostart/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# System-wide autostart files - -_Note: this directory is also being used as `~/.local/share/applications` -which populates the app menu, my autostart is thankfully not this -populated._ - -- redshift - app that changes screen temperature along the sun -- telegramdesktop - IM app, based on telegram-desktop package -- com.wire.WireDesktop - Wire flatpak based on the flatpak of the same name - -## `a-*.desktop` - -These files belong 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: - -```bash -sudo update-desktop-database -v /usr/local/share/applications -``` diff --git a/etc/xdg/autostart/SteamOS-kscreenlocker.desktop b/etc/xdg/autostart/SteamOS-kscreenlocker.desktop deleted file mode 120000 index 70a8b5d7..00000000 --- a/etc/xdg/autostart/SteamOS-kscreenlocker.desktop +++ /dev/null @@ -1 +0,0 @@ -../../../submodules/SteamDeckScreenLock/screenlock.desktop \ No newline at end of file diff --git a/local/share/applications b/local/share/applications deleted file mode 120000 index 537d5217..00000000 --- a/local/share/applications +++ /dev/null @@ -1 +0,0 @@ -../../etc/xdg/autostart \ No newline at end of file diff --git a/etc/xdg/autostart/.gitignore b/local/share/applications/.gitignore similarity index 100% rename from etc/xdg/autostart/.gitignore rename to local/share/applications/.gitignore diff --git a/local/share/applications/README.md b/local/share/applications/README.md new file mode 100644 index 00000000..f03ef8a4 --- /dev/null +++ b/local/share/applications/README.md @@ -0,0 +1,21 @@ +# `.desktop` entries + +These can be used for many things such as + +- `~/.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) + +## `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: + +```bash +sudo update-desktop-database -v /usr/local/share/applications +``` diff --git a/etc/xdg/autostart/a-brave-beta.desktop b/local/share/applications/a-brave-beta.desktop similarity index 100% rename from etc/xdg/autostart/a-brave-beta.desktop rename to local/share/applications/a-brave-beta.desktop diff --git a/etc/xdg/autostart/a-brave-nightly.desktop b/local/share/applications/a-brave-nightly.desktop similarity index 100% rename from etc/xdg/autostart/a-brave-nightly.desktop rename to local/share/applications/a-brave-nightly.desktop diff --git a/etc/xdg/autostart/a-brave.desktop b/local/share/applications/a-brave.desktop similarity index 100% rename from etc/xdg/autostart/a-brave.desktop rename to local/share/applications/a-brave.desktop diff --git a/etc/xdg/autostart/a-firefox.desktop b/local/share/applications/a-firefox.desktop similarity index 100% rename from etc/xdg/autostart/a-firefox.desktop rename to local/share/applications/a-firefox.desktop diff --git a/etc/xdg/autostart/a-google-chrome.desktop b/local/share/applications/a-google-chrome.desktop similarity index 100% rename from etc/xdg/autostart/a-google-chrome.desktop rename to local/share/applications/a-google-chrome.desktop diff --git a/etc/xdg/autostart/a-jami.desktop b/local/share/applications/a-jami.desktop similarity index 100% rename from etc/xdg/autostart/a-jami.desktop rename to local/share/applications/a-jami.desktop diff --git a/etc/xdg/autostart/a-microsoft-edge.desktop b/local/share/applications/a-microsoft-edge.desktop similarity index 100% rename from etc/xdg/autostart/a-microsoft-edge.desktop rename to local/share/applications/a-microsoft-edge.desktop diff --git a/etc/xdg/autostart/a-mpv.desktop b/local/share/applications/a-mpv.desktop similarity index 100% rename from etc/xdg/autostart/a-mpv.desktop rename to local/share/applications/a-mpv.desktop diff --git a/etc/xdg/autostart/a-signal.desktop b/local/share/applications/a-signal.desktop similarity index 100% rename from etc/xdg/autostart/a-signal.desktop rename to local/share/applications/a-signal.desktop diff --git a/etc/xdg/autostart/a-steam.desktop b/local/share/applications/a-steam.desktop similarity index 100% rename from etc/xdg/autostart/a-steam.desktop rename to local/share/applications/a-steam.desktop diff --git a/etc/xdg/autostart/a-syncplay.desktop b/local/share/applications/a-syncplay.desktop similarity index 100% rename from etc/xdg/autostart/a-syncplay.desktop rename to local/share/applications/a-syncplay.desktop diff --git a/etc/xdg/autostart/a-telegram.desktop b/local/share/applications/a-telegram.desktop similarity index 100% rename from etc/xdg/autostart/a-telegram.desktop rename to local/share/applications/a-telegram.desktop diff --git a/etc/xdg/autostart/a-thunderbird.desktop b/local/share/applications/a-thunderbird.desktop similarity index 100% rename from etc/xdg/autostart/a-thunderbird.desktop rename to local/share/applications/a-thunderbird.desktop diff --git a/etc/xdg/autostart/com.github.wwmm.easyeffects.desktop b/local/share/applications/com.github.wwmm.easyeffects.desktop similarity index 100% rename from etc/xdg/autostart/com.github.wwmm.easyeffects.desktop rename to local/share/applications/com.github.wwmm.easyeffects.desktop diff --git a/etc/xdg/autostart/libreawoo.desktop b/local/share/applications/libreawoo.desktop similarity index 100% rename from etc/xdg/autostart/libreawoo.desktop rename to local/share/applications/libreawoo.desktop