From 195a5e15404bf1f764f0e0865b020ddd21e7a383 Mon Sep 17 00:00:00 2001
From: Maxiem Geldhof <author@maxiemgeldhof.com>
Date: Sat, 18 Oct 2025 13:59:43 +0200
Subject: [PATCH] Macbook updates for agenix

---
 systems/macbook/macbook.nix   | 14 ++++++++++----
 systems/macbook/users.nix     |  1 +
 systems/macbook/wireguard.nix | 11 +++--------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/systems/macbook/macbook.nix b/systems/macbook/macbook.nix
index 308b3ed..046c0dc 100644
--- a/systems/macbook/macbook.nix
+++ b/systems/macbook/macbook.nix
@@ -1,16 +1,22 @@
-{ nix-darwin, home-manager, agenix, self, ... }:
+{
+  nix-darwin,
+  home-manager,
+  agenix,
+  self,
+  ...
+}:
 nix-darwin.lib.darwinSystem {
   modules = [
+    agenix.darwinModules.default
     { system.primaryUser = "maxiemgeldhof"; }
     (import ../../modules/usermodules/darwinsettings.nix self)
     home-manager.darwinModules.home-manager
-    import ./users.nix
+    ./users.nix
     ./wireguard.nix
-    agenix.darwinModules.default
   ];
 
   specialArgs = {
-    home-manager=home-manager;
+    home-manager = home-manager;
     agenix = agenix;
   };
 }
diff --git a/systems/macbook/users.nix b/systems/macbook/users.nix
index da4bb7a..df3810e 100644
--- a/systems/macbook/users.nix
+++ b/systems/macbook/users.nix
@@ -20,4 +20,5 @@ in
   home-manager.useUserPackages = true;
   home-manager.users.maxiemgeldhof = userconfig;
   users.users.maxiemgeldhof.home = "/Users/maxiemgeldhof";
+  age.identityPaths = [ "/Users/maxiemgeldhof/.ssh/id_ed25519" ];
 }
diff --git a/systems/macbook/wireguard.nix b/systems/macbook/wireguard.nix
index 0e0139c..f299683 100644
--- a/systems/macbook/wireguard.nix
+++ b/systems/macbook/wireguard.nix
@@ -1,12 +1,7 @@
 { config, ... }:
 {
-  age.secrets.wg-private.file = "../../keys/wg-macbook";
-  services.wg-quick.interfaces.wg0 = {
-    # Add a name for your interface here, e.g., wg0
-    enable = true;
-    # Path to your WireGuard config file
-    # e.g., /etc/wireguard/wg0.conf
-
+  age.secrets.wg-private.file = ../../keys/wg-macbook;
+  networking.wg-quick.interfaces.wg-selene = {
     privateKeyFile = config.age.secrets.wg-private.path;
 
     # The internal IP address assigned to this client by the server.
@@ -23,7 +18,7 @@
     peers = [
       {
         # Public key of the SERVER.
-        publicKey = builtins.readFile ../../../keys/wg-selene.pub;
+        publicKey = builtins.readFile ../../keys/wg-selene.pub;
 
         # The server's public IP address and listening port.
         endpoint = "37.27.207.39:51820";