diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-13 17:32:12 -0500 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-18 16:30:09 -0500 |
| commit | b9db3f8ca0f880cf0623cb34822c9d4949ff2bf2 (patch) | |
| tree | 5a858f99e061367db010132190d7b15223a07ec9 /nixos/modules | |
| parent | 1b96f9b68c728985bb94bb19c095330538827138 (diff) | |
| download | nixlib-b9db3f8ca0f880cf0623cb34822c9d4949ff2bf2.tar nixlib-b9db3f8ca0f880cf0623cb34822c9d4949ff2bf2.tar.gz nixlib-b9db3f8ca0f880cf0623cb34822c9d4949ff2bf2.tar.bz2 nixlib-b9db3f8ca0f880cf0623cb34822c9d4949ff2bf2.tar.lz nixlib-b9db3f8ca0f880cf0623cb34822c9d4949ff2bf2.tar.xz nixlib-b9db3f8ca0f880cf0623cb34822c9d4949ff2bf2.tar.zst nixlib-b9db3f8ca0f880cf0623cb34822c9d4949ff2bf2.zip | |
nixos/mate: use upstream session
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/mate.nix | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index 910a246d776c..5183f8b747cd 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -44,35 +44,32 @@ in config = mkIf cfg.enable { - services.xserver.desktopManager.session = singleton { - name = "mate"; - bgSupport = true; - start = '' - export XDG_MENU_PREFIX=mate- + services.xserver.displayManager.sessionPackages = [ + pkgs.mate.mate-session-manager + ]; - # Let caja find extensions - export CAJA_EXTENSION_DIRS=$CAJA_EXTENSION_DIRS''${CAJA_EXTENSION_DIRS:+:}${config.system.path}/lib/caja/extensions-2.0 + services.xserver.displayManager.sessionCommands = '' + if test "$XDG_CURRENT_DESKTOP" = "MATE"; then + export XDG_MENU_PREFIX=mate- - # Let caja extensions find gsettings schemas - ${concatMapStrings (p: '' + # Let caja find extensions + export CAJA_EXTENSION_DIRS=$CAJA_EXTENSION_DIRS''${CAJA_EXTENSION_DIRS:+:}${config.system.path}/lib/caja/extensions-2.0 + + # Let caja extensions find gsettings schemas + ${concatMapStrings (p: '' if [ -d "${p}/lib/caja/extensions-2.0" ]; then - ${addToXDGDirs p} + ${addToXDGDirs p} fi - '') - config.environment.systemPackages - } - - # Let mate-panel find applets - export MATE_PANEL_APPLETS_DIR=$MATE_PANEL_APPLETS_DIR''${MATE_PANEL_APPLETS_DIR:+:}${config.system.path}/share/mate-panel/applets - export MATE_PANEL_EXTRA_MODULES=$MATE_PANEL_EXTRA_MODULES''${MATE_PANEL_EXTRA_MODULES:+:}${config.system.path}/lib/mate-panel/applets + '') config.environment.systemPackages} - # 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} + # 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} + fi + ''; - ${pkgs.mate.mate-session-manager}/bin/mate-session ${optionalString cfg.debug "--debug"} & - waitPID=$! - ''; - }; + # Let mate-panel find applets + environment.sessionVariables."MATE_PANEL_APPLETS_DIR" = "${config.system.path}/share/mate-panel/applets"; + environment.sessionVariables."MATE_PANEL_EXTRA_MODULES" = "${config.system.path}/lib/mate-panel/applets"; environment.systemPackages = pkgs.mate.basePackages ++ |