diff options
author | Shea Levy <shea@shealevy.com> | 2014-05-05 14:58:51 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2014-07-02 12:28:18 -0400 |
commit | b3cfb9084b3860852581be235aea90540a5302d4 (patch) | |
tree | 06cf1333ae7d60f25bd23866dbaec17b148a15dd /nixos/modules/services | |
parent | 80709b141ca82d5afe3874f50b822db3409bed4e (diff) | |
download | nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar.gz nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar.bz2 nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar.lz nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar.xz nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar.zst nixlib-b3cfb9084b3860852581be235aea90540a5302d4.zip |
Get all lib functions from lib, not pkgs.lib, in modules
Diffstat (limited to 'nixos/modules/services')
37 files changed, 73 insertions, 73 deletions
diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix index f1f3d005f30f..f731900070e4 100644 --- a/nixos/modules/services/amqp/activemq/default.nix +++ b/nixos/modules/services/amqp/activemq/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: -with lib; with pkgs; +with lib; let diff --git a/nixos/modules/services/backup/sitecopy-backup.nix b/nixos/modules/services/backup/sitecopy-backup.nix index 5d3675fa3e9d..5f2b4e76aeeb 100644 --- a/nixos/modules/services/backup/sitecopy-backup.nix +++ b/nixos/modules/services/backup/sitecopy-backup.nix @@ -73,7 +73,7 @@ in touch ${stateDir}/sitecopy.secrets chown root ${stateDir}/sitecopy.secrets - ${pkgs.lib.concatStrings (map ( b: '' + ${lib.concatStrings (map ( b: '' unset secrets unset secret secrets=`grep '^${b.server}' ${stateDir}/sitecopy.secrets | head -1` diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index ad83cb553e1d..01c55479b2b4 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -85,7 +85,7 @@ in Defines how users authenticate themselves to the server. By default, "trust" access to local users will always be granted along with any other custom options. If you do not want this, - set this option using "pkgs.lib.mkForce" to override this + set this option using "lib.mkForce" to override this behaviour. ''; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-documents.nix b/nixos/modules/services/desktops/gnome3/gnome-documents.nix index 2279ef48fb9c..88bbdadfcbdd 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-documents.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-documents.nix @@ -1,8 +1,8 @@ # GNOME Documents daemon. -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let gnome3 = config.environment.gnome3.packageSet; diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix index be14f1fcbc0c..566c8a50e269 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix @@ -1,8 +1,8 @@ # GNOME Keyring daemon. -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let gnome3 = config.environment.gnome3.packageSet; diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix index a41fb0101f0f..82d04c62c70d 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix @@ -1,8 +1,8 @@ # GNOME Online Accounts daemon. -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let gnome3 = config.environment.gnome3.packageSet; diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix index 030d4bac6a76..6acd633b62c9 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix @@ -1,8 +1,8 @@ # GNOME Online Miners daemon. -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let gnome3 = config.environment.gnome3.packageSet; diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix index 3b6c713f7be3..e5c94cff7c84 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix @@ -1,8 +1,8 @@ # GNOME User Share daemon. -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let gnome3 = config.environment.gnome3.packageSet; diff --git a/nixos/modules/services/desktops/gnome3/gvfs.nix b/nixos/modules/services/desktops/gnome3/gvfs.nix index 1a003ddd1efb..7e1382b161e1 100644 --- a/nixos/modules/services/desktops/gnome3/gvfs.nix +++ b/nixos/modules/services/desktops/gnome3/gvfs.nix @@ -1,8 +1,8 @@ # gvfs backends -{ config, pkgs, ... }: +{ config, lib, ... }: -with pkgs.lib; +with lib; let gnome3 = config.environment.gnome3.packageSet; diff --git a/nixos/modules/services/desktops/gnome3/seahorse.nix b/nixos/modules/services/desktops/gnome3/seahorse.nix index 01e4a24f2672..45925aaca9b9 100644 --- a/nixos/modules/services/desktops/gnome3/seahorse.nix +++ b/nixos/modules/services/desktops/gnome3/seahorse.nix @@ -1,8 +1,8 @@ # Seahorse daemon. -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let gnome3 = config.environment.gnome3.packageSet; diff --git a/nixos/modules/services/desktops/gnome3/tracker.nix b/nixos/modules/services/desktops/gnome3/tracker.nix index 670e585c6f55..8c5935a5ee3c 100644 --- a/nixos/modules/services/desktops/gnome3/tracker.nix +++ b/nixos/modules/services/desktops/gnome3/tracker.nix @@ -1,8 +1,8 @@ # Tracker daemon. -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let gnome3 = config.environment.gnome3.packageSet; diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix index a710636c1400..b87899e45983 100644 --- a/nixos/modules/services/hardware/acpid.nix +++ b/nixos/modules/services/hardware/acpid.nix @@ -16,7 +16,7 @@ let echo "event=${event.event}" > $fn echo "action=${pkgs.writeScript "${event.name}.sh" event.action}" >> $fn ''; - in pkgs.lib.concatMapStrings f events + in lib.concatMapStrings f events } ''; diff --git a/nixos/modules/services/hardware/amd-hybrid-graphics.nix b/nixos/modules/services/hardware/amd-hybrid-graphics.nix index d938867186d0..087bd0e04098 100644 --- a/nixos/modules/services/hardware/amd-hybrid-graphics.nix +++ b/nixos/modules/services/hardware/amd-hybrid-graphics.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { @@ -6,9 +6,9 @@ options = { - hardware.amdHybridGraphics.disable = pkgs.lib.mkOption { + hardware.amdHybridGraphics.disable = lib.mkOption { default = false; - type = pkgs.lib.types.bool; + type = lib.types.bool; description = '' Completely disable the AMD graphics card and use the integrated graphics processor instead. @@ -20,7 +20,7 @@ ###### implementation - config = pkgs.lib.mkIf config.hardware.amdHybridGraphics.disable { + config = lib.mkIf config.hardware.amdHybridGraphics.disable { systemd.services."amd-hybrid-graphics" = { path = [ pkgs.bash ]; description = "Disable AMD Card"; diff --git a/nixos/modules/services/hardware/nvidia-optimus.nix b/nixos/modules/services/hardware/nvidia-optimus.nix index 4c0ce794d4f7..9fe4021c4247 100644 --- a/nixos/modules/services/hardware/nvidia-optimus.nix +++ b/nixos/modules/services/hardware/nvidia-optimus.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: let kernel = config.boot.kernelPackages; in @@ -8,9 +8,9 @@ let kernel = config.boot.kernelPackages; in options = { - hardware.nvidiaOptimus.disable = pkgs.lib.mkOption { + hardware.nvidiaOptimus.disable = lib.mkOption { default = false; - type = pkgs.lib.types.bool; + type = lib.types.bool; description = '' Completely disable the NVIDIA graphics card and use the integrated graphics processor instead. @@ -22,7 +22,7 @@ let kernel = config.boot.kernelPackages; in ###### implementation - config = pkgs.lib.mkIf config.hardware.nvidiaOptimus.disable { + config = lib.mkIf config.hardware.nvidiaOptimus.disable { boot.blacklistedKernelModules = ["nouveau" "nvidia" "nvidiafb"]; boot.kernelModules = [ "bbswitch" ]; boot.extraModulePackages = [ kernel.bbswitch ]; diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix index 2acc51c64a6a..642fac3b3a01 100644 --- a/nixos/modules/services/monitoring/monit.nix +++ b/nixos/modules/services/monitoring/monit.nix @@ -1,9 +1,9 @@ # Monit system watcher # http://mmonit.org/monit/ -{config, pkgs, ...}: +{config, pkgs, lib, ...}: -let inherit (pkgs.lib) mkOption mkIf; +let inherit (lib) mkOption mkIf; in { diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix index 553110d7b80c..29616a085c8f 100644 --- a/nixos/modules/services/monitoring/uptime.nix +++ b/nixos/modules/services/monitoring/uptime.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: let - inherit (pkgs.lib) mkOption mkEnableOption mkIf mkMerge types optionalAttrs optional; + inherit (lib) mkOption mkEnableOption mkIf mkMerge types optionalAttrs optional; cfg = config.services.uptime; diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix index b34ebc3663e3..23ab39eb05f3 100644 --- a/nixos/modules/services/network-filesystems/openafs-client/default.nix +++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix @@ -1,7 +1,7 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: let - inherit (pkgs.lib) mkOption mkIf; + inherit (lib) mkOption mkIf; cfg = config.services.openafsClient; diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index bc17add809b2..19aa7efd2ff4 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let @@ -136,4 +136,4 @@ in networking.firewall.allowedTCPPorts = [ cfg.port ]; }; -} \ No newline at end of file +} diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix index 7ed1e4805d8f..482b61997ae1 100644 --- a/nixos/modules/services/networking/connman.nix +++ b/nixos/modules/services/networking/connman.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: -with lib; with pkgs; +with lib; let cfg = config.networking.connman; diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index c53cb68fb75f..bb94a8dacfa2 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -1,8 +1,8 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: let - inherit (pkgs.lib) mkOption mkIf singleton; + inherit (lib) mkOption mkIf singleton; inherit (pkgs) ddclient; diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index 89f686c28703..e5e1c103c686 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -18,7 +18,7 @@ let ${cfg.extraConfig} - ${pkgs.lib.concatMapStrings + ${lib.concatMapStrings (machine: '' host ${machine.hostName} { hardware ethernet ${machine.ethernetAddress}; diff --git a/nixos/modules/services/networking/gvpe.nix b/nixos/modules/services/networking/gvpe.nix index 594a2e80f345..c633ffedef49 100644 --- a/nixos/modules/services/networking/gvpe.nix +++ b/nixos/modules/services/networking/gvpe.nix @@ -1,9 +1,9 @@ # GNU Virtual Private Ethernet -{config, pkgs, ...}: +{config, pkgs, lib, ...}: let - inherit (pkgs.lib) mkOption mkIf; + inherit (lib) mkOption mkIf; cfg = config.services.gvpe; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 54bdf19373d5..bc1c95d3fd36 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: -with lib; with pkgs; +with lib; let cfg = config.networking.networkmanager; @@ -151,7 +151,7 @@ in { { source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name"; target = "NetworkManager/VPN/nm-pptp-service.name"; } - ] ++ pkgs.lib.optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) + ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) { source = overrideNameserversScript; target = "NetworkManager/dispatcher.d/02overridedns"; }; diff --git a/nixos/modules/services/networking/notbit.nix b/nixos/modules/services/networking/notbit.nix index 3e8c956f191e..2e1412ff7c83 100644 --- a/nixos/modules/services/networking/notbit.nix +++ b/nixos/modules/services/networking/notbit.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with pkgs.lib; +with lib; let cfg = config.services.notbit; varDir = "/var/lib/notbit"; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index adfee1caec58..db8cb1228719 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let cfg = config.services.nsd; diff --git a/nixos/modules/services/networking/teamspeak3.nix b/nixos/modules/services/networking/teamspeak3.nix index 2d3478d52f83..b3656d73dec0 100644 --- a/nixos/modules/services/networking/teamspeak3.nix +++ b/nixos/modules/services/networking/teamspeak3.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: -with pkgs.lib; +with lib; let ts3 = pkgs.teamspeak_server; diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix index 5da71b12dd76..9ce0bcbec7eb 100644 --- a/nixos/modules/services/scheduling/cron.nix +++ b/nixos/modules/services/scheduling/cron.nix @@ -15,7 +15,7 @@ let MAILTO="${config.services.cron.mailto}" ''} NIX_CONF_DIR=/etc/nix - ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)} + ${lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)} ''; # Vixie cron requires build-time configuration for the sendmail path. diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index 346a64f2c3cb..ade8c19329ca 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -17,7 +17,7 @@ let MAILTO="${config.services.cron.mailto}" ''} NIX_CONF_DIR=/etc/nix - ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)} + ${lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)} ''; allowdeny = target: users: diff --git a/nixos/modules/services/security/frandom.nix b/nixos/modules/services/security/frandom.nix index 9aae7b33a430..2d43d12e541d 100644 --- a/nixos/modules/services/security/frandom.nix +++ b/nixos/modules/services/security/frandom.nix @@ -1,4 +1,4 @@ -{pkgs, config, ...}: +{lib, config, ...}: let kernel = config.boot.kernelPackages; in @@ -9,9 +9,9 @@ in options = { - services.frandom.enable = pkgs.lib.mkOption { + services.frandom.enable = lib.mkOption { default = false; - type = pkgs.lib.types.bool; + type = lib.types.bool; description = '' enable the /dev/frandom device (a very fast random number generator) ''; @@ -22,7 +22,7 @@ in ###### implementation - config = pkgs.lib.mkIf config.services.frandom.enable { + config = lib.mkIf config.services.frandom.enable { boot.kernelModules = [ "frandom" ]; boot.extraModulePackages = [ kernel.frandom ]; services.udev.packages = [ kernel.frandom ]; diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix index 8fb5debd20e4..3a0171ca1b9b 100644 --- a/nixos/modules/services/system/kerberos.nix +++ b/nixos/modules/services/system/kerberos.nix @@ -1,8 +1,8 @@ -{pkgs, config, ...}: +{pkgs, config, lib, ...}: let - inherit (pkgs.lib) mkOption mkIf singleton; + inherit (lib) mkOption mkIf singleton; inherit (pkgs) heimdal; @@ -36,7 +36,7 @@ in environment.systemPackages = [ heimdal ]; services.xinetd.enable = true; - services.xinetd.services = pkgs.lib.singleton + services.xinetd.services = lib.singleton { name = "kerberos-adm"; flags = "REUSE NAMEINARGS"; protocol = "tcp"; diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index 1ac82064a1f7..5460e962ea2c 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -7,7 +7,7 @@ let nssModulesPath = config.system.nssModules.path; cfg = config.services.nscd; - inherit (pkgs.lib) singleton; + inherit (lib) singleton; cfgFile = pkgs.writeText "nscd.conf" cfg.config; diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix index 61eecd5c9ba8..ab46c508914d 100644 --- a/nixos/modules/services/system/uptimed.nix +++ b/nixos/modules/services/system/uptimed.nix @@ -1,8 +1,8 @@ -{pkgs, config, ...}: +{pkgs, config, lib, ...}: let - inherit (pkgs.lib) mkOption mkIf singleton; + inherit (lib) mkOption mkIf singleton; inherit (pkgs) uptimed; diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index 70555e5d8825..7783a1ada71d 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: let - inherit (pkgs.lib) mkOption types mkIf optionalString; + inherit (lib) mkOption types mkIf optionalString; cfg = config.services.kmscon; diff --git a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix index 755b595c783d..1d4303b75b35 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix @@ -1,8 +1,8 @@ -{ config, pkgs, serverInfo, ... }: +{ config, pkgs, serverInfo, lib, ... }: let inherit (pkgs) mercurial; - inherit (pkgs.lib) mkOption; + inherit (lib) mkOption; urlPrefix = config.urlPrefix; diff --git a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix index 1b754cf025eb..b2cd53ae55cd 100644 --- a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix +++ b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix @@ -1,7 +1,7 @@ -{ config, pkgs, serverInfo, ... }: +{ config, pkgs, serverInfo, lib, ... }: let - extraWorkersProperties = pkgs.lib.optionalString (config ? extraWorkersProperties) config.extraWorkersProperties; + extraWorkersProperties = lib.optionalString (config ? extraWorkersProperties) config.extraWorkersProperties; workersProperties = pkgs.writeText "workers.properties" '' # Define list of workers that will be used diff --git a/nixos/modules/services/x11/window-managers/openbox.nix b/nixos/modules/services/x11/window-managers/openbox.nix index 46b1945d33e8..8fc759dda68a 100644 --- a/nixos/modules/services/x11/window-managers/openbox.nix +++ b/nixos/modules/services/x11/window-managers/openbox.nix @@ -1,7 +1,7 @@ -{pkgs, config, ...}: +{lib, pkgs, config, ...}: let - inherit (pkgs.lib) mkOption mkIf; + inherit (lib) mkOption mkIf; cfg = config.services.xserver.windowManager.openbox; in diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 87eff38a028a..74acfc219759 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -1,7 +1,7 @@ -{pkgs, config, ...}: +{pkgs, lib, config, ...}: let - inherit (pkgs.lib) mkOption mkIf optionals literalExample; + inherit (lib) mkOption mkIf optionals literalExample; cfg = config.services.xserver.windowManager.xmonad; xmonadEnv = cfg.haskellPackages.ghcWithPackages(self: [ self.xmonad @@ -48,7 +48,7 @@ in enableContribAndExtras = mkOption { default = false; example = true; - type = pkgs.lib.types.bool; + type = lib.types.bool; description = "Enable xmonad-{contrib,extras} in Xmonad."; }; }; |