Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 67cc7a82544a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 09c3fb0d75ee
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 3, 2019

  1. nixos/mate: use gsd module

    @worldofpeace
    worldofpeace committed Mar 3, 2019
    Copy the full SHA
    812b88f View commit details

Commits on Mar 5, 2019

  1. nixos/mate: cleanup

    @worldofpeace
    worldofpeace committed Mar 5, 2019
    Copy the full SHA
    a00c5e3 View commit details

  2. Merge pull request #56774 from worldofpeace/mate/cleanup 

    nixos/mate: cleanup
    @infinisil
    infinisil authored Mar 5, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    09c3fb0 View commit details
Showing with 13 additions and 13 deletions.
  1. +13 −13 nixos/modules/services/x11/desktop-managers/mate.nix
26 changes: 13 additions & 13 deletions nixos/modules/services/x11/desktop-managers/mate.nix
View file
Original file line number Diff line number Diff line change
@@ -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,14 +84,20 @@ 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;
services.gnome3.gvfs.enable = true;
services.upower.enable = config.powerManagement.enable;