aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix25
-rw-r--r--machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/home.nix7
-rw-r--r--machines/darwin/aarch64-darwin/mba-m2/default.nix42
-rw-r--r--machines/darwin/aarch64-darwin/mba-m2/home.nix12
-rw-r--r--machines/darwin/aarch64-darwin/mba-m2/secrets.nix10
-rw-r--r--modules/darwin/default.nix9
-rw-r--r--modules/darwin/desktop.nix34
-rw-r--r--modules/darwin/keyboard.nix7
-rw-r--r--modules/darwin/nix.nix42
-rw-r--r--modules/darwin/security.nix5
-rw-r--r--profiles/darwin.nix84
11 files changed, 118 insertions, 159 deletions
diff --git a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix
index 58761dd..2935834 100644
--- a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix
+++ b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix
@@ -5,21 +5,9 @@
}:
{
imports = [
- {
- home-manager.users.${adminUser.name} = {
- home.homeDirectory = "/Users/${adminUser.name}";
- imports = [
- ./home.nix
- { home.stateVersion = "23.05"; }
- ];
- inherit (adminUser) userinfo;
- programs.git.userEmail = "fcuny@roblox.com";
- };
- }
+ ../../../../profiles/darwin.nix
];
- system.primaryUser = adminUser.name;
-
users = {
users.${adminUser.name} = {
home = "/Users/${adminUser.name}";
@@ -35,4 +23,15 @@
end
# End Nix
'';
+
+ home-manager.users.${adminUser.name} = {
+ home.stateVersion = "23.05";
+ home.username = "${adminUser.name}";
+ home.homeDirectory = "/Users/${adminUser.name}";
+ imports = [
+ ../../../../home/profiles/mac.nix
+ ../../../../home/profiles/work.nix
+ ];
+ inherit (adminUser) userinfo;
+ };
}
diff --git a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/home.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/home.nix
deleted file mode 100644
index fdc0dcd..0000000
--- a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/home.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ self, ... }:
-{
- imports = [
- "${self}/home/profiles/mac.nix"
- "${self}/home/profiles/work.nix"
- ];
-}
diff --git a/machines/darwin/aarch64-darwin/mba-m2/default.nix b/machines/darwin/aarch64-darwin/mba-m2/default.nix
index f11dcf5..db5ed48 100644
--- a/machines/darwin/aarch64-darwin/mba-m2/default.nix
+++ b/machines/darwin/aarch64-darwin/mba-m2/default.nix
@@ -1,26 +1,17 @@
+{ adminUser, pkgs, ... }:
{
- adminUser,
- pkgs,
- self,
- ...
-}:
-{
- imports = [
- ./secrets.nix
- {
- home-manager.users.${adminUser.name} = {
- home.homeDirectory = "/Users/${adminUser.name}";
- imports = [
- ./home.nix
- { home.stateVersion = "23.05"; }
- ];
- inherit (adminUser) userinfo;
+ age = {
+ secrets = {
+ ssh-remote-builder = {
+ file = ../../../../secrets/ssh-remote-builder.age;
};
- }
- "${self}/profiles/nix/remote-builder.nix"
- ];
+ };
+ };
- system.primaryUser = adminUser.name;
+ imports = [
+ ../../../../profiles/darwin.nix
+ ../../../../profiles/nix/remote-builder.nix
+ ];
# https://github.com/nix-darwin/nix-darwin/issues/1339
ids.gids.nixbld = 30000;
@@ -42,4 +33,15 @@
end
# End Nix
'';
+
+ home-manager.users.${adminUser.name} = {
+ home.stateVersion = "23.05";
+ home.username = "${adminUser.name}";
+ home.homeDirectory = "/Users/${adminUser.name}";
+ imports = [
+ ../../../../home/profiles/mac.nix
+ ../../../../home/profiles/media.nix
+ ];
+ inherit (adminUser) userinfo;
+ };
}
diff --git a/machines/darwin/aarch64-darwin/mba-m2/home.nix b/machines/darwin/aarch64-darwin/mba-m2/home.nix
deleted file mode 100644
index 23236bf..0000000
--- a/machines/darwin/aarch64-darwin/mba-m2/home.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ self, pkgs, ... }:
-{
- home.packages = with pkgs; [
- element-desktop
- zoom-us
- ];
-
- imports = [
- "${self}/home/profiles/mac.nix"
- "${self}/home/profiles/media.nix"
- ];
-}
diff --git a/machines/darwin/aarch64-darwin/mba-m2/secrets.nix b/machines/darwin/aarch64-darwin/mba-m2/secrets.nix
deleted file mode 100644
index 079b38d..0000000
--- a/machines/darwin/aarch64-darwin/mba-m2/secrets.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ self, ... }:
-{
- age = {
- secrets = {
- ssh-remote-builder = {
- file = "${self}/secrets/ssh-remote-builder.age";
- };
- };
- };
-}
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
deleted file mode 100644
index 674e042..0000000
--- a/modules/darwin/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-{
- imports = [
- ./desktop.nix
- ./keyboard.nix
- ./nix.nix
- ./security.nix
- ];
-}
diff --git a/modules/darwin/desktop.nix b/modules/darwin/desktop.nix
deleted file mode 100644
index 55cef64..0000000
--- a/modules/darwin/desktop.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ pkgs, ... }:
-{
- fonts.packages = with pkgs; [
- source-code-pro
- ];
-
- system.defaults = {
- dock = {
- autohide = true;
- dashboard-in-overlay = false;
- launchanim = false; # Don't animate opening applications.
- mru-spaces = false; # don’t rearrange spaces based on the most recent use
- orientation = "bottom";
- show-recents = false;
- showhidden = false;
- tilesize = 30; # Default is 64.
- wvous-br-corner = 1; # Disable Notes hot corner.
- };
- finder.AppleShowAllExtensions = true;
-
- CustomUserPreferences = {
- "com.apple.desktopservices" = {
- # Avoid creating .DS_Store files on network or USB volumes
- DSDontWriteNetworkStores = true;
- DSDontWriteUSBStores = true;
- };
- };
-
- # Requires the directory to already exist.
- # See system.activationScripts.postUserActivation
- screencapture.location = "~/Documents/screenshots";
- SoftwareUpdate.AutomaticallyInstallMacOSUpdates = true;
- };
-}
diff --git a/modules/darwin/keyboard.nix b/modules/darwin/keyboard.nix
deleted file mode 100644
index c460bac..0000000
--- a/modules/darwin/keyboard.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
- system.keyboard = {
- enableKeyMapping = true;
- remapCapsLockToControl = true;
- };
-}
diff --git a/modules/darwin/nix.nix b/modules/darwin/nix.nix
deleted file mode 100644
index 56d85ca..0000000
--- a/modules/darwin/nix.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- lib,
- adminUser,
- pkgs,
- ...
-}:
-{
- nix = {
- extraOptions = ''
- tarball-ttl = 900
- '';
- gc = {
- automatic = true;
- options = "--delete-older-than 7d";
- };
- optimise = {
- automatic = true;
- };
- package = pkgs.nixVersions.stable;
- settings = {
- trusted-substituters = [
- "https://cachix.cachix.org"
- "https://nixpkgs.cachix.org"
- "https://nix-community.cachix.org"
- ];
- trusted-public-keys = [
- "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM="
- "nixpkgs.cachix.org-1:q91R6hxbwFvDqTSDKwDAV4T5PxqXGxswD8vhONFMeOE="
- "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
- "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
- ];
- trusted-users = [
- "@admin"
- adminUser.name
- ];
- experimental-features = lib.mkDefault [
- "nix-command"
- "flakes"
- ];
- };
- };
-}
diff --git a/modules/darwin/security.nix b/modules/darwin/security.nix
deleted file mode 100644
index 178fca1..0000000
--- a/modules/darwin/security.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-{
- # Touch ID for sudo auth
- security.pam.services.sudo_local.touchIdAuth = true;
-}
diff --git a/profiles/darwin.nix b/profiles/darwin.nix
new file mode 100644
index 0000000..736578c
--- /dev/null
+++ b/profiles/darwin.nix
@@ -0,0 +1,84 @@
+{
+ lib,
+ pkgs,
+ adminUser,
+ ...
+}:
+{
+ fonts.packages = with pkgs; [
+ source-code-pro
+ ];
+
+ system.keyboard = {
+ enableKeyMapping = true;
+ remapCapsLockToControl = true;
+ };
+
+ system.defaults = {
+ dock = {
+ autohide = true;
+ dashboard-in-overlay = false;
+ launchanim = false; # Don't animate opening applications.
+ mru-spaces = false; # don’t rearrange spaces based on the most recent use
+ orientation = "bottom";
+ show-recents = false;
+ showhidden = false;
+ tilesize = 30; # Default is 64.
+ wvous-br-corner = 1; # Disable Notes hot corner.
+ };
+ finder.AppleShowAllExtensions = true;
+
+ CustomUserPreferences = {
+ "com.apple.desktopservices" = {
+ # Avoid creating .DS_Store files on network or USB volumes
+ DSDontWriteNetworkStores = true;
+ DSDontWriteUSBStores = true;
+ };
+ };
+
+ # Requires the directory to already exist.
+ # See system.activationScripts.postUserActivation
+ screencapture.location = "~/Documents/screenshots";
+ SoftwareUpdate.AutomaticallyInstallMacOSUpdates = true;
+ };
+
+ # Touch ID for sudo auth
+ security.pam.services.sudo_local.touchIdAuth = true;
+
+ system.primaryUser = adminUser.name;
+
+ nix = {
+ extraOptions = ''
+ tarball-ttl = 900
+ '';
+ gc = {
+ automatic = true;
+ options = "--delete-older-than 7d";
+ };
+ optimise = {
+ automatic = true;
+ };
+ package = pkgs.nixVersions.stable;
+ settings = {
+ trusted-substituters = [
+ "https://cachix.cachix.org"
+ "https://nixpkgs.cachix.org"
+ "https://nix-community.cachix.org"
+ ];
+ trusted-public-keys = [
+ "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM="
+ "nixpkgs.cachix.org-1:q91R6hxbwFvDqTSDKwDAV4T5PxqXGxswD8vhONFMeOE="
+ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+ ];
+ trusted-users = [
+ "@admin"
+ adminUser.name
+ ];
+ experimental-features = lib.mkDefault [
+ "nix-command"
+ "flakes"
+ ];
+ };
+ };
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 04:51:29 +0000