diff --git a/snowblocks/xdg/README.md b/snowblocks/xdg/README.md index 3b88b90..92d83e6 100644 --- a/snowblocks/xdg/README.md +++ b/snowblocks/xdg/README.md @@ -1,39 +1,26 @@ -* [Application Desktop Entries](#application-desktop-entries) -* [Autostart](#autostart) -* [Bookmarks](#bookmarks) -* [User Directories](#user-directories) +## _XDG_ Application Desktop Launchers -### Application Desktop Entries +All application `*.desktop` launcher files adhere the [_XDG_ Desktop Entry Specification][fd-spec-desktop-entry]. -All application `*.desktop` entry files adhere the freedesktop [Desktop Entry Specification][fd-spec-desktop-entry]. +See the _Arch Linux wiki_ page about [desktop entries][archw-desktop_entries] for more details. -Read the [Arch Linux Wiki][archw-desktop-entries] site for detailed information and examples. +## _XDG_ Autostart -### Autostart +In an _XDG_-compliant desktop environment, such as [GNOME][], the desktop environment will automatically start `*.desktop` files found in the directories specified in the [Desktop Application Autostart Specification][fd-spec-autostart]: -In an XDG-compliant desktop environment, such as GNOME, the desktop environment will automatically start `*.desktop` files found in the directories specified in the [Desktop Application Autostart Specification][fd-spec-autostart]: +- System-wide: `$XDG_CONFIG_DIRS/autostart/` (`/etc/xdg/autostart/` by default) + - GNOME also starts files found in `/usr/share/gnome/autostart` +- User-level: `$XDG_CONFIG_HOME/autostart` (`~/.config/autostart/` by default) -* System-wide: `$XDG_CONFIG_DIRS/autostart/` (`/etc/xdg/autostart/` by default) - * GNOME also starts files found in `/usr/share/gnome/autostart/` -* User-specific: `$XDG_CONFIG_HOME/autostart/` (`~/.config/autostart/` by default) +See the _Arch Linux_ wiki page about [desktop autostart entries][archw-desktop_entries#autostart] for more details. -System-wide `*.desktop` files can be overridden via the user-specific `~/.config/autostart/` folder. +## _XDG_ User Directories -References: +All user directory configurations adhere the _freedesktop_/_XDG_ [user directories specification][archw-xdg_user_dir]. -* [Arch Linux Wiki - Desktop Entries (Autostart)][archw-desktop-entries-autostart] - -### Bookmarks - -All bookmark configurations adhere the freedesktop [Desktop Bookmark Specification][fd-spec-bookmark]. - -### User Directories - -All user directory configurations adhere the freedesktop [XDG user directories][archw-xdg-user-dir] specification. - -[archw-desktop-entries]: https://wiki.archlinux.org/index.php/Desktop_entries -[archw-desktop-entries-autostart]: https://wiki.archlinux.org/index.php/Desktop_entries#Autostart -[archw-xdg-user-dir]: https://wiki.archlinux.org/index.php/XDG_user_directories +[archw-desktop_entries]: https://wiki.archlinux.org/index.php/Desktop_entries +[archw-desktop_entries#autostart]: https://wiki.archlinux.org/index.php/Desktop_entries#Autostart +[archw-xdg_user_dir]: https://wiki.archlinux.org/index.php/XDG_user_directories [fd-spec-autostart]: https://specifications.freedesktop.org/autostart-spec/autostart-spec-latest.html -[fd-spec-bookmark]: https://www.freedesktop.org/wiki/Specifications/desktop-bookmark-spec/ -[fd-spec-desktop-entry]: https://specifications.freedesktop.org/desktop-entry-spec/latest/ +[fd-spec-desktop-entry]: https://specifications.freedesktop.org/desktop-entry-spec/latest +[gnome]: https://www.gnome.org diff --git a/snowblocks/xdg/applications/atom.desktop b/snowblocks/xdg/applications/atom.desktop deleted file mode 100644 index a3c7025..0000000 --- a/snowblocks/xdg/applications/atom.desktop +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (C) 2016-present Arctic Ice Studio -# Copyright (C) 2016-present Sven Greb - -# Project: igloo -# Repository: https://github.com/arcticicestudio/igloo -# License: MIT - -[Desktop Entry] -Type=Application -Name=Atom -Icon=atom -Exec=/usr/lib/atom/atom %F -StartupNotify=true -MimeType=text/plain;text/css;text/java;text/md;text/markupdescription;text/readme;text/h;text/c;text/cpp;text/cp;text/js;text/xml;text/schema;text/x-sass;text/x-less;text/markdown; -Actions=dev-mode; - -[Desktop Action dev-mode] -Name=DevMode -Exec=atom --dev diff --git a/snowblocks/xdg/applications/evolution.desktop b/snowblocks/xdg/applications/evolution.desktop deleted file mode 100644 index 8304cc9..0000000 --- a/snowblocks/xdg/applications/evolution.desktop +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2016-present Arctic Ice Studio -# Copyright (C) 2016-present Sven Greb - -# Project: igloo -# Repository: https://github.com/arcticicestudio/igloo -# License: MIT - -[Desktop Entry] -Type=Application -Name=Evolution -Exec=evolution --offline %U -Icon=evolution -StartupNotify=true -X-GNOME-UsesNotifications=true -MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto; -Keywords=email;calendar;contact;addressbook;task; -Actions=compose; - -[Desktop Action compose] -Name=Compose a message -Exec=evolution mailto: diff --git a/snowblocks/xdg/applications/gpick.desktop b/snowblocks/xdg/applications/gpick.desktop deleted file mode 100644 index 6e8d441..0000000 --- a/snowblocks/xdg/applications/gpick.desktop +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (C) 2016-present Arctic Ice Studio -# Copyright (C) 2016-present Sven Greb - -# Project: igloo -# Repository: https://github.com/arcticicestudio/igloo -# License: MIT - -[Desktop Entry] -Type=Application -Name=Gpick -Icon=gpick -Exec=gpick -StartupNotify=true -MimeType=text/x-utility;application/x-gpick-color-palette; diff --git a/snowblocks/xdg/applications/gtkhash.desktop b/snowblocks/xdg/applications/gtkhash.desktop deleted file mode 100644 index 1296dd2..0000000 --- a/snowblocks/xdg/applications/gtkhash.desktop +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (C) 2016-present Arctic Ice Studio -# Copyright (C) 2016-present Sven Greb - -# Project: igloo -# Repository: https://github.com/arcticicestudio/igloo -# License: MIT - -[Desktop Entry] -Type=Application -Name=GtkHash -Icon=gtkhash -Exec=gtkhash -StartupNotify=true -Keywords=hash;checksum;digest;md5;sha1;sha256;sha512;whirlpool;crc32 diff --git a/snowblocks/xdg/applications/jetbrains-idea.desktop b/snowblocks/xdg/applications/jetbrains-idea.desktop deleted file mode 100644 index 272e884..0000000 --- a/snowblocks/xdg/applications/jetbrains-idea.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=IntelliJ IDEA Ultimate Edition -Exec=intellij-idea-ultimate-edition %u -Icon=idea -Terminal=false -StartupWMClass=jetbrains-idea -Type=Application diff --git a/snowblocks/xdg/applications/org.gnome.gedit.desktop b/snowblocks/xdg/applications/org.gnome.gedit.desktop deleted file mode 100644 index 6c2cb2f..0000000 --- a/snowblocks/xdg/applications/org.gnome.gedit.desktop +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2016-present Arctic Ice Studio -# Copyright (C) 2016-present Sven Greb - -# Project: igloo -# Repository: https://github.com/arcticicestudio/igloo -# License: MIT - -[Desktop Entry] -Type=Application -Name=Gedit -Icon=gedit -Exec=gedit %U -StartupNotify=true -DBusActivatable=true -MimeType=text/plain;text/css;text/java;text/md;text/markupdescription;text/markdown;text/github-flavored-markdown;text/readme;text/h;text/c;text/cpp;text/cp;text/js;text/xml;text/schema; diff --git a/snowblocks/xdg/applications/shotwell-viewer.desktop b/snowblocks/xdg/applications/shotwell-viewer.desktop deleted file mode 100644 index 0005d09..0000000 --- a/snowblocks/xdg/applications/shotwell-viewer.desktop +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2016-present Arctic Ice Studio -# Copyright (C) 2016-present Sven Greb - -# Project: igloo -# Repository: https://github.com/arcticicestudio/igloo -# License: MIT - -[Desktop Entry] -Type=Application -Name=Shotwell Viewer -NoDisplay=true -Exec= diff --git a/snowblocks/xdg/autostart/dropbox.desktop b/snowblocks/xdg/autostart/dropbox.desktop deleted file mode 100644 index b81e884..0000000 --- a/snowblocks/xdg/autostart/dropbox.desktop +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2016-present Arctic Ice Studio -# Copyright (C) 2016-present Sven Greb - -# Project: igloo -# Repository: https://github.com/arcticicestudio/igloo -# License: MIT - -[Desktop Entry] -Type=Application -Name=Dropbox -Exec=dropbox -Icon=dropbox diff --git a/snowblocks/xdg/autostart/plank.desktop.igloo b/snowblocks/xdg/autostart/plank.desktop.polarbear similarity index 92% rename from snowblocks/xdg/autostart/plank.desktop.igloo rename to snowblocks/xdg/autostart/plank.desktop.polarbear index c91a03c..a8260f6 100644 --- a/snowblocks/xdg/autostart/plank.desktop.igloo +++ b/snowblocks/xdg/autostart/plank.desktop.polarbear @@ -8,5 +8,5 @@ [Desktop Entry] Name=Plank Type=Application -Exec=plank -n igloo +Exec=plank -n polarbear Icon=plank diff --git a/snowblocks/xdg/gtk-3.0/bookmarks-igloo.igloocrypt b/snowblocks/xdg/gtk-3.0/bookmarks-igloo.igloocrypt deleted file mode 100644 index 1c385ec..0000000 Binary files a/snowblocks/xdg/gtk-3.0/bookmarks-igloo.igloocrypt and /dev/null differ diff --git a/snowblocks/xdg/gtk-3.0/settings.ini b/snowblocks/xdg/gtk-3.0/settings.ini index 564e432..0d69496 100644 --- a/snowblocks/xdg/gtk-3.0/settings.ini +++ b/snowblocks/xdg/gtk-3.0/settings.ini @@ -7,5 +7,5 @@ [Settings] gtk-application-prefer-dark-theme=0 -gtk-button-images=1 +gtk-button-images=0 gtk-menu-images=0 diff --git a/snowblocks/xdg/snowblock.json b/snowblocks/xdg/snowblock.json index 86230df..4d6a420 100644 --- a/snowblocks/xdg/snowblock.json +++ b/snowblocks/xdg/snowblock.json @@ -1,86 +1,50 @@ [ { "clean": [ - "~/.config", - "~/.config/autostart", - "~/.config/gtk-3.0", - "~/.local/share/applications" + "$XDG_CONFIG_HOME", + "$XDG_CONFIG_HOME/autostart", + "$XDG_CONFIG_HOME/gtk-3.0", + "$XDG_DATA_HOME/applications" ] }, { "link": { - "~/.config/user-dirs.conf": { - "force": true - }, - "~/.config/user-dirs.dirs": { - "force": true - }, - "~/.config/user-dirs.locale": { - "force": true - }, - "~/.config/gtk-3.0/bookmarks": { + "$XDG_DATA_HOME/applications/minecraft.desktop": { "create": true, "force": true, "hosts": { - "igloo": "gtk-3.0/bookmarks-igloo.igloocrypt" + "polarbear": "applications/minecraft.desktop" } }, - "~/.local/share/applications/atom.desktop": { - "create": true, - "force": true, - "path": "applications/atom.desktop" - }, - "~/.local/share/applications/evolution.desktop": { - "create": true, - "force": true, - "path": "applications/evolution.desktop" - }, - "~/.local/share/applications/gpick.desktop": { - "create": true, - "force": true, - "path": "applications/gpick.desktop" - }, - "~/.local/share/applications/gtkhash.desktop": { - "create": true, - "force": true, - "path": "applications/gtkhash.desktop" - }, - "~/.local/share/applications/minecraft.desktop": { - "create": true, - "force": true, - "path": "applications/minecraft.desktop" - }, - "~/.local/share/applications/org.gnome.gedit.desktop": { - "create": true, - "force": true, - "path": "applications/org.gnome.gedit.desktop" - }, - "~/.local/share/applications/org.gnome.Screenshot.desktop": { + "$XDG_DATA_HOME/applications/org.gnome.Screenshot.desktop": { "create": true, "force": true, - "path": "applications/org.gnome.Screenshot.desktop" - }, - "~/.local/share/applications/shotwell-viewer.desktop": { - "create": true, - "force": true, - "path": "applications/shotwell-viewer.desktop" + "hosts": { + "polarbear": "applications/org.gnome.Screenshot.desktop" + } }, - "~/.config/autostart/dropbox.desktop": { + "$XDG_CONFIG_HOME/autostart/plank.desktop": { "create": true, "force": true, - "path": "autostart/dropbox.desktop" + "hosts": { + "polarbear": "autostart/plank.desktop.polarbear" + } }, - "~/.config/autostart/plank.desktop": { + "$XDG_CONFIG_HOME/gtk-3.0/settings.ini": { "create": true, "force": true, "hosts": { - "igloo": "autostart/plank.desktop.igloo" + "polarbear": "gtk-3.0/settings.ini" } }, - "~/.config/gtk-3.0/settings.ini": { - "create": true, - "force": true, - "path": "gtk-3.0/settings.ini" + "$XDG_CONFIG_HOME/user-dirs.conf": { + "force": true + }, + "$XDG_CONFIG_HOME/user-dirs.dirs": { + "force": true + }, + "$XDG_CONFIG_HOME/user-dirs.locale": { + "force": true } } } diff --git a/snowblocks/xdg/user-dirs.dirs b/snowblocks/xdg/user-dirs.dirs index f9e5811..329cd86 100644 --- a/snowblocks/xdg/user-dirs.dirs +++ b/snowblocks/xdg/user-dirs.dirs @@ -7,11 +7,8 @@ XDG_DESKTOP_DIR="$HOME/desktop" Desktop XDG_DOCUMENTS_DIR="$HOME/documents" Documents -XDG_TEMPLATES_DIR="$HOME/code/snippetbox/gists" XDG_DOWNLOAD_DIR="$HOME/downloads" Downloads XDG_MUSIC_DIR="$HOME/music" Music XDG_PICTURES_DIR="$HOME/images" Images +XDG_TEMPLATES_DIR="$HOME/code/snippetbox/gists" XDG_VIDEOS_DIR="$HOME/videos" Videos - -# Public share directory is currently disabled -#XDG_PUBLICSHARE_DIR="$HOME/public/share"