From 0ae424d772f890de6de7a79c7f7b82ab6775723e Mon Sep 17 00:00:00 2001
From: Olaf <github@dacht.net>
Date: Thu, 8 May 2025 12:00:45 +0200
Subject: [PATCH] Installing 1Password from Cask instead of Applestore (mas)

---
 modules/darwin/casks.nix        | 4 ++++
 modules/darwin/home-manager.nix | 8 ++++++--
 modules/darwin/packages.nix     | 8 ++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/modules/darwin/casks.nix b/modules/darwin/casks.nix
index c6add5b..ba566f2 100644
--- a/modules/darwin/casks.nix
+++ b/modules/darwin/casks.nix
@@ -12,6 +12,9 @@ _:
   "gimp"
   "inkscape"
   "vcv-rack"
+  "affinity-designer"
+  "affinity-photo"
+  "affinity-publisher"
 
   # Communication Tools
   "discord"
@@ -29,6 +32,7 @@ _:
   "box-drive"
   "synology-drive"
   "spamsieve"
+  "keybase"
 
   # Entertainment Tools
   "vlc"
diff --git a/modules/darwin/home-manager.nix b/modules/darwin/home-manager.nix
index 40197f0..ee275a2 100644
--- a/modules/darwin/home-manager.nix
+++ b/modules/darwin/home-manager.nix
@@ -46,7 +46,6 @@ in
     # This message is safe to ignore. (https://github.com/dustinlyons/nixos-config/issues/83)
 
     masApps = {
-      "1password" = 1333542190;
       "wireguard" = 1451685025;
     };
   };
@@ -105,6 +104,8 @@ in
         { path = "/System/Applications/Photos.app/"; }
         { path = "/System/Applications/System Settings.app/"; }
         { path = "/Applications/Signal.app/"; }
+        { path = "/Applications/WhatsApp.app/"; }
+
         {
           path = "/Applications/Jellyfin Media Player.app/";
           options = "-l Jellyfin";
@@ -113,7 +114,10 @@ in
         { path = "/Applications//Home Assistant.app/"; }
         { path = "/Applications//Remarkable.app/"; }
         { path = "/Applications/LibreOffice.app/"; }
-
+        { path = "/Applications/Microsoft Word.app/"; }
+        { path = "/Applications/Microsoft Powerpoint.app/"; }
+        { path = "/Applications/Microsoft Teams.app/"; }
+        { path = "/System/Applications/Utilities/Screen Sharing.app/"}
         {
           path = "/Applications/";
           section = "others";
diff --git a/modules/darwin/packages.nix b/modules/darwin/packages.nix
index 7eaa1d8..290dfe7 100644
--- a/modules/darwin/packages.nix
+++ b/modules/darwin/packages.nix
@@ -1,7 +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
+++ [
   dockutil
+  mas
 ]