From 2fd25ace93bb7057ff5e0044907b0f3b431883a8 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 12 Aug 2025 10:18:59 -0700 Subject: add profiles for darwin and remote builder --- profiles/darwin.nix | 3 --- profiles/darwin/security.nix | 5 +++++ profiles/nix/remote-builder.nix | 32 ++++++++++++++++++++++++++++++++ profiles/remote-builder.nix | 32 -------------------------------- 4 files changed, 37 insertions(+), 35 deletions(-) create mode 100644 profiles/darwin/security.nix create mode 100644 profiles/nix/remote-builder.nix delete mode 100644 profiles/remote-builder.nix (limited to 'profiles') diff --git a/profiles/darwin.nix b/profiles/darwin.nix index 0ff8cc0..36010c7 100644 --- a/profiles/darwin.nix +++ b/profiles/darwin.nix @@ -46,9 +46,6 @@ # mkdir -p ~/Documents/screenshots # ''; - # Touch ID for sudo auth - security.pam.services.sudo_local.touchIdAuth = true; - nix = { extraOptions = '' tarball-ttl = 900 diff --git a/profiles/darwin/security.nix b/profiles/darwin/security.nix new file mode 100644 index 0000000..178fca1 --- /dev/null +++ b/profiles/darwin/security.nix @@ -0,0 +1,5 @@ +{ ... }: +{ + # Touch ID for sudo auth + security.pam.services.sudo_local.touchIdAuth = true; +} diff --git a/profiles/nix/remote-builder.nix b/profiles/nix/remote-builder.nix new file mode 100644 index 0000000..50d3e84 --- /dev/null +++ b/profiles/nix/remote-builder.nix @@ -0,0 +1,32 @@ +{ config, ... }: +{ + nix.buildMachines = [ + { + hostName = "builder"; + sshUser = "builder"; + + protocol = "ssh"; + + sshKey = config.age.secrets.ssh-remote-builder.path; + + systems = [ + "x86_64-linux" + ]; + + maxJobs = 1; + + supportedFeatures = [ + "nixos-test" + ]; + } + ]; + + nix.distributedBuilds = true; + + programs.ssh.extraConfig = '' + Host builder + User builder + HostName vm-synology + IdentityFile ${config.age.secrets.ssh-remote-builder.path} + ''; +} diff --git a/profiles/remote-builder.nix b/profiles/remote-builder.nix deleted file mode 100644 index 50d3e84..0000000 --- a/profiles/remote-builder.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ config, ... }: -{ - nix.buildMachines = [ - { - hostName = "builder"; - sshUser = "builder"; - - protocol = "ssh"; - - sshKey = config.age.secrets.ssh-remote-builder.path; - - systems = [ - "x86_64-linux" - ]; - - maxJobs = 1; - - supportedFeatures = [ - "nixos-test" - ]; - } - ]; - - nix.distributedBuilds = true; - - programs.ssh.extraConfig = '' - Host builder - User builder - HostName vm-synology - IdentityFile ${config.age.secrets.ssh-remote-builder.path} - ''; -} -- cgit v1.2.3