From f54276701839c891ac7b73059c9e5c0ae4526f3e Mon Sep 17 00:00:00 2001
From: Olaf <github@dacht.net>
Date: Wed, 16 Jul 2025 18:07:52 +0200
Subject: [PATCH] Moving a bunch of packages from brew to apple store

---
 modules/darwin/casks.nix        | 21 ++++++++++-----------
 modules/darwin/home-manager.nix | 15 +++++++++++++++
 modules/nixos/packages.nix      |  8 ++++++--
 modules/shared/packages.nix     |  5 ++++-
 4 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/modules/darwin/casks.nix b/modules/darwin/casks.nix
index d00cccc..43ea376 100644
--- a/modules/darwin/casks.nix
+++ b/modules/darwin/casks.nix
@@ -14,13 +14,13 @@ _:
   "gimp"
   "inkscape"
   "vcv-rack"
-  "affinity-designer"
-  "affinity-photo"
-  "affinity-publisher"
+  #"affinity-designer"
+  #"affinity-photo"
+  #"affinity-publisher"
 
   # Communication Tools
   "discord"
-  "slack"
+  #  "slack"
   "signal"
   "whatsapp"
   "zoom"
@@ -46,27 +46,26 @@ _:
   "obs"
 
   # Productivity Tools
-  "1Password"
+  # "1Password"
   "zotero"
   "gpg-suite"
-  "home-assistant"
-  "Fantastical"
-  "Remarkable"
+  #"home-assistant"
+  #"Fantastical"
+  #"Remarkable"
   "mailmate"
   "spamsieve"
-  "libreoffice"
   "macdown"
   "calibre"
   "superslicer"
   "element"
-  "mqtt-explorer"
+  #  "mqtt-explorer"
   "virtualbox"
   "autodesk-fusion"
   "qmk-toolbox"
   "dbeaver-community"
   "sqlitestudio"
 
-  "wireshark"
+  # "wireshark"
   # Browsers
   "google-chrome"
   "firefox"
diff --git a/modules/darwin/home-manager.nix b/modules/darwin/home-manager.nix
index 0c60cce..8ba1085 100644
--- a/modules/darwin/home-manager.nix
+++ b/modules/darwin/home-manager.nix
@@ -47,6 +47,20 @@ in
 
     masApps = {
       "wireguard" = 1451685025;
+      "private-internet-access" = 955626407;
+      "LibreOffice" = 1630474372;
+      "Affinity Designer 2" = 1616831348;
+      "Affinity Photo 2: Image Editor" = 1616822987;
+      "Affinity Publisher 2" = 1606941598;
+      "Home Assistant" = 1099568401; # (2025.7.1)
+      "Fantastical - Calendar" = 975937182;
+      "1Password: Password Manage" = 1511601750; # (8.11.0)
+      "Slack for Desktop" = 803453959; # (4.45.60)
+      "Remarkable Desktop" = 1276493162; # (3.19.0)
+      "Ice Cubes for Mastodon" = 6444915884; # (1.11.3)
+      "MQTT Explorer" = 1455214828; # (0.3.5)
+      "WiFi Explorer: Scanner" = 494803304; # (3.5.6)
+      "Night Sky" = 475772902; # 475772902
     };
   };
 
@@ -106,6 +120,7 @@ in
         { path = "/System/Applications/System Settings.app/"; }
         { path = "/Applications/Signal.app/"; }
         { path = "/Applications/WhatsApp.app/"; }
+        { path = "/Applications/Ice\ Cubes.app/"; }
 
         {
           path = "/Applications/Jellyfin Media Player.app/";
diff --git a/modules/nixos/packages.nix b/modules/nixos/packages.nix
index e2fba88..33c299b 100644
--- a/modules/nixos/packages.nix
+++ b/modules/nixos/packages.nix
@@ -1,8 +1,11 @@
 { pkgs }:
 
 with pkgs;
-let shared-packages = import ../shared/packages.nix { inherit pkgs; }; in
-shared-packages ++ [
+let
+  shared-packages = import ../shared/packages.nix { inherit pkgs; };
+in
+shared-packages
+++ [
 
   # Security and authentication
   yubikey-agent
@@ -13,6 +16,7 @@ shared-packages ++ [
   gnumake
   cmake
   home-manager
+  ansible
 
   # Media and design tools
   vlc
diff --git a/modules/shared/packages.nix b/modules/shared/packages.nix
index bf0824e..1bacebe 100644
--- a/modules/shared/packages.nix
+++ b/modules/shared/packages.nix
@@ -4,6 +4,7 @@ with pkgs;
 [
   # Nix
   nixd
+  mas
   # General packages for development and system management
   #alacritty
   aspell
@@ -124,9 +125,11 @@ with pkgs;
   #      ];
   #  })
 
-  # Tex and LaTex
+  # XML, Tex and LaTex
   pandoc
   mdbook
+  xml2rfc
+  rubyPackages_3_4.kramdown-rfc2629
 
   (texlive.combine {
     inherit (texlive)