public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56774 from worldofpeace/mate/cleanup

Browse Source 
nixos/mate: cleanup
This commit is contained in:
Silvan Mosberger 2019-03-05 12:26:14 +01:00 committed by GitHub
commit 09c3fb0d75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nixos/modules/services/x11/desktop-managers/mate.nix
View File

@ -56,9 +56,6 @@ in
export XDG_MENU_PREFIX=mate- export XDG_MENU_PREFIX=mate-
# Find the mouse
export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons
# Let caja find extensions # Let caja find extensions
export CAJA_EXTENSION_DIRS=$CAJA_EXTENSION_DIRS''${CAJA_EXTENSION_DIRS:+:}${config.system.path}/lib/caja/extensions-2.0 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) # 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} ${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"} & ${pkgs.mate.mate-session-manager}/bin/mate-session ${optionalString cfg.debug "--debug"} &
waitPID=$! waitPID=$!
''; '';
@ -90,14 +84,20 @@ in
pkgs.mate.basePackages ++ pkgs.mate.basePackages ++
(pkgs.gnome3.removePackagesByName (pkgs.gnome3.removePackagesByName
pkgs.mate.extraPackages pkgs.mate.extraPackages
config.environment.mate.excludePackages); config.environment.mate.excludePackages) ++
[
services.dbus.packages = [ pkgs.desktop-file-utils
pkgs.gnome3.dconf pkgs.glib
pkgs.at-spi2-core 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-keyring.enable = true;
services.gnome3.gnome-settings-daemon.enable = true;
services.gnome3.gnome-settings-daemon.package = pkgs.mate.mate-settings-daemon;
services.gnome3.gvfs.enable = true; services.gnome3.gvfs.enable = true;
services.upower.enable = config.powerManagement.enable; services.upower.enable = config.powerManagement.enable;