diff options
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers/gnome3.nix')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 6398a15bfcc..c951f3eae77 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -21,7 +21,7 @@ let destination = "/share/applications/mimeapps.list"; text = '' [Default Applications] - inode/directory=nautilus.desktop + inode/directory=nautilus.desktop;org.gnome.Nautilus.desktop ''; }; @@ -80,6 +80,7 @@ in { services.telepathy.enable = mkDefault true; networking.networkmanager.enable = mkDefault true; services.upower.enable = config.powerManagement.enable; + hardware.bluetooth.enable = mkDefault true; fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ]; @@ -108,7 +109,7 @@ in { # Override default mimeapps export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share - # Let gnome-control-center find gnome-shell search providers + # Let gnome-control-center find gnome-shell search providers. GNOME 3.12 compatibility. export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/ # Let nautilus find extensions @@ -120,6 +121,9 @@ in { # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update + # Find the mouse + export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons + ${gnome3.gnome_session}/bin/gnome-session& waitPID=$! ''; @@ -138,11 +142,11 @@ in { gnome3.dconf gnome3.gnome-backgrounds gnome3.gnome_control_center - gnome3.gnome_icon_theme gnome3.gnome-menus gnome3.gnome_settings_daemon gnome3.gnome_shell gnome3.gnome_themes_standard + gnome3.defaultIconTheme ] ++ cfg.sessionPath ++ (removePackagesByName [ gnome3.baobab gnome3.empathy @@ -154,6 +158,7 @@ in { gnome3.totem gnome3.vino gnome3.yelp + gnome3.gnome-bluetooth gnome3.gnome-calculator gnome3.gnome-contacts gnome3.gnome-font-viewer @@ -175,6 +180,13 @@ in { gnome3.nautilus-sendto ] config.environment.gnome3.excludePackages); + # Use the correct gnome3 packageSet + networking.networkmanager.basePackages = + { inherit (pkgs) networkmanager modemmanager wpa_supplicant; + inherit (gnome3) networkmanager_openvpn networkmanager_vpnc + networkmanager_openconnect networkmanager_pptp + networkmanager_l2tp; }; + # Needed for themes and backgrounds environment.pathsToLink = [ "/share" ]; |