Skip to content

Commit 8d2ccfa

Browse files
authored
feat: add stroma host (#430)
* init Stroma host * add Things * fix system.stateVersion Addresses this error when switching to the flake: ``` error: Build user group has mismatching GID, aborting activation The default Nix build user group ID was changed from 30000 to 350. You are currently managing Nix build users with nix-darwin, but your nixbld group has GID 350, whereas we expected 30000. Possible causes include setting up a new Nix installation with an existing nix-darwin configuration, setting up a new nix-darwin installation with an existing Nix installation, or manually increasing your `system.stateVersion` setting. You can set the configured group ID to match the actual value: ids.gids.nixbld = 350; We do not recommend trying to change the group ID with macOS user management tools without a complete uninstallation and reinstallation of Nix. ``` * disable deprecated homebrew option See also: Homebrew/brew#20755 * restore other apps * restore dock settings * use Stroma public key
1 parent 6448c7d commit 8d2ccfa

File tree

9 files changed

+141
-1
lines changed

9 files changed

+141
-1
lines changed

flake.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@
121121
hostname = "Rhizome";
122122
username = "corey";
123123
};
124+
125+
Stroma = mkDarwinHost {
126+
hostname = "Stroma";
127+
username = "corey";
128+
};
124129
};
125130

126131
deploy = {

hosts/Stroma/default.nix

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
config,
3+
pkgs,
4+
...
5+
}: {
6+
imports = [
7+
./dock.nix
8+
./hardware.nix
9+
./programs.nix
10+
];
11+
12+
rc.darwin.defaults = {
13+
fonts = true;
14+
homebrew = true;
15+
security = true;
16+
system = true;
17+
};
18+
}

hosts/Stroma/dock.nix

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
config,
3+
pkgs,
4+
...
5+
}: {
6+
system.defaults.dock = {
7+
tilesize = 42;
8+
largesize = 86;
9+
persistent-apps = [
10+
"/System/Volumes/Preboot/Cryptexes/App/System/Applications/Safari.app"
11+
"/System/Applications/Mail.app"
12+
"/Applications/Zed.app"
13+
"/Applications/rootshell.app"
14+
"/Applications/Reeder.app"
15+
"/Applications/Roon.app"
16+
"/System/Applications/Calendar.app"
17+
"/System/Applications/Reminders.app"
18+
"/System/Applications/Notes.app"
19+
"/Applications/Things3.app"
20+
"/Applications/Craft.app"
21+
"/System/Applications/Messages.app"
22+
"/Applications/Slack.app"
23+
];
24+
};
25+
}

hosts/Stroma/hardware.nix

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
config,
3+
pkgs,
4+
...
5+
}: {
6+
users.users.corey = {
7+
home = "/Users/corey";
8+
};
9+
system.primaryUser = "corey";
10+
11+
system.stateVersion = 5;
12+
nixpkgs.hostPlatform = "aarch64-darwin";
13+
}

hosts/Stroma/key.pub

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDvLok8cBNJHzqbb4s9OtKloGv+f731ZirQVp+U7EHPK

hosts/Stroma/programs.nix

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
config,
3+
pkgs,
4+
...
5+
}: {
6+
environment.systemPackages = with pkgs; [
7+
m-cli
8+
mas
9+
the-unarchiver
10+
];
11+
12+
homebrew = {
13+
enable = true;
14+
# N.B.: Removed entries in `masApps` require manual uninstallation
15+
masApps = {
16+
"Folder Quick Look" = 6753110395;
17+
"GoodLinks" = 1474335294;
18+
"Hand Mirror" = 1502839586;
19+
"Infuse" = 1136220934;
20+
"Mapper" = 1589391989;
21+
"Mela" = 1568924476;
22+
"Noir" = 1592917505;
23+
"Paku" = 1534130193;
24+
"Parcel" = 375589283;
25+
"Pixea" = 1507782672;
26+
"Play" = 1596506190;
27+
"Reeder" = 1529448980;
28+
"Timery" = 1425368544;
29+
"Things" = 904280696;
30+
};
31+
};
32+
33+
programs.craft = {
34+
enable = true;
35+
};
36+
37+
programs.daisydisk = {
38+
enable = true;
39+
};
40+
41+
programs.fastscripts = {
42+
enable = true;
43+
startOnActivation = true;
44+
};
45+
rc.darwin.defaults.fastscripts = true;
46+
47+
programs.iina = {
48+
enable = true;
49+
};
50+
51+
programs.little-snitch = {
52+
enable = true;
53+
};
54+
55+
programs.popclip = {
56+
enable = true;
57+
startOnActivation = true;
58+
};
59+
60+
programs.postico = {
61+
enable = true;
62+
};
63+
64+
programs.roon = {
65+
enable = true;
66+
};
67+
68+
programs.scroll-reverser = {
69+
enable = true;
70+
startOnActivation = true;
71+
};
72+
73+
programs.soundsource = {
74+
enable = true;
75+
startOnActivation = true;
76+
};
77+
}

lib/keys.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ let
1010
"glyph"
1111
"Rhizome"
1212
"spore"
13+
"Stroma"
1314
"zeta"
1415
];
1516
in

modules/darwin/rc.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ in {
2525
];
2626

2727
homebrew = mkIf cfg.homebrew {
28-
caskArgs.no_quarantine = true;
2928
onActivation = {
3029
cleanup = "zap";
3130
upgrade = true;

modules/nixos/ssh.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
users.users.mu.openssh.authorizedKeys.keys = [
1616
keys.Rhizome
1717
keys.glyph
18+
keys.Stroma
1819
];
1920

2021
security.pam.sshAgentAuth.authorizedKeysFiles = lib.mkForce ["/etc/ssh/authorized_keys.d/%u"];

0 commit comments

Comments
 (0)