spotify moved, autodesk fusion fails, private internet moved

flake.nix

@@ -41,6 +41,10 @@
       url = "github:nix-community/nix-vscode-extensions";
     };
 
+   # mac-app-util doesn't work with OCLP installed on X86 
+   # mac-app-util = {
+   #   url = "github:hraban/mac-app-util";
+   # };
   };
   outputs =
     {
@@ -56,7 +60,7 @@
       nixd,
       sops-nix,
       nix-vscode-extensions,
-
+   #   mac-app-util,
     }@inputs:
     let
       user = "olaf";
@@ -135,6 +139,7 @@
             #    sops-nix.nixosModules.sops
             home-manager.darwinModules.home-manager
             nix-homebrew.darwinModules.nix-homebrew
+            # mac-app-util.darwinModules.default
             {
               nix-homebrew = {
                 inherit user;
@@ -147,6 +152,9 @@
                 mutableTaps = false;
                 autoMigrate = true;
               };
+              home-manager.sharedModules = [
+#                mac-app-util.homeManagerModules.default
+              ];
             }
             ./hosts/darwin
           ];

hosts/darwin/default.nix

@@ -57,6 +57,17 @@ in
     '';
   };
 
+
+  users.groups= {
+    gidevelopert={
+      description="Git Common Rights";
+      gid=500;
+      name= "gitdeveloper";
+      members = [ "olaf" ] ;
+    };
+  };
+
+  users.knownGroups=["gitdeveloper"];
   # Turn off NIX_PATH warnings now that we're using flakes
   system.checks.verifyNixPath = false;
 

modules/darwin/casks.nix

@@ -6,21 +6,20 @@ _:
   "iterm2"
   "oracle-jdk"
   "arduino-ide"
-  #  "visual-studio-code"
+  "visual-studio-code"
 
   # Creatative tools
-  "spotify"
   "blender"
   "gimp"
   "inkscape"
   "vcv-rack"
-  "affinity-designer"
-  "affinity-photo"
-  "affinity-publisher"
+  #"affinity-designer"
+  #"affinity-photo"
+  #"affinity-publisher"
 
   # Communication Tools
   "discord"
-  "slack"
+  #  "slack"
   "signal"
   "whatsapp"
   "zoom"
@@ -49,24 +48,23 @@ _:
   "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"
+ # "autodesk-fusion" #fails to install
   "qmk-toolbox"
   "dbeaver-community"
   "sqlitestudio"
 
-  "wireshark"
+  # "wireshark"
   # Browsers
   "google-chrome"
   "firefox"

modules/darwin/home-manager.nix

@@ -47,6 +47,21 @@ in
 
     masApps = {
       "wireguard" = 1451685025;
+      
+      "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 Manager" = 1511601750; # (8.11.0) Does not seem to install
+      "1Password for Safari" = 1569813296; # (8.10.82)
+      "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,12 +121,13 @@ 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/";
           options = "-l Jellyfin";
         }
-        { path = "/run/current-system/Applications/Visual Studio Code.app/"; }
+        { path = "/Applications/Visual Studio Code.app/"; }
         { path = "/Applications/Home Assistant.app/"; }
         { path = "/Applications/reMarkable.app/"; }
         { path = "/Applications/LibreOffice.app/"; }

modules/nixos/packages.nix

@@ -1,18 +1,23 @@
 { 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
   keepassxc
+  private-internet-access
 
   # App and package management
   appimage-run
   gnumake
   cmake
   home-manager
+  ansible
 
   # Media and design tools
   vlc
@@ -33,6 +38,9 @@ shared-packages ++ [
   postgresql
   libtool # for Emacs vterm
 
+  # System
+  istat-menus
+  
   # Screenshot and recording tools
   flameshot
 

modules/shared/packages-scratch

@@ -0,0 +1,39 @@
+(vscode-with-extensions.override {
+    vscodeExtensions =
+      with vscode-extensions;
+      [
+        #bbenoist.nix
+        jnoortheen.nix-ide
+        ms-python.python
+        ms-azuretools.vscode-docker
+        #        ms-vscode-remote.remote-ssh
+        # ms-vscode.cpptools
+        eamodio.gitlens
+
+      ]
+      ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+        #        {
+        #          name = "remote-ssh-edit";
+        #          publisher = "ms-vscode-remote";
+        #          version = "0.47.2";
+        #          sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
+        #        }
+        {
+          name = "cpptools";
+          publisher = "ms-vscode";
+          version = "1.26.1";
+          sha256 = "sha256-uVE7sEO8XN3ArFpElUw25/BKyCOzF1EmZ5nHBkdoL/0=";
+        }
+        #        {
+        #          name = "minifyall";
+        #          publisher = "josee9988";
+        #          version = "2.10";
+        #        }
+        {
+          name = "platformio-ide";
+          publisher = "platformio";
+          version = "3.3.4";
+          sha256 = "sha256-qfNz4IYjCmCMFLtAkbGTW5xnsVT8iDnFWjrgkmr2Slk=";
+        }
+      ];
+  })

modules/shared/packages.nix

@@ -4,6 +4,7 @@ with pkgs;
 [
   # Nix
   nixd
+  mas
   # General packages for development and system management
   #alacritty
   aspell
@@ -84,51 +85,51 @@ with pkgs;
   cargo
   platformio-core
 
-  (vscode-with-extensions.override {
-    vscodeExtensions =
-      with vscode-extensions;
-      [
-        #bbenoist.nix
-        jnoortheen.nix-ide
-        ms-python.python
-        ms-azuretools.vscode-docker
-        #        ms-vscode-remote.remote-ssh
-        eamodio.gitlens
-        james-yu.latex-workshop
-        ms-vscode.cmake-tools
-        shd101wyy.markdown-preview-enhanced
-      ]
-      ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-        #        {
-        #          name = "remote-ssh-edit";
-        #          publisher = "ms-vscode-remote";
-        #          version = "0.47.2";
-        #          sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
-        #        }
-        {
-          name = "cpptools";
-          publisher = "ms-vscode";
-          version = "1.26.1";
-          sha256 = "sha256-uVE7sEO8XN3ArFpElUw25/BKyCOzF1EmZ5nHBkdoL/0=";
-        }
-        {
-          name = "minifyall";
-          publisher = "josee9988";
-          version = "2.10.0";
-          sha256 = "sha256-cH5x8fUN0n+hO1b3lNzau2MnyeYmsD0ZXAYGxCQjT0Y=";
-        }
-        {
-          name = "platformio-ide";
-          publisher = "platformio";
-          version = "3.3.4";
-          sha256 = "sha256-qfNz4IYjCmCMFLtAkbGTW5xnsVT8iDnFWjrgkmr2Slk=";
-        }
-      ];
-  })
+  #  (vscode-with-extensions.override {
+  #    vscodeExtensions =
+  #      with vscode-extensions;
+  #      [
+  #        #bbenoist.nix
+  #        jnoortheen.nix-ide
+  #        ms-python.python
+  #        ms-azuretools.vscode-docker
+  #        #        ms-vscode-remote.remote-ssh
+  #        eamodio.gitlens
+  #        james-yu.latex-workshop
+  #      ]
+  #      ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+  #        #        {
+  #        #          name = "remote-ssh-edit";
+  #        #          publisher = "ms-vscode-remote";
+  #        #          version = "0.47.2";
+  #        #          sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
+  #       #        }
+  #       {
+  #         name = "cpptools";
+  #         publisher = "ms-vscode";
+  #         version = "1.26.1";
+  #          sha256 = "sha256-uVE7sEO8XN3ArFpElUw25/BKyCOzF1EmZ5nHBkdoL/0=";
+  #        }
+  #        {
+  #          name = "minifyall";
+  #          publisher = "josee9988";
+  #          version = "2.10.0";
+  #          sha256 = "sha256-cH5x8fUN0n+hO1b3lNzau2MnyeYmsD0ZXAYGxCQjT0Y=";
+  #        }
+  #        {
+  #          name = "platformio-ide";
+  #          publisher = "platformio";
+  #          version = "3.3.4";
+  #          sha256 = "sha256-qfNz4IYjCmCMFLtAkbGTW5xnsVT8iDnFWjrgkmr2Slk=";
+  #       }
+  #      ];
+  #  })
 
-  # Tex and LaTex
+  # XML, Tex and LaTex
   pandoc
   mdbook
+  xml2rfc
+  rubyPackages_3_4.kramdown-rfc2629
 
   (texlive.combine {
     inherit (texlive)