diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-05 22:23:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-05 22:23:32 -0400 |
| commit | 92e9009172a8ae5d26a5ddc6eb0b2a8cbb394637 (patch) | |
| tree | 05d696298a8086cc130656c34642564da3071bac /nixos | |
| parent | ce5ddc23c0846144d135e68709e54510564134f5 (diff) | |
| parent | 9683e64ff5b4a07418c18af4c115f906d02a756d (diff) | |
| download | nixlib-92e9009172a8ae5d26a5ddc6eb0b2a8cbb394637.tar nixlib-92e9009172a8ae5d26a5ddc6eb0b2a8cbb394637.tar.gz nixlib-92e9009172a8ae5d26a5ddc6eb0b2a8cbb394637.tar.bz2 nixlib-92e9009172a8ae5d26a5ddc6eb0b2a8cbb394637.tar.lz nixlib-92e9009172a8ae5d26a5ddc6eb0b2a8cbb394637.tar.xz nixlib-92e9009172a8ae5d26a5ddc6eb0b2a8cbb394637.tar.zst nixlib-92e9009172a8ae5d26a5ddc6eb0b2a8cbb394637.zip | |
Merge pull request #84215 from worldofpeace/pantheon-update-04-03
Pantheon update 2020-04-03
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/pantheon.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/pantheon.xml | 16 |
2 files changed, 1 insertions, 18 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 869c66944897..9782b950dad6 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -181,7 +181,6 @@ in hicolor-icon-theme lightlocker onboard - plank qgnomeplatform shared-mime-info sound-theme-freedesktop @@ -195,6 +194,7 @@ in # Desktop elementary-default-settings + elementary-dock elementary-session-settings elementary-shortcut-overlay gala @@ -206,7 +206,6 @@ in }) # Services - cerbere elementary-capnet-assist elementary-dpms-helper elementary-settings-daemon diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixos/modules/services/x11/desktop-managers/pantheon.xml index 4d92a7446c0d..9541f2cfd4ee 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ b/nixos/modules/services/x11/desktop-managers/pantheon.xml @@ -89,22 +89,6 @@ switchboard-with-plugs.override { </para> </listitem> </varlistentry> - <varlistentry xml:id="sec-pantheon-faq-slow-shutdown"> - <term> - Using Pantheon sometimes makes my shutdown take a long time. - </term> - <listitem> - <para> - We have not yet determined what processes fight with systemd during shutdown, there are many reports. In elementary OS the default system timeout is lowered to lessen the impact of the issue. If you'd like to do this in NixOS, set -<programlisting> - <xref linkend="opt-systemd.extraConfig"/> = '' - DefaultTimeoutStopSec=10s - DefaultTimeoutStartSec=10s -''; -</programlisting> - </para> - </listitem> - </varlistentry> <varlistentry xml:id="sec-pantheon-faq-gnome3-and-pantheon"> <term> I cannot enable both GNOME 3 and Pantheon. |