summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-07-22 23:32:12 +0200
committerJan Tojnar <jtojnar@gmail.com>2018-08-01 19:14:30 +0200
commit0e1c01451fdc8f076ae99bb36c12e5107abf7c4e (patch)
treece40c158798b6cf6a36ca19df18b409ec0a24205 /nixos/modules
parentcc6d77c83fb3a382250fe11204eec0167bef092b (diff)
downloadnixlib-0e1c01451fdc8f076ae99bb36c12e5107abf7c4e.tar
nixlib-0e1c01451fdc8f076ae99bb36c12e5107abf7c4e.tar.gz
nixlib-0e1c01451fdc8f076ae99bb36c12e5107abf7c4e.tar.bz2
nixlib-0e1c01451fdc8f076ae99bb36c12e5107abf7c4e.tar.lz
nixlib-0e1c01451fdc8f076ae99bb36c12e5107abf7c4e.tar.xz
nixlib-0e1c01451fdc8f076ae99bb36c12e5107abf7c4e.tar.zst
nixlib-0e1c01451fdc8f076ae99bb36c12e5107abf7c4e.zip
nixos/gnome3: rely on xdg autostart for xdg-user-dirs
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/x11/desktop-managers/gnome3.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 9fb8f44b2421..08a7af59116f 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -161,9 +161,6 @@ in {
           # Find the mouse
           export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons
 
-          # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
-          ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
-
           ${pkgs.gnome3.gnome-session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &
           waitPID=$!
         '';
@@ -175,7 +172,9 @@ in {
                                                 "${pkgs.gnome3.glib-networking.out}/lib/gio/modules"
                                                 "${pkgs.gnome3.gvfs}/lib/gio/modules" ];
     environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath
-      ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages);
+      ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages) ++ [
+      pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
+    ];
 
     # Use the correct gnome3 packageSet
     networking.networkmanager.basePackages =