Cleanup
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
isCI = builtins.elem config.syscfg.hostname [ "ci" "sandbox" ];
|
||||
defaultUser = config.users.users.${config.syscfg.defaultUser} or { };
|
||||
defaultGroup = if pkgs.stdenv.isDarwin then "staff" else "users";
|
||||
keyFilePath = (if isCI then
|
||||
"/var/lib/sops-nix/mock-key.txt"
|
||||
else
|
||||
@@ -8,7 +10,7 @@ let
|
||||
sopsFilePath = (if isCI then ./mock.yaml else ./common.yaml);
|
||||
in {
|
||||
environment.systemPackages = with pkgs; [ sops ];
|
||||
environment.sessionVariables.SOPS_AGE_KEY_FILE = keyFilePath;
|
||||
environment.variables.SOPS_AGE_KEY_FILE = keyFilePath;
|
||||
|
||||
sops.defaultSopsFile = sopsFilePath;
|
||||
sops.age.keyFile = keyFilePath;
|
||||
@@ -19,8 +21,8 @@ in {
|
||||
{
|
||||
"${config.syscfg.hostname}_ssh_priv" = {
|
||||
mode = "0400";
|
||||
owner = config.users.users.${config.syscfg.defaultUser}.name;
|
||||
group = config.users.users.${config.syscfg.defaultUser}.group;
|
||||
owner = defaultUser.name or config.syscfg.defaultUser;
|
||||
group = defaultUser.group or defaultGroup;
|
||||
};
|
||||
}
|
||||
(lib.mkIf config.syscfg.net.wlp.enable {
|
||||
|
||||
Reference in New Issue
Block a user