From 7450f6435623df948e54934f4b90adcbf7d9189b Mon Sep 17 00:00:00 2001 From: SolidHal Date: Fri, 14 Sep 2018 15:38:03 +0000 Subject: [PATCH] fixup plank setup for xfce --- .../plank/plank-launchers/Thunar.dockitem | 2 ++ .../plank-launchers/firefox-esr.dockitem | 2 ++ .../plank/plank-launchers/mousepad.dockitem | 2 ++ .../plank/plank-launchers/vlc.dockitem | 2 ++ .../plank/plank-launchers/xfcalendar.dockitem | 2 ++ .../plank-launchers/xfce4-terminal.dockitem | 2 ++ .../xfce-config/plank/plank.dconf | 21 ------------------- .../xfce-config/plank/plank.desktop | 6 ++++++ scripts/InstallScripts/InstallPackages.sh | 12 ++++++++--- 9 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 resources/InstallResources/xfce-config/plank/plank-launchers/Thunar.dockitem create mode 100644 resources/InstallResources/xfce-config/plank/plank-launchers/firefox-esr.dockitem create mode 100644 resources/InstallResources/xfce-config/plank/plank-launchers/mousepad.dockitem create mode 100644 resources/InstallResources/xfce-config/plank/plank-launchers/vlc.dockitem create mode 100644 resources/InstallResources/xfce-config/plank/plank-launchers/xfcalendar.dockitem create mode 100644 resources/InstallResources/xfce-config/plank/plank-launchers/xfce4-terminal.dockitem delete mode 100644 resources/InstallResources/xfce-config/plank/plank.dconf create mode 100644 resources/InstallResources/xfce-config/plank/plank.desktop diff --git a/resources/InstallResources/xfce-config/plank/plank-launchers/Thunar.dockitem b/resources/InstallResources/xfce-config/plank/plank-launchers/Thunar.dockitem new file mode 100644 index 0000000..dcabe92 --- /dev/null +++ b/resources/InstallResources/xfce-config/plank/plank-launchers/Thunar.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///usr/share/applications/Thunar.desktop diff --git a/resources/InstallResources/xfce-config/plank/plank-launchers/firefox-esr.dockitem b/resources/InstallResources/xfce-config/plank/plank-launchers/firefox-esr.dockitem new file mode 100644 index 0000000..851a492 --- /dev/null +++ b/resources/InstallResources/xfce-config/plank/plank-launchers/firefox-esr.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///usr/share/applications/firefox-esr.desktop diff --git a/resources/InstallResources/xfce-config/plank/plank-launchers/mousepad.dockitem b/resources/InstallResources/xfce-config/plank/plank-launchers/mousepad.dockitem new file mode 100644 index 0000000..1d9718a --- /dev/null +++ b/resources/InstallResources/xfce-config/plank/plank-launchers/mousepad.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///usr/share/applications/mousepad.desktop diff --git a/resources/InstallResources/xfce-config/plank/plank-launchers/vlc.dockitem b/resources/InstallResources/xfce-config/plank/plank-launchers/vlc.dockitem new file mode 100644 index 0000000..c20771a --- /dev/null +++ b/resources/InstallResources/xfce-config/plank/plank-launchers/vlc.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///usr/share/applications/vlc.desktop diff --git a/resources/InstallResources/xfce-config/plank/plank-launchers/xfcalendar.dockitem b/resources/InstallResources/xfce-config/plank/plank-launchers/xfcalendar.dockitem new file mode 100644 index 0000000..848c5a2 --- /dev/null +++ b/resources/InstallResources/xfce-config/plank/plank-launchers/xfcalendar.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///usr/share/applications/xfcalendar.desktop diff --git a/resources/InstallResources/xfce-config/plank/plank-launchers/xfce4-terminal.dockitem b/resources/InstallResources/xfce-config/plank/plank-launchers/xfce4-terminal.dockitem new file mode 100644 index 0000000..2fc64b3 --- /dev/null +++ b/resources/InstallResources/xfce-config/plank/plank-launchers/xfce4-terminal.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///usr/share/applications/xfce4-terminal.desktop diff --git a/resources/InstallResources/xfce-config/plank/plank.dconf b/resources/InstallResources/xfce-config/plank/plank.dconf deleted file mode 100644 index 95d655b..0000000 --- a/resources/InstallResources/xfce-config/plank/plank.dconf +++ /dev/null @@ -1,21 +0,0 @@ -[dock1] -icon-size=42 -show-dock-item=false -position='bottom' -dock-items=['xfcalendar.dockitem', 'firefox-esr.dockitem'] -unhide-delay=0 -items-alignment='center' -theme='Default' -hide-mode='none' -pinned-only=false -auto-pinning=true -alignment='center' -zoom-percent=150 -hide-delay=0 -zoom-enabled=false -monitor='' -lock-items=false -tooltips-enabled=true -pressure-reveal=false -offset=0 -current-workspace-only=false diff --git a/resources/InstallResources/xfce-config/plank/plank.desktop b/resources/InstallResources/xfce-config/plank/plank.desktop new file mode 100644 index 0000000..706e2a6 --- /dev/null +++ b/resources/InstallResources/xfce-config/plank/plank.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Plank +Comment=Plank Dock +Exec=/usr/bin/plank +Type=Application diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh index adea07c..a78c8cb 100755 --- a/scripts/InstallScripts/InstallPackages.sh +++ b/scripts/InstallScripts/InstallPackages.sh @@ -30,10 +30,10 @@ apt install -y wicd-daemon wicd wicd-curses wicd-gtk [ "$DE" = "xfce" ] && cp $DIR/xfce-config/lightdm/* /etc/lightdm/ #Copy in wallpapers [ "$DE" = "xfce" ] && rm /usr/share/images/desktop-base/default && cp $DIR/wallpapers/* /usr/share/images/desktop-base/ -#Load in Plank settings -[ "$DE" = "xfce" ] && cat $DIR/xfce-config/plank/plank.dconf | dconf load /net/launchpad/plank/docks/ - +#Make plank autostart +[ "$DE" = "xfce" ] && mkdir -p /etc/xdg/autostart/ +[ "$DE" = "xfce" ] && cp $DIR/plank/plank.desktop /etc/xdg/autostart/ #Copy in acpi, pulse audio, trackpad settings, funtion key settings @@ -51,4 +51,10 @@ adduser $username usermod -a -G sudo,netdev $username +#install plank launchers +[ "$DE" = "xfce" ] && mkdir -p /home/$username/.config/plank/dock1/launchers/ +[ "$DE" = "xfce" ] && cp $DIR/xfce-config/plank/plank-launchers/* /home/$username/.config/plank/dock1/launchers/ + + + reboot