diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2015-04-03 23:12:12 +0200 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2015-04-03 23:12:12 +0200 |
| commit | 6de931a0f898bc132d73a67059326b6886cc84b1 (patch) | |
| tree | a494d3f90da826fa983bfbd93e0ee2cff5f22ce8 /nixos/modules/config | |
| parent | 7f1a782d91c537eb6972b8acd83e1957a65a93e4 (diff) | |
| parent | a8d0614a602fd00d2e23e0e86fc748cc51c6f696 (diff) | |
| download | nixpkgs-6de931a0f898bc132d73a67059326b6886cc84b1.tar nixpkgs-6de931a0f898bc132d73a67059326b6886cc84b1.tar.gz nixpkgs-6de931a0f898bc132d73a67059326b6886cc84b1.tar.bz2 nixpkgs-6de931a0f898bc132d73a67059326b6886cc84b1.tar.lz nixpkgs-6de931a0f898bc132d73a67059326b6886cc84b1.tar.xz nixpkgs-6de931a0f898bc132d73a67059326b6886cc84b1.tar.zst nixpkgs-6de931a0f898bc132d73a67059326b6886cc84b1.zip | |
Merge rename.nix changes.
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/no-x-libs.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/config/pulseaudio.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/config/sysctl.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/config/users-groups.nix | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 47393c9d3f5..13477337bda 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -27,6 +27,6 @@ with lib; fonts.fontconfig.enable = false; nixpkgs.config.packageOverrides = pkgs: - { dbus = pkgs.dbus.override { useX11 = false; }; }; + { dbus = pkgs.dbus.override { x11Support = false; }; }; }; } diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 8b38489a8c1..c41e4ea604d 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -124,9 +124,7 @@ in { } (mkIf cfg.enable { - environment.systemPackages = [ - cfg.package - ] ++ lib.optionals enable32BitAlsaPlugins [ pkgs_i686.pulseaudio ]; + environment.systemPackages = [ cfg.package ]; environment.etc = singleton { target = "asound.conf"; diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 3b6ccd380c7..e83562a8356 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -64,6 +64,6 @@ in # # Removed under grsecurity. boot.kernel.sysctl."kernel.kptr_restrict" = - if config.security.grsecurity.enable then null else 1; + if (config.boot.kernelPackages.kernel.features.grsecurity or false) then null else 1; }; } diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index db87f9fd0b1..9d48edf2f26 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -110,7 +110,7 @@ let shell = mkOption { type = types.str; - default = "/run/current-system/sw/sbin/nologin"; + default = "/run/current-system/sw/bin/nologin"; description = "The path to the user's shell."; }; |