Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 480d11f1664b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5edb20533d1b
Choose a head ref
  • 3 commits
  • 6 files changed
  • 1 contributor

Commits on Sep 30, 2019

  1. nixos/gnome-settings-daemon: drop package option 

    After some thought, it doesn't make sense for this module to be shared.
    @worldofpeace
    worldofpeace committed Sep 30, 2019
    Copy the full SHA
    68ab37a View commit details

  2. nixos/networkmanager: remove basePackages option 

    This option in now completely useless.
All the default configs for these packages
already have GNOME features default,
    @worldofpeace
    worldofpeace committed Sep 30, 2019
    Copy the full SHA
    9bc8169 View commit details

Commits on Oct 3, 2019

  1. Merge pull request #70041 from worldofpeace/desktopmanager-compat 

    Fix certain desktop managers building together
    @worldofpeace
    worldofpeace authored Oct 3, 2019
    Copy the full SHA
    5edb205 View commit details
21 changes: 12 additions & 9 deletions nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,12 @@ in

{

imports = [
(mkRemovedOptionModule
["services" "gnome3" "gnome-settings-daemon" "package"]
"")
];

###### interface

options = {
@@ -20,13 +26,6 @@ in

enable = mkEnableOption "GNOME Settings Daemon";

# There are many forks of gnome-settings-daemon
package = mkOption {
type = types.package;
default = pkgs.gnome3.gnome-settings-daemon;
description = "Which gnome-settings-daemon package to use.";
};

};

};
@@ -36,9 +35,13 @@ in

config = mkIf cfg.enable {

environment.systemPackages = [ cfg.package ];
environment.systemPackages = [
pkgs.gnome3.gnome-settings-daemon
];

services.udev.packages = [ cfg.package ];
services.udev.packages = [
pkgs.gnome3.gnome-settings-daemon
];

};

30 changes: 15 additions & 15 deletions nixos/modules/services/networking/networkmanager.nix
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,18 @@ with lib;
let
cfg = config.networking.networkmanager;

basePackages = with pkgs; [
crda
modemmanager
networkmanager
networkmanager-fortisslvpn
networkmanager-iodine
networkmanager-l2tp
networkmanager-openconnect
networkmanager-openvpn
networkmanager-vpnc
] ++ optional (!delegateWireless) wpa_supplicant;

dynamicHostsEnabled =
cfg.dynamicHosts.enable && cfg.dynamicHosts.hostsDirs != {};

@@ -176,25 +188,13 @@ in {
'';
};

# Ugly hack for using the correct gnome3 packageSet
basePackages = mkOption {
type = types.attrsOf types.package;
default = { inherit (pkgs)
networkmanager modemmanager crda
networkmanager-openvpn networkmanager-vpnc
networkmanager-openconnect networkmanager-fortisslvpn
networkmanager-l2tp networkmanager-iodine; }
// optionalAttrs (!delegateWireless) { inherit (pkgs) wpa_supplicant; };
internal = true;
};

packages = mkOption {
type = types.listOf types.path;
type = types.listOf types.package;
default = [ ];
description = ''
Extra packages that provide NetworkManager plugins.
'';
apply = list: (attrValues cfg.basePackages) ++ list;
apply = list: basePackages ++ list;
};

dhcp = mkOption {
@@ -395,7 +395,7 @@ in {
}
];

environment.etc = with cfg.basePackages; [
environment.etc = with pkgs; [
{ source = configFile;
target = "NetworkManager/NetworkManager.conf";
}
8 changes: 0 additions & 8 deletions nixos/modules/services/x11/desktop-managers/gnome3.nix
View file
Original file line number Diff line number Diff line change
@@ -209,14 +209,6 @@ in

networking.networkmanager.enable = mkDefault true;

# Use the correct gnome3 packageSet
networking.networkmanager.basePackages = {
inherit (pkgs) networkmanager modemmanager wpa_supplicant crda;
inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
networkmanager-openconnect networkmanager-fortisslvpn
networkmanager-iodine networkmanager-l2tp;
};

services.xserver.updateDbusEnvironment = true;

# Needed for themes and backgrounds
3 changes: 2 additions & 1 deletion nixos/modules/services/x11/desktop-managers/mate.nix
View file
Original file line number Diff line number Diff line change
@@ -85,6 +85,7 @@ in
pkgs.gtk3.out
pkgs.shared-mime-info
pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
pkgs.mate.mate-settings-daemon
];

programs.dconf.enable = true;
@@ -98,7 +99,7 @@ in
services.gnome3.at-spi2-core.enable = true;
services.gnome3.gnome-keyring.enable = true;
services.gnome3.gnome-settings-daemon.enable = true;
services.gnome3.gnome-settings-daemon.package = pkgs.mate.mate-settings-daemon;
services.udev.packages = [ pkgs.mate.mate-settings-daemon ];
services.gvfs.enable = true;
services.upower.enable = config.powerManagement.enable;

7 changes: 1 addition & 6 deletions nixos/modules/services/x11/desktop-managers/pantheon.nix
View file
Original file line number Diff line number Diff line change
@@ -119,7 +119,7 @@ in
# TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully
services.gnome3.gnome-keyring.enable = true;
services.gnome3.gnome-settings-daemon.enable = true;
services.gnome3.gnome-settings-daemon.package = pkgs.pantheon.elementary-settings-daemon;
services.udev.packages = [ pkgs.pantheon.elementary-settings-daemon ];
services.gvfs.enable = true;
services.gnome3.rygel.enable = mkDefault true;
services.gsignond.enable = mkDefault true;
@@ -154,11 +154,6 @@ in
qt5.style = "adwaita";

networking.networkmanager.enable = mkDefault true;
networking.networkmanager.basePackages =
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant crda;
inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
networkmanager-openconnect networkmanager-fortisslvpn
networkmanager-iodine networkmanager-l2tp; };

# Override GSettings schemas
environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
8 changes: 0 additions & 8 deletions nixos/modules/services/x11/desktop-managers/xfce4-14.nix
View file
Original file line number Diff line number Diff line change
@@ -108,14 +108,6 @@ in
"/share/gtksourceview-4.0"
];

# Use the correct gnome3 packageSet
networking.networkmanager.basePackages = mkIf config.networking.networkmanager.enable {
inherit (pkgs) networkmanager modemmanager wpa_supplicant crda;
inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
networkmanager-openconnect networkmanager-fortisslvpn
networkmanager-iodine networkmanager-l2tp;
};

services.xserver.desktopManager.session = [{
name = "xfce4-14";
bgSupport = true;