diff options
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers/gnome3.nix')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 049c96c54e7..6398a15bfcc 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -44,9 +44,10 @@ in { }; environment.gnome3.packageSet = mkOption { - default = pkgs.gnome3; + default = null; example = literalExample "pkgs.gnome3_12"; - description = "Which Gnome 3 package set to use."; + description = "Which GNOME 3 package set to use."; + apply = p: if p == null then pkgs.gnome3 else p; }; environment.gnome3.excludePackages = mkOption { @@ -77,11 +78,10 @@ in { services.gnome3.tracker.enable = mkDefault true; hardware.pulseaudio.enable = mkDefault true; services.telepathy.enable = mkDefault true; - networking.networkmanager.enable = true; + networking.networkmanager.enable = mkDefault true; services.upower.enable = config.powerManagement.enable; - services.upower.package = gnome3.upower; - fonts.fonts = [ pkgs.dejavu_fonts ]; + fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ]; services.xserver.desktopManager.session = singleton { name = "gnome3"; @@ -114,6 +114,9 @@ in { # Let nautilus find extensions export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/ + # Find the mouse + export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons + # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update |