diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-04-27 17:06:57 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-27 17:06:57 +0000 |
| commit | 373507e28edeacd168b5c240840db2dac854882a (patch) | |
| tree | c73c8912afbd1a533dbc0d27da25dcd7f0d13d58 /nixpkgs/nixos/modules/services/x11/desktop-managers | |
| parent | b2ac96a35da6f6b95c7197811e421270319e8d50 (diff) | |
| parent | dfd8f84aef129f1978e446b5d45ef05cd4421821 (diff) | |
| download | nixlib-373507e28edeacd168b5c240840db2dac854882a.tar nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.gz nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.bz2 nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.lz nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.xz nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.zst nixlib-373507e28edeacd168b5c240840db2dac854882a.zip | |
Merge commit 'dfd8f84aef129f1978e446b5d45ef05cd4421821'
Diffstat (limited to 'nixpkgs/nixos/modules/services/x11/desktop-managers')
| -rw-r--r-- | nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/nixos/modules/services/x11/desktop-managers/maxx.nix | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix index 3d748d4308b7..9bf03a494701 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -75,7 +75,7 @@ in { debug = mkEnableOption "gnome-session debug messages"; flashback = { - enableMetacity = mkEnableOption "Enable the standard GNOME Flashback session with Metacity."; + enableMetacity = mkEnableOption "the standard GNOME Flashback session with Metacity"; customSessions = mkOption { type = types.listOf (types.submodule { diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/maxx.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/maxx.nix index d7bd2fc5eb0c..6a698658bdd6 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/maxx.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/maxx.nix @@ -13,6 +13,12 @@ in { config = mkIf (xcfg.enable && cfg.enable) { environment.systemPackages = [ pkgs.maxx ]; + # there is hardcoded path in binaries + system.activationScripts.setup-maxx = '' + mkdir -p /opt + ln -sfn ${pkgs.maxx}/opt/MaXX /opt + ''; + services.xserver.desktopManager.session = [ { name = "MaXX"; start = '' |