Revert Plank removal (#311)

debian/install

@@ -3,6 +3,7 @@ accountsservice/io.elementary.pantheon.AccountsService.policy /usr/share/polkit-
 skel/flatpak/repo/appcenter.trustedkeys.gpg /etc/skel/.local/share/flatpak/repo/
 skel/flatpak/repo/flathub.trustedkeys.gpg /etc/skel/.local/share/flatpak/repo/
 skel/flatpak/repo/config /etc/skel/.local/share/flatpak/repo/
+skel/plank/dock1 /etc/skel/.config/plank/
 sessioninstaller/sessioninstaller.desktop /usr/share/applications/
 sudoers.d/* /etc/sudoers.d/
 skel/.inputrc /etc/skel/

meson_options.txt

@@ -13,6 +13,11 @@ option('default-wallpaper-dark',
        value: '',
        description: 'Path to dark wallpaper to use in Pantheon.')
 
+option('plank-dockitems',
+       type: 'boolean',
+       value: true,
+       description: 'Install default Pantheon Plank dockitems')
+
 option('default-gsettings-overrides',
        type: 'boolean',
        value: true,

overrides/meson.build

@@ -13,3 +13,11 @@ if get_option('default-gsettings-overrides')
         install_dir: schemadir
     )
 endif
+
+# Install conditionally because it's dependent on our dockitems being installed
+if get_option('plank-dockitems')
+    install_data(
+        'plank-dockitems.gschema.override',
+        install_dir: schemadir
+    )
+endif

overrides/plank-dockitems.gschema.override

@@ -0,0 +1,2 @@
+[net.launchpad.plank.dock.settings:Pantheon]
+dock-items=['gala-multitaskingview.dockitem', 'io.elementary.files.dockitem', 'org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem', 'io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem']

skel/meson.build

@@ -1,5 +1,13 @@
 skeldir = sysconfdir / 'skel'
 
+# Planks Default DockItems
+if get_option('plank-dockitems')
+    install_subdir(
+        'plank',
+        install_dir: skeldir / '.config'
+    )
+endif
+
 # AppCenter Flatpak Remote
 if get_option('appcenter-flatpak')
     install_subdir(

skel/plank/dock1/launchers/gala-multitaskingview.dockitem

@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/gala-multitaskingview.desktop

skel/plank/dock1/launchers/io.elementary.appcenter.dockitem

@@ -0,0 +1,4 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/io.elementary.appcenter.desktop
+
+

skel/plank/dock1/launchers/io.elementary.calendar.dockitem

@@ -0,0 +1,4 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/io.elementary.calendar.desktop
+
+

skel/plank/dock1/launchers/io.elementary.files.dockitem

@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/io.elementary.files.desktop

skel/plank/dock1/launchers/io.elementary.mail.dockitem

@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/io.elementary.mail.desktop

skel/plank/dock1/launchers/io.elementary.music.dockitem

@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///var/lib/flatpak/exports/share/applications/io.elementary.music.desktop

skel/plank/dock1/launchers/io.elementary.photos.dockitem

@@ -0,0 +1,3 @@
+[PlankDockItemPreferences]
+Launcher=file:///var/lib/flatpak/exports/share/applications/io.elementary.photos.desktop
+

skel/plank/dock1/launchers/io.elementary.switchboard.dockitem

@@ -0,0 +1,3 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/io.elementary.switchboard.desktop
+

skel/plank/dock1/launchers/io.elementary.tasks.dockitem

@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/io.elementary.tasks.desktop

skel/plank/dock1/launchers/io.elementary.videos.dockitem

@@ -0,0 +1,3 @@
+[PlankDockItemPreferences]
+Launcher=file:///var/lib/flatpak/exports/share/applications/io.elementary.videos.desktop
+

skel/plank/dock1/launchers/org.gnome.Epiphany.dockitem

@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///var/lib/flatpak/exports/share/applications/org.gnome.Epiphany.desktop