diff options
author | rnhmjoj <rnhmjoj@inventati.org> | 2019-09-14 19:51:29 +0200 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-01-06 10:39:18 -0500 |
commit | 1d61efb7f177f7b70c467ab4940fde0a3481d4dc (patch) | |
tree | 860cce85acd87bc07aa2d11f4feac5d0df48a5c0 /nixos/modules/programs | |
parent | 6bd13ccd8e7fd1f241eb655f7112df1ed2889a3a (diff) | |
download | nixlib-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar nixlib-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.gz nixlib-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.bz2 nixlib-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.lz nixlib-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.xz nixlib-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.zst nixlib-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.zip |
treewide: use attrs instead of list for types.loaOf options
Diffstat (limited to 'nixos/modules/programs')
-rw-r--r-- | nixos/modules/programs/dconf.nix | 9 | ||||
-rw-r--r-- | nixos/modules/programs/shadow.nix | 28 |
2 files changed, 18 insertions, 19 deletions
diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index e0e2ffd80cff..6702e8efd1cb 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -6,7 +6,10 @@ let cfg = config.programs.dconf; mkDconfProfile = name: path: - { source = path; target = "dconf/profile/${name}"; }; + { + name = "dconf/profile/${name}"; + value.source = path; + }; in { @@ -29,8 +32,8 @@ in ###### implementation config = mkIf (cfg.profiles != {} || cfg.enable) { - environment.etc = optionals (cfg.profiles != {}) - (mapAttrsToList mkDconfProfile cfg.profiles); + environment.etc = optionalAttrs (cfg.profiles != {}) + (mapAttrs' mkDconfProfile cfg.profiles); services.dbus.packages = [ pkgs.dconf ]; diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index 7eaf79d864e7..fc352795c017 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -76,22 +76,18 @@ in config.users.defaultUserShell; environment.etc = - [ { # /etc/login.defs: global configuration for pwdutils. You - # cannot login without it! - source = pkgs.writeText "login.defs" loginDefs; - target = "login.defs"; - } - - { # /etc/default/useradd: configuration for useradd. - source = pkgs.writeText "useradd" - '' - GROUP=100 - HOME=/home - SHELL=${utils.toShellPath config.users.defaultUserShell} - ''; - target = "default/useradd"; - } - ]; + { # /etc/login.defs: global configuration for pwdutils. You + # cannot login without it! + "login.defs".source = pkgs.writeText "login.defs" loginDefs; + + # /etc/default/useradd: configuration for useradd. + "default/useradd".source = pkgs.writeText "useradd" + '' + GROUP=100 + HOME=/home + SHELL=${utils.toShellPath config.users.defaultUserShell} + ''; + }; security.pam.services = { chsh = { rootOK = true; }; |