From e9de3408273b4e9a8b9f40ce432d2efb4aef7a50 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 29 Oct 2021 08:51:24 +0800 Subject: [PATCH 1/3] xdg-desktop-portal-pantheon: 1.0.0 -> 1.0.1 --- .../libraries/xdg-desktop-portal-pantheon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-pantheon/default.nix b/pkgs/development/libraries/xdg-desktop-portal-pantheon/default.nix index ec43ff179d44..68a187418343 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-pantheon/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-pantheon/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-pantheon"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "portals"; rev = version; - sha256 = "sha256-uPZUeyyn7HZwcBksY6X5s1bpbIRwqdCNfZKnkynVD+8="; + sha256 = "sha256-8gBMjCMEzrFmKHhkXsgcIESC93EOT0ADkRUIJMmerjw="; }; nativeBuildInputs = [ From 6629b16e78f101f67260c28192491816bcd8d0e9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 29 Oct 2021 09:10:40 +0800 Subject: [PATCH 2/3] nixos/pantheon: install elementary-tasks by default --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 578097f3367c..5a41f96497f2 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -283,6 +283,7 @@ in elementary-music elementary-photos elementary-screenshot + elementary-tasks elementary-terminal elementary-videos epiphany From af2ac84863bb15c26c7c3d5c2fd08ac492de1cbe Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 29 Oct 2021 09:11:42 +0800 Subject: [PATCH 3/3] pantheon.elementary-default-settings: add dockitem for elementary-tasks --- .../pantheon/desktop/elementary-default-settings/default.nix | 5 ++--- .../launchers/io.elementary.tasks.dockitem | 2 ++ .../overrides/plank-dockitems.gschema.override | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.tasks.dockitem diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index f302fd994025..a3dd5a694373 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -60,9 +60,8 @@ stdenv.mkDerivation rec { ''; preInstall = '' - # Install our override for plank dockitems as Appcenter and Tasks is not ready to be preinstalled. - # For Appcenter, see: https://github.com/NixOS/nixpkgs/issues/70214. - # For Tasks, see: https://github.com/elementary/tasks/issues/243#issuecomment-846259496 + # Install our override for plank dockitems as Appcenter is not ready to be preinstalled. + # See: https://github.com/NixOS/nixpkgs/issues/70214. schema_dir=$out/share/glib-2.0/schemas install -D ${./overrides/plank-dockitems.gschema.override} $schema_dir/plank-dockitems.gschema.override diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.tasks.dockitem b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.tasks.dockitem new file mode 100644 index 000000000000..a98825afcb28 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.tasks.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///run/current-system/sw/share/applications/io.elementary.tasks.desktop diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override b/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override index b3ca51853b79..426368e8473b 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override @@ -1,2 +1,2 @@ [net.launchpad.plank.dock.settings] -dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem'] +dock-items=['gala-multitaskingview.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']