diff --git a/modules/installer/scan/not-detected.nix b/modules/installer/scan/not-detected.nix index 3a4a7f40fc6..e5a53bc8a0f 100644 --- a/modules/installer/scan/not-detected.nix +++ b/modules/installer/scan/not-detected.nix @@ -1,10 +1,15 @@ # List all devices which are _not_ detected by nixos-hardware-scan. # Common devices are enabled by default. -{config, pkgs, ...}: +{ config, pkgs, ... }: with pkgs.lib; { + imports = + [ ../../hardware/network/intel-5000.nix + ../../hardware/network/intel-6000.nix + ]; + config = mkDefault { # Wireless card firmware networking.enableRT73Firmware = true; diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix index 4e8689f7ca7..dc502ccadb1 100644 --- a/modules/services/x11/desktop-managers/xfce.nix +++ b/modules/services/x11/desktop-managers/xfce.nix @@ -7,6 +7,13 @@ let xcfg = config.services.xserver; cfg = xcfg.desktopManager.xfce; + fakeXfdesktop = pkgs.runCommand "xfdesktop" {} + '' + mkdir -p $out/bin + echo 'true' > $out/bin/xfdesktop + chmod u+x $out/bin/xfdesktop + ''; + in { @@ -43,7 +50,7 @@ in }; environment.systemPackages = - [ + [ fakeXfdesktop pkgs.gtkLibs.gtk # To get GTK+'s themes. pkgs.hicolor_icon_theme pkgs.shared_mime_info