jan-leila/nix-config
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moved sops config into common

Browse source
This commit is contained in:
Leyla Becker 2024-09-15 12:55:31 -05:00
parent d22f470e24
commit 88ab5420eb
6 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
enviroments/common/default.nix
View file

@ -26,6 +26,19 @@
LC_TIME = "en_US.UTF-8"; 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. # List packages installed in system profile.
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wget wget

11
hosts/defiant/configuration.nix
View file

@ -11,17 +11,6 @@
../../enviroments/server ../../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 = { # home.sessionVariables = {
# SOPS_AGE_KEY_FILE = "${config.home.homeDirectory}/.config/sops-nix/key.txt"; # SOPS_AGE_KEY_FILE = "${config.home.homeDirectory}/.config/sops-nix/key.txt";
# }; # };

5
hosts/twilight/configuration.nix
View file

@ -11,11 +11,6 @@
../../enviroments/client ../../enviroments/client
]; ];
sops.defaultSopsFile = ../../secrets/secrets.yaml;
sops.defaultSopsFormat = "yaml";
sops.age.keyFile = "/home/leyla/.config/sops/age/keys.txt";
users.leyla = { users.leyla = {
isFullUser = true; isFullUser = true;
hasPiperMouse = true; hasPiperMouse = true;

2
users/ester/default.nix
View file

@ -27,7 +27,7 @@ in
( (
if cfg.isFullUser then { if cfg.isFullUser then {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "networkmanager" ]; extraGroups = [ "networkmanager" "users" ];
hashedPasswordFile = config.sops.secrets."passwords/ester".path; hashedPasswordFile = config.sops.secrets."passwords/ester".path;

2
users/eve/default.nix
View file

@ -27,7 +27,7 @@ in
( (
if cfg.isFullUser then { if cfg.isFullUser then {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "networkmanager" ]; extraGroups = [ "networkmanager" "users" ];
hashedPasswordFile = config.sops.secrets."passwords/eve".path; hashedPasswordFile = config.sops.secrets."passwords/eve".path;

2
users/leyla/default.nix
View file

@ -37,7 +37,7 @@ in
if (cfg.isFullUser || cfg.isThinUser) then { if (cfg.isFullUser || cfg.isThinUser) then {
isNormalUser = true; isNormalUser = true;
extraGroups = lib.mkMerge [ extraGroups = lib.mkMerge [
["networkmanager" "wheel" "docker"] ["networkmanager" "wheel" "docker" "users"]
( (
lib.mkIf (!cfg.isThinUser) [ "adbusers" ] lib.mkIf (!cfg.isThinUser) [ "adbusers" ]
) )