moved sops config into common
This commit is contained in:
parent
8f8cea0ab2
commit
417aafe2e8
|
@ -26,6 +26,19 @@
|
|||
LC_TIME = "en_US.UTF-8";
|
||||
};
|
||||
|
||||
users.groups.users = {};
|
||||
|
||||
sops = {
|
||||
defaultSopsFile = ../../secrets/secrets.yaml;
|
||||
defaultSopsFormat = "yaml";
|
||||
|
||||
age ={
|
||||
keyFile = "/var/lib/sops-nix/key.txt";
|
||||
# sshKeyPaths = ["${config.home.homeDirectory}/.ssh/nix-ed25519"];
|
||||
# generateKey = true;
|
||||
};
|
||||
};
|
||||
|
||||
# List packages installed in system profile.
|
||||
environment.systemPackages = with pkgs; [
|
||||
wget
|
||||
|
|
|
@ -11,17 +11,6 @@
|
|||
../../enviroments/server
|
||||
];
|
||||
|
||||
sops = {
|
||||
defaultSopsFile = ../../secrets/secrets.yaml;
|
||||
defaultSopsFormat = "yaml";
|
||||
|
||||
age ={
|
||||
keyFile = "/home/leyla/.config/sops/age/keys.txt";
|
||||
# sshKeyPaths = ["${config.home.homeDirectory}/.ssh/nix-ed25519"];
|
||||
# generateKey = true;
|
||||
};
|
||||
};
|
||||
|
||||
# home.sessionVariables = {
|
||||
# SOPS_AGE_KEY_FILE = "${config.home.homeDirectory}/.config/sops-nix/key.txt";
|
||||
# };
|
||||
|
|
|
@ -11,11 +11,6 @@
|
|||
../../enviroments/client
|
||||
];
|
||||
|
||||
sops.defaultSopsFile = ../../secrets/secrets.yaml;
|
||||
sops.defaultSopsFormat = "yaml";
|
||||
|
||||
sops.age.keyFile = "/home/leyla/.config/sops/age/keys.txt";
|
||||
|
||||
users.leyla = {
|
||||
isFullUser = true;
|
||||
hasPiperMouse = true;
|
||||
|
|
|
@ -27,7 +27,7 @@ in
|
|||
(
|
||||
if cfg.isFullUser then {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "networkmanager" ];
|
||||
extraGroups = [ "networkmanager" "users" ];
|
||||
|
||||
hashedPasswordFile = config.sops.secrets."passwords/ester".path;
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ in
|
|||
(
|
||||
if cfg.isFullUser then {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "networkmanager" ];
|
||||
extraGroups = [ "networkmanager" "users" ];
|
||||
|
||||
hashedPasswordFile = config.sops.secrets."passwords/eve".path;
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@ in
|
|||
if (cfg.isFullUser || cfg.isThinUser) then {
|
||||
isNormalUser = true;
|
||||
extraGroups = lib.mkMerge [
|
||||
["networkmanager" "wheel" "docker"]
|
||||
["networkmanager" "wheel" "docker" "users"]
|
||||
(
|
||||
lib.mkIf (!cfg.isThinUser) [ "adbusers" ]
|
||||
)
|
||||
|
|
Loading…
Reference in a new issue