remove abstractions for managing users

1 files changed, 13 insertions, 16 deletions

diff --git a/machines/darwin/aarch64-darwin/mba-m2.nix b/machines/darwin/aarch64-darwin/mba-m2.nix
index df56e99..08a27c1 100644
--- a/machines/darwin/aarch64-darwin/mba-m2.nix
+++ b/machines/darwin/aarch64-darwin/mba-m2.nix
@@ -1,11 +1,7 @@
-{ adminUser, pkgs, ... }:
+{ pkgs, ... }:
 {
-  age = {
-    secrets = {
-      ssh-remote-builder = {
-        file = ../../../secrets/ssh-remote-builder.age;
-      };
-    };
+  age.secrets = {
+    ssh-remote-builder.file = ../../../secrets/ssh-remote-builder.age;
   };
 
   imports = [
@@ -19,11 +15,9 @@
 
   networking.hostName = "mba-m2";
 
-  users = {
-    users.${adminUser.name} = {
-      home = "/Users/${adminUser.name}";
-      shell = pkgs.fish;
-    };
+  users.users.fcuny = {
+    home = "/Users/fcuny";
+    shell = pkgs.fish;
   };
 
   environment.shells = [ pkgs.fish ];
@@ -37,10 +31,10 @@
     # End Nix
   '';
 
-  home-manager.users.${adminUser.name} = {
+  home-manager.users.fcuny = {
     home.stateVersion = "23.05";
-    home.username = "${adminUser.name}";
-    home.homeDirectory = "/Users/${adminUser.name}";
+    home.username = "fcuny";
+    home.homeDirectory = "/Users/fcuny";
     home.packages = with pkgs; [
       element-desktop
       hledger
@@ -50,6 +44,9 @@
       ../../../home/profiles/media.nix
       ../../../home/profiles/security.nix
     ];
-    inherit (adminUser) userinfo;
+    userinfo = {
+      email = "franck@fcuny.net";
+      fullName = "Franck Cuny";
+    };
   };
 }