From 984a677327cdf05ec1481c957c5b6e59bf471325 Mon Sep 17 00:00:00 2001
From: Olaf <github@dacht.net>
Date: Fri, 31 Jul 2026 17:46:34 +0200
Subject: [PATCH] Moved casks and other homebrew to the brewery file.

---
 modules/darwin/brewery.nix      | 52 +++++++++++++++++++++++++++++
 modules/darwin/home-manager.nix | 59 +++++++--------------------------
 2 files changed, 64 insertions(+), 47 deletions(-)
 create mode 100644 modules/darwin/brewery.nix

diff --git a/modules/darwin/brewery.nix b/modules/darwin/brewery.nix
new file mode 100644
index 0000000..019c442
--- /dev/null
+++ b/modules/darwin/brewery.nix
@@ -0,0 +1,52 @@
+{pkgs, ...}:
+{
+homebrew = {
+    enable = true;
+    global = {
+      brewfile = true;
+    };
+    brews = []; 
+    casks = pkgs.callPackage ./casks.nix { };
+    onActivation = {
+      cleanup = "check";
+      autoUpdate = true;
+      upgrade = true;
+
+    };
+
+    # These app IDs are from using the mas CLI app
+    # mas = mac app store
+    # https://github.com/mas-cli/mas
+    #
+    # $ nix shell nixpkgs#mas
+    # $ mas search <app name>
+    #
+    # If you have previously added these apps to your Mac App Store profile (but not installed them on this system),
+    # you may receive an error message "Redownload Unavailable with This Apple ID".
+    # This message is safe to ignore.
+
+    masApps = {
+      "1Password for Safari" = 1569813296; # (8.10.82)
+      "Affinity Designer 2" = 1616831348;
+      "Affinity Photo 2: Image Editor" = 1616822987;
+      "Affinity Publisher 2" = 1606941598;
+      # "DaisyDisk" = 409907375; # (4.32)  # Don't use this, we need the official version that is not sandboxed
+      "Fantastical - Calendar" = 975937182;
+      "Fedistar" =  6445863996; # (1.13.1)
+      "Home Assistant" = 1099568401; # (2025.7.1)
+      "Ice Cubes for Mastodon" = 6444915884; # (1.11.3)
+      "LibreOffice" = 1630474372;
+      "Monal - XMPP Chatting " = 1637078500;
+      "MQTT Explorer" = 1455214828; # (0.3.5)
+      "Night Sky" = 475772902; # 475772902
+      "Native SQLite Manager" = 1416282836; # (1.31.0)
+      "Remarkable Desktop" = 1276493162; # (3.19.0)
+      "Slack for Desktop" = 803453959; # (4.45.60)
+      "WiFi Explorer: Scanner" = 494803304; # (3.5.6)
+      "Windows App Installer" = 1295203466; # (1.0.16)
+      "Wireguard" = 1451685025; # (1.0.16)
+      ###      "1Password: Password Manager" = 1511601750; # (8.11.0) Does not seem to insta
+    };
+  };
+
+  }
\ No newline at end of file
diff --git a/modules/darwin/home-manager.nix b/modules/darwin/home-manager.nix
index 2b67b92..c6b911c 100644
--- a/modules/darwin/home-manager.nix
+++ b/modules/darwin/home-manager.nix
@@ -28,55 +28,20 @@ in
     home = "/Users/${user}";
     isHidden = false;
     shell = pkgs.zsh;
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILCEBZrQ9F3nLhEM9uqdPijut11vhYkdmLtj7gT/zgV3  Key Nov 2024"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA9vrzEHmWEX5sCVsp6J4tVrxEzzqMSRkijHEfVg2WrC cardno:36_431_811"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG5BytZleG7m1926MSNwVXyPJ0QD5Z919cFCp22BN5hV cardno:35_775_013"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAl/jn18uVPJ9Uyv8gqk80gVQaMHrcd1b+B/SB/6RsX8 cardno:36_431_751"
+      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAILVdAx+U1xhcJmh1hRaF0CVB0ivIF/U0oIbAWYPwko4iAAAABHNzaDo= Yubikey 35775013"
+      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIIjnJyJUDnia6ZWPRa5iSBKCb+DMGmFtiFa+9gkeiTwQAAAABHNzaDo= Yubikey 36431751"
+      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIFhuPQUHUHchx8wHVCciMi6etzZStkpECbG/r/1imy+kAAAABHNzaDo=  Yubikey 36431881"
+    ];
   };
 
-  homebrew = {
-    enable = true;
-    global = {
-      brewfile = true;
-    };
-    casks = pkgs.callPackage ./casks.nix { };
-    onActivation = {
-      cleanup = "none";
-      autoUpdate = true;
-      upgrade = true;
-
-    };
-
-    # These app IDs are from using the mas CLI app
-    # mas = mac app store
-    # https://github.com/mas-cli/mas
-    #
-    # $ nix shell nixpkgs#mas
-    # $ mas search <app name>
-    #
-    # If you have previously added these apps to your Mac App Store profile (but not installed them on this system),
-    # you may receive an error message "Redownload Unavailable with This Apple ID".
-    # This message is safe to ignore.
-
-    masApps = {
-      "1Password for Safari" = 1569813296; # (8.10.82)
-      "Affinity Designer 2" = 1616831348;
-      "Affinity Photo 2: Image Editor" = 1616822987;
-      "Affinity Publisher 2" = 1606941598;
-      # "DaisyDisk" = 409907375; # (4.32)  # Don't use this, we need the official version that is not sandboxed
-      "Fantastical - Calendar" = 975937182;
-      "Fedistar" =  6445863996; # (1.13.1)
-      "Home Assistant" = 1099568401; # (2025.7.1)
-      "Ice Cubes for Mastodon" = 6444915884; # (1.11.3)
-      "LibreOffice" = 1630474372;
-      "Monal - XMPP Chatting " = 1637078500;
-      "MQTT Explorer" = 1455214828; # (0.3.5)
-      "Night Sky" = 475772902; # 475772902
-      "Native SQLite Manager" = 1416282836; # (1.31.0)
-      "Remarkable Desktop" = 1276493162; # (3.19.0)
-      "Slack for Desktop" = 803453959; # (4.45.60)
-      "WiFi Explorer: Scanner" = 494803304; # (3.5.6)
-      "Windows App Installer" = 1295203466; # (1.0.16)
-      "Wireguard" = 1451685025; # (1.0.16)
-      ###      "1Password: Password Manager" = 1511601750; # (8.11.0) Does not seem to insta
-    };
-  };
+  imports = [
+    ./homebrew.nix
+  ];
 
   # Enable home-manager
   home-manager = {