all repos — nixfiles @ d6d1d924c04fc44a163a7a2a022311daa140eac1

System and user configuration, managed by nix and home-manager

extract user setup to role, split groups membership to roles

Alin
commit

d6d1d924c04fc44a163a7a2a022311daa140eac1

parent

b6a92b86e8e8fbd697c381c50f45279f39c448a2

7 files changed, 14 insertions(+), 44 deletions(-)

changed files
M system/hosts/linde.nix → system/hosts/linde.nix
@@ -157,25 +157,6 @@ security.sudo.extraConfig = ''
     Defaults:root,%wheel env_keep+=EDITOR
   '';
 
-  users.users.alin = {
-    extraGroups = [
-      "wheel"
-      "caddy"
-      "docker"
-      "podman"
-      "laminar"
-    ];
-    isNormalUser = true;
-    home = "/home/alin";
-    createHome = true;
-
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFp1R7ls50vzyCx8pZAwGepQUuos0ogewkIioiW1uMup alin@prefect"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII8VIII+598QOBxi/52O1Kb19RdUdX0aZmS1/dNoyqc5 alan@hetzner.strongbox"
-      "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBENXbdPPOq0mA+9bPklpUkikvIXjCEKE5IRwNPNMr5/Ta1J/ND737fexCjEb7YPoAJtaf0gD/JThQQi/RxDTvy4= alin@alin.ovh"
-    ];
-  };
-
   users.users.nixremote = {
     shell = "/bin/sh";
     isNormalUser = true;
M system/hosts/smrk.nix → system/hosts/smrk.nix
@@ -33,24 +33,6 @@ max-jobs = 4;
     };
   };
 
-  users.users.alin = {
-    extraGroups = [
-      "wheel"
-      "caddy"
-      "docker"
-      "podman"
-      "laminar"
-    ];
-    isNormalUser = true;
-    home = "/home/alin";
-    createHome = true;
-
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFp1R7ls50vzyCx8pZAwGepQUuos0ogewkIioiW1uMup alin@prefect"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII8VIII+598QOBxi/52O1Kb19RdUdX0aZmS1/dNoyqc5 alan@hetzner.strongbox"
-      "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBENXbdPPOq0mA+9bPklpUkikvIXjCEKE5IRwNPNMr5/Ta1J/ND737fexCjEb7YPoAJtaf0gD/JThQQi/RxDTvy4= alin@alin.ovh"
-    ];
-  };
   users.users.nixremote = {
     shell = "/bin/sh";
     isNormalUser = true;
M system/roles/base.nix → system/roles/base.nix
@@ -4,6 +4,8 @@ ...
 }:
 {
   imports = [
+    ../settings/configuration/user.nix
+
     ../settings/programs/neovim.nix
     ../settings/programs/shell.nix
     ../settings/programs/base.nix
M system/roles/ci.nix → system/roles/ci.nix
@@ -44,7 +44,10 @@ };
   users.users.laminar = {
     homeMode = "770";
   };
-  users.groups.laminar.members = [ "caddy" ];
+  users.groups.laminar.members = [
+    "alin"
+    "caddy"
+  ];
 
   services.caddy = {
     virtualHosts = {
M system/roles/forgejo-runner.nix → system/roles/forgejo-runner.nix
@@ -46,5 +46,7 @@ enable = true;
     };
   };
 
+  users.users.alin.extraGroups = [ "podman" ];
+
   networking.firewall.trustedInterfaces = [ "podman0" ];
 }
M system/roles/reverse-proxy.nix → system/roles/reverse-proxy.nix
@@ -53,6 +53,7 @@ }
     '';
   };
 
+  users.groups.caddy.members = [ "alin" ];
   users.groups.webservice = {
     members = [ "caddy" ];
   };
M system/settings/configuration/user.nix → system/settings/configuration/user.nix
@@ -3,16 +3,15 @@ {
   users.users.alin = {
     description = "Alin";
     isNormalUser = true;
-    extraGroups = [
-      "audio"
-      "wheel"
-      "video"
-    ];
+    extraGroups = [ "wheel" ];
     initialPassword = "password";
     home = "/home/alin";
+    createHome = true;
     uid = 1000;
     openssh.authorizedKeys.keys = [
-      "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJVREjPey2TOIPzfYJoG9yIR4Rui7tNJK2QIKa+pbgsyXg31hhPIw37LRRIic+l53mW8eahHxX3Y1IeTjcMw8IU= alan@secretive.marvin"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFp1R7ls50vzyCx8pZAwGepQUuos0ogewkIioiW1uMup alin@prefect"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII8VIII+598QOBxi/52O1Kb19RdUdX0aZmS1/dNoyqc5 alan@hetzner.strongbox"
+      "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBENXbdPPOq0mA+9bPklpUkikvIXjCEKE5IRwNPNMr5/Ta1J/ND737fexCjEb7YPoAJtaf0gD/JThQQi/RxDTvy4= alin@alin.ovh"
     ];
   };
 }