diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-05 01:45:28 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-05 06:00:49 -0400 |
| commit | 614c493592660156a500902bf755c1066841070d (patch) | |
| tree | 17a99601cf92384bdd7e2a85edb859bea5aec592 /pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix | |
| parent | 1f4b22cb37dbd8a3702f804882a0e10920255b10 (diff) | |
| download | nixlib-614c493592660156a500902bf755c1066841070d.tar nixlib-614c493592660156a500902bf755c1066841070d.tar.gz nixlib-614c493592660156a500902bf755c1066841070d.tar.bz2 nixlib-614c493592660156a500902bf755c1066841070d.tar.lz nixlib-614c493592660156a500902bf755c1066841070d.tar.xz nixlib-614c493592660156a500902bf755c1066841070d.tar.zst nixlib-614c493592660156a500902bf755c1066841070d.zip | |
pantheon.elementary-session-settings: use writeTextFile, change plank dirs
Adapts to plank launcher directory change.
Diffstat (limited to 'pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix')
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 69a1efa3e9e9..a264af51c569 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -12,6 +12,7 @@ , elementary-default-settings , elementary-settings-daemon , runtimeShell +, writeText }: let @@ -32,22 +33,28 @@ let #!${runtimeShell} elementary_default_settings="${elementary-default-settings}" - dock_items="$elementary_default_settings/share/elementary/config/plank/dock1/launchers"/* + dock_items="$elementary_default_settings/etc/skel/.config/plank/dock1/launchers"/* if [ ! -d "$HOME/.config/plank/dock1" ]; then echo "Instantiating default Plank Dockitems..." - mkdir -p $HOME/.config/plank/dock1/launchers - cp -r --no-preserve=mode,ownership $dock_items $HOME/.config/plank/dock1/launchers/ + mkdir -p "$HOME/.config/plank/dock1/launchers" + cp -r --no-preserve=mode,ownership $dock_items "$HOME/.config/plank/dock1/launchers/" else echo "Plank Dockitems already instantiated" fi ''; - dockitemAutostart = substituteAll { - src = ./default-elementary-dockitems.desktop; - script = dockitems-script; - }; + dockitemAutostart = writeText "default-elementary-dockitems.desktop" '' + [Desktop Entry] + Type=Application + Name=Instantiate Default elementary dockitems + Exec=${dockitems-script} + StartupNotify=false + NoDisplay=true + OnlyShowIn=Pantheon; + X-GNOME-Autostart-Phase=EarlyInitialization + ''; executable = writeScript "pantheon" '' export XDG_CONFIG_DIRS=${elementary-settings-daemon}/etc/xdg:${elementary-default-settings}/etc:$XDG_CONFIG_DIRS |