diff options
Diffstat (limited to 'machines/darwin')
| -rw-r--r-- | machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix | 25 | ||||
| -rw-r--r-- | machines/darwin/aarch64-darwin/mba-m2.nix | 29 |
2 files changed, 24 insertions, 30 deletions
diff --git a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix index 3207d2f..52dc522 100644 --- a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix +++ b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix @@ -1,19 +1,13 @@ -{ - adminUser, - pkgs, - ... -}: +{ pkgs, ... }: { imports = [ ../../../profiles/darwin.nix ../../../profiles/home-manager.nix ]; - users = { - users.${adminUser.name} = { - home = "/Users/${adminUser.name}"; - shell = pkgs.fish; - }; + users.users.fcuny = { + home = "/Users/fcuny"; + shell = pkgs.fish; }; environment.shells = [ pkgs.fish ]; @@ -27,14 +21,17 @@ # 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"; imports = [ ../../../home/profiles/mac.nix ../../../home/profiles/work.nix ]; - inherit (adminUser) userinfo; + userinfo = { + email = "fcuny@roblox.com"; + fullName = "Franck Cuny"; + }; }; } 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"; + }; }; } |