summary refs log tree commit diff
path: root/nixos/modules/services/x11/desktop-managers/mate.nix
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2019-03-03 04:12:12 -0500
committerworldofpeace <worldofpeace@users.noreply.github.com>2019-03-04 21:07:01 -0500
commita00c5e301e177fbb84e8068c4ba225beae869396 (patch)
treee53c2e215a2b94246c63ff82751fdff6a6c8d028 /nixos/modules/services/x11/desktop-managers/mate.nix
parent812b88f90232f568a598a36cd37de97bb79bb62a (diff)
downloadnixpkgs-a00c5e301e177fbb84e8068c4ba225beae869396.tar
nixpkgs-a00c5e301e177fbb84e8068c4ba225beae869396.tar.gz
nixpkgs-a00c5e301e177fbb84e8068c4ba225beae869396.tar.bz2
nixpkgs-a00c5e301e177fbb84e8068c4ba225beae869396.tar.lz
nixpkgs-a00c5e301e177fbb84e8068c4ba225beae869396.tar.xz
nixpkgs-a00c5e301e177fbb84e8068c4ba225beae869396.tar.zst
nixpkgs-a00c5e301e177fbb84e8068c4ba225beae869396.zip
nixos/mate: cleanup
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers/mate.nix')
-rw-r--r--nixos/modules/services/x11/desktop-managers/mate.nix24
1 files changed, 11 insertions, 13 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index 4c46104ccaa..bf6685ff7ea 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -56,9 +56,6 @@ in
 
         export XDG_MENU_PREFIX=mate-
 
-        # Find the mouse
-        export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons
-
         # Let caja find extensions
         export CAJA_EXTENSION_DIRS=$CAJA_EXTENSION_DIRS''${CAJA_EXTENSION_DIRS:+:}${config.system.path}/lib/caja/extensions-2.0
 
@@ -78,9 +75,6 @@ in
         # Add mate-control-center paths to some XDG variables because its schemas are needed by mate-settings-daemon, and mate-settings-daemon is a dependency for mate-control-center (that is, they are mutually recursive)
         ${addToXDGDirs pkgs.mate.mate-control-center}
 
-        # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
-        ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
-
         ${pkgs.mate.mate-session-manager}/bin/mate-session ${optionalString cfg.debug "--debug"} &
         waitPID=$!
       '';
@@ -90,13 +84,17 @@ in
       pkgs.mate.basePackages ++
       (pkgs.gnome3.removePackagesByName
         pkgs.mate.extraPackages
-        config.environment.mate.excludePackages);
-
-    services.dbus.packages = [
-      pkgs.gnome3.dconf
-      pkgs.at-spi2-core
-    ];
-
+        config.environment.mate.excludePackages) ++
+      [
+        pkgs.desktop-file-utils
+        pkgs.glib
+        pkgs.gtk3.out
+        pkgs.shared-mime-info
+        pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
+      ];
+
+    programs.dconf.enable = true;
+    services.gnome3.at-spi2-core.enable = true;
     services.gnome3.gnome-keyring.enable = true;
     services.gnome3.gnome-settings-daemon.enable = true;
     services.gnome3.gnome-settings-daemon.package = pkgs.mate.mate-settings-daemon;