diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-03 16:51:48 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-03 16:51:48 +0100 |
| commit | 30fae2883e655c170e76d0827bcd9f396e9658af (patch) | |
| tree | 5d8f04f35c803aa46af658aacb75ebfaa22997a1 /nixos/modules/services/x11/desktop-managers | |
| parent | f2393197d4b9fa0c81d34a39a42c9d32b248248b (diff) | |
| parent | d2da3202eae6cd6e68e7b85aa04863e98141b9b0 (diff) | |
| download | nixlib-30fae2883e655c170e76d0827bcd9f396e9658af.tar nixlib-30fae2883e655c170e76d0827bcd9f396e9658af.tar.gz nixlib-30fae2883e655c170e76d0827bcd9f396e9658af.tar.bz2 nixlib-30fae2883e655c170e76d0827bcd9f396e9658af.tar.lz nixlib-30fae2883e655c170e76d0827bcd9f396e9658af.tar.xz nixlib-30fae2883e655c170e76d0827bcd9f396e9658af.tar.zst nixlib-30fae2883e655c170e76d0827bcd9f396e9658af.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/pantheon.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 80dab135ee26..25ef1cbfc67e 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -159,7 +159,7 @@ in # Override GSettings schemas environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; - environment.sessionVariables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1"; + environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1"; # Settings from elementary-default-settings environment.sessionVariables.GTK_CSD = "1"; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index da8bdcb78c43..56015874723c 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -169,7 +169,7 @@ in ++ lib.optional (cfg.phononBackend == "vlc") libsForQt5.phonon-backend-vlc # Optional hardware support features - ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt ] + ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt openobex obexftp ] ++ lib.optional config.networking.networkmanager.enable plasma-nm ++ lib.optional config.hardware.pulseaudio.enable plasma-pa ++ lib.optional config.powerManagement.enable powerdevil |