Skip to content

Commit 486566e

Browse files
updated nix-darwin w/ meta
1 parent ad1dabd commit 486566e

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

nix-darwin/users/henri.vandersleyen/configuration.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
pkgs,
3-
username,
3+
meta,
44
inputs,
55
...
66
}:
@@ -38,8 +38,8 @@
3838
# system.configurationRevision = self.rev or self.dirtyRev or null;
3939
system.stateVersion = 5;
4040

41-
users.users.${username} = {
42-
home = "/Users/${username}";
41+
users.users.${meta.username} = {
42+
home = "/Users/${meta.username}";
4343
shell = pkgs.nushell;
4444
};
4545
home-manager.backupFileExtension = "backup";
@@ -53,7 +53,7 @@
5353
];
5454
variables = {
5555
# XDG_CONFIG_HOME = "/Users/henri.vandersleyen"; # issue with nushell
56-
SOPS_AGE_KEY_FILE = "/Users/${username}/.config/sops/age/keys.txt";
56+
SOPS_AGE_KEY_FILE = "/Users/${meta.username}/.config/sops/age/keys.txt";
5757
};
5858
};
5959

@@ -62,7 +62,7 @@
6262
'';
6363

6464
# Homebrew needs to be installed on its own!
65-
system.primaryUser = username;
65+
system.primaryUser = meta.username;
6666
homebrew = {
6767
enable = true;
6868
casks = [

nix-darwin/users/henri.vandersleyen/home.nix

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{
55
config,
6-
username,
6+
meta,
77
...
88
}:
99

@@ -55,7 +55,7 @@
5555
# wm
5656
wm.aerospace = {
5757
enable = false;
58-
configPath = Users/${username}/Documents/dotfiles/.config/aerospace;
58+
configPath = Users/${meta.username}/Documents/dotfiles/.config/aerospace;
5959
};
6060

6161
# languages
@@ -67,9 +67,9 @@
6767
arc-browser.enable = true;
6868
fish.enable = true;
6969
zsh.enable = true;
70-
nh.flakeLocation = "/Users/${username}/Documents/dotFiles/nix-darwin";
70+
nh.flakeLocation = "/Users/${meta.username}/Documents/dotFiles/nix-darwin";
7171
keychain.enable = true;
72-
keychain.keys = "/home/${username}/.ssh/knak";
72+
keychain.keys = "/home/${meta.username}/.ssh/knak";
7373

7474
git = {
7575
# userEmail = config.sops.secrets."knak/email".path;
@@ -80,8 +80,8 @@
8080
};
8181

8282
home = {
83-
username = username;
84-
homeDirectory = "/Users/${username}";
83+
username = meta.username;
84+
homeDirectory = "/Users/${meta.username}";
8585
stateVersion = "23.05"; # Please read the comment before changing.
8686

8787
# Makes sense for user specific applications that shouldn't be available system-wide

nix-darwin/users/henri.vandersleyen/sops.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
inputs,
3-
username,
3+
meta,
44
config,
55
...
66
}:
@@ -12,7 +12,7 @@
1212
defaultSopsFile = ./secrets/secrets.yaml;
1313
defaultSopsFormat = "yaml";
1414

15-
age.keyFile = "/Users/${username}/.config/sops/age/keys.txt";
15+
age.keyFile = "/Users/${meta.username}/.config/sops/age/keys.txt";
1616
secrets = {
1717
"knak/email" = {
1818
# owner = username;

0 commit comments

Comments
 (0)