diff options
author | Luca Bruno <lethalman88@gmail.com> | 2015-04-10 17:02:57 +0200 |
---|---|---|
committer | Luca Bruno <lethalman88@gmail.com> | 2015-04-25 12:02:33 +0200 |
commit | db3b86560f11437e260ae6d6661c69fb5bb36c75 (patch) | |
tree | 7d21ce8f78907ea1e6ac97b9283ea13da9d7fc05 /nixos/modules | |
parent | 38d6aec3f630b4ef012f902482ef0ad5a5170844 (diff) | |
download | nixlib-db3b86560f11437e260ae6d6661c69fb5bb36c75.tar nixlib-db3b86560f11437e260ae6d6661c69fb5bb36c75.tar.gz nixlib-db3b86560f11437e260ae6d6661c69fb5bb36c75.tar.bz2 nixlib-db3b86560f11437e260ae6d6661c69fb5bb36c75.tar.lz nixlib-db3b86560f11437e260ae6d6661c69fb5bb36c75.tar.xz nixlib-db3b86560f11437e260ae6d6661c69fb5bb36c75.tar.zst nixlib-db3b86560f11437e260ae6d6661c69fb5bb36c75.zip |
GNOME 3.16.1, closes #7357
Diffstat (limited to 'nixos/modules')
5 files changed, 34 insertions, 25 deletions
diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index 6bdd5edff1f5..0e041fdbfbcf 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -34,6 +34,8 @@ with lib; services.dbus.packages = [ pkgs.geoclue2 ]; + systemd.packages = [ pkgs.geoclue2 ]; + }; } diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index f00c5d1f701d..60f380f024ba 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -98,13 +98,23 @@ in { ''; }; + # Ugly hack for using the correct gnome3 packageSet + basePackages = mkOption { + type = types.attrsOf types.path; + default = { inherit networkmanager modemmanager wpa_supplicant + networkmanager_openvpn networkmanager_vpnc + networkmanager_openconnect + networkmanager_pptp networkmanager_l2tp; }; + internal = true; + }; + packages = mkOption { type = types.listOf types.path; default = [ ]; description = '' Extra packages that provide NetworkManager plugins. ''; - apply = list: [ networkmanager modemmanager wpa_supplicant ] ++ list; + apply = list: (attrValues cfg.basePackages) ++ list; }; appendNameservers = mkOption { @@ -164,7 +174,7 @@ in { boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections. - environment.etc = [ + environment.etc = with cfg.basePackages; [ { source = ipUpScript; target = "NetworkManager/dispatcher.d/01nixos-ip-up"; } @@ -195,14 +205,7 @@ in { target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}"; }) cfg.dispatcherScripts; - environment.systemPackages = cfg.packages ++ [ - networkmanager_openvpn - networkmanager_vpnc - networkmanager_openconnect - networkmanager_pptp - networkmanager_l2tp - modemmanager - ]; + environment.systemPackages = cfg.packages; users.extraGroups = singleton { name = "networkmanager"; @@ -238,15 +241,7 @@ in { security.polkit.extraConfig = polkitConf; - # openvpn plugin has only dbus interface - services.dbus.packages = cfg.packages ++ [ - networkmanager_openvpn - networkmanager_vpnc - networkmanager_openconnect - networkmanager_pptp - networkmanager_l2tp - modemmanager - ]; + services.dbus.packages = cfg.packages; services.udev.packages = cfg.packages; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 6398a15bfcc8..c951f3eae77a 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" ]; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index a7ebafa28b38..6c3c52730863 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -58,14 +58,14 @@ in # Find the mouse XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons"; }; - execCmd = "exec ${gdm}/sbin/gdm"; + execCmd = "exec ${gdm}/bin/gdm"; }; # Because sd_login_monitor_new requires /run/systemd/machines systemd.services.display-manager.wants = [ "systemd-machined.service" ]; systemd.services.display-manager.after = [ "systemd-machined.service" ]; - systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou ]; + systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xlibs.xhost pkgs.dbus_tools ]; services.dbus.packages = [ gdm ]; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 6a7b810261da..139013cff50a 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -19,7 +19,7 @@ let ''; theme = pkgs.gnome3.gnome_themes_standard; - icons = pkgs.gnome3.gnome_icon_theme; + icons = pkgs.gnome3.defaultIconTheme; # The default greeter provided with this expression is the GTK greeter. # Again, we need a few things in the environment for the greeter to run with |