Fixed brew inconstistency andded tigervnc

flake.nix

@@ -16,8 +16,13 @@
       url = "github:nix-darwin/nix-darwin/nix-darwin-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    brew-src = {
+      url = "github:Homebrew/brew/master";
+      flake = false;
+    };
     nix-homebrew = {
       url = "github:zhaofengli-wip/nix-homebrew";
+      inputs.brew-src.follows = "brew-src";
     };
     homebrew-bundle = {
       url = "github:homebrew/homebrew-bundle";

hosts/darwin/default.nix

@@ -40,9 +40,10 @@ in
         "https://nix-community.cachix.org"
         "https://cache.nixos.org"
       ];
-      trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" 
-       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-       ];
+      trusted-public-keys = [
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
     };
 
     gc = {
@@ -60,37 +61,60 @@ in
     '';
   };
 
-
-  users.groups= {
-    gidevelopert={
-      description="Git Common Rights";
-      gid=500;
-      name= "gitdeveloper";
-      members = [ "olaf" ] ;
+  users.groups = {
+    gidevelopert = {
+      description = "Git Common Rights";
+      gid = 500;
+      name = "gitdeveloper";
+      members = [ "olaf" ];
     };
   };
 
-  users.knownGroups=["gitdeveloper"];
+  users.knownGroups = [ "gitdeveloper" ];
   # Turn off NIX_PATH warnings now that we're using flakes
   system.checks.verifyNixPath = false;
 
+  fonts = {
+    packages = with pkgs; [
+      dejavu_fonts
+      emacs-all-the-icons-fonts
+      #  feather-font # from overlayj
+      jetbrains-mono
+      google-fonts
+      font-awesome
+      noto-fonts
+      noto-fonts-color-emoji
+      #   jetbrains-mono
+      hack-font
+      meslo-lgs-nf
+      nerd-fonts.fira-code
+      nerd-fonts.droid-sans-mono
+      noto-fonts-cjk-sans
+      noto-fonts
+    ]
+    # this adds all nerd-fonts Gigabytes of them, too much.
+    # ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts)
+    ;
+
+  };
   # Load configuration that is shared across systems
   environment.systemPackages =
     with pkgs;
     [
-    # Emacs with automatic package management from overlay
-        (emacsWithPackagesFromUsePackage {
-          config = ../config/emacs/emacs.el;
-          defaultInitFile = true;
-          package = emacs-git;
-          alwaysEnsure = true;
-          extraEmacsPackages = epkgs: with epkgs; [
+      # Emacs with automatic package management from overlay
+      (emacsWithPackagesFromUsePackage {
+        config = ../config/emacs/emacs.el;
+        defaultInitFile = true;
+        package = emacs-git;
+        alwaysEnsure = true;
+        extraEmacsPackages =
+          epkgs: with epkgs; [
             magit
             company
             nix-mode
             use-package
           ];
-        })
+      })
     ]
     ++ (import ../../modules/shared/packages.nix { inherit pkgs llm-agents; })
 
@@ -108,6 +132,16 @@ in
     StandardOutPath = "/tmp/emacs.out.log";
   };
 
+  launchd.user.agents.ollama = {
+    command = "${pkgs.ollama}/bin/ollama serve";
+    serviceConfig = {
+      KeepAlive = true;
+      RunAtLoad = true;
+      StandardOutPath = "/tmp/ollama.out.log";
+      StandardErrorPath = "/tmp/ollama.err.log";
+    };
+  };
+
   system = {
     stateVersion = 4;
     primaryUser = "${user}";

modules/darwin/casks.nix

@@ -8,7 +8,7 @@ _:
   "oracle-jdk"
   "visual-studio-code"
 
-  # Creatative tools
+  # Creative tools
   "blender"
   "gimp"
   "inkscape"
@@ -56,7 +56,7 @@ _:
   "dbeaver-community"
   "element"
   "gpg-suite"
-  "macdown"
+  "macdown-3000"
   "mailmate"
   "orcaslicer"
   "remanager"
@@ -64,11 +64,17 @@ _:
   "smartsheet"
   "spamsieve"
 #  "sqlitestudio" # Doesn't work without Rosetta
-  "virtualbox"
+   "tigervnc"
+   #  "virtualbox" # build error?
   "copilot-cli"
 
   # Browsers
+  "brave-browser"
+  "firefox"
+  "google-chrome"
  
+ 
+
 # x11
 "xquartz"
 ]

modules/darwin/home-manager.nix

@@ -33,8 +33,13 @@ in
 
   homebrew = {
     enable = true;
+    
     casks = pkgs.callPackage ./casks.nix { };
-    # onActivation.cleanup = "uninstall";
+    onActivation = {
+      cleanup = "uninstall";
+      autoUpdate = true;
+      upgrade = true;
+    };
 
     # These app IDs are from using the mas CLI app
     # mas = mac app store
@@ -65,6 +70,7 @@ in
       "Remarkable Desktop" = 1276493162; # (3.19.0)
       "Slack for Desktop" = 803453959; # (4.45.60)
       "WiFi Explorer: Scanner" = 494803304; # (3.5.6)
+      "Wireguard" = 1451685025; # (1.0.16)
       ###      "1Password: Password Manager" = 1511601750; # (8.11.0) Does not seem to insta
     };
   };
@@ -132,7 +138,7 @@ in
         { path = "/Applications/Bitwarden.app"; }
         { path = "/Applications/Calendar.app/"; }
         { path = "/Applications/Notes.app/"; }
-        { path = "/run/current-system/Applications/Firefox.app/"; }
+        { path = "/Applications/Firefox.app/"; }
 
         { path = "/Applications/Slack.app/"; }
         {
@@ -148,7 +154,7 @@ in
         { path = "/Applications/Qobuz.app/"; }
         { path = "/System/Volumes/Preboot/Cryptexes/App/System/Applications/Safari.app/"; }
         {
-          path = "/run/current-system/Applications/Brave Browser.app/";
+          path = "/Applications/Brave Browser.app/";
           options = "-l Brave";
         }
         { path = "/System/Applications/Photos.app/"; }

modules/shared/default.nix

@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 let
-  emacsOverlaySha256 = "02yxwls39cj02yw03b01hvg6h2fvk9k54adzqgi569mm7ld39rx8";
+  emacsOverlaySha256 = "0pqnl05j86pyvrlqh5kk4sximi749xqgiffq47grw7v98nqd2yin";
 in
 {
 

modules/shared/packages.nix

@@ -12,12 +12,10 @@ with pkgs;
     libxext
     libxrender
     libxrandr
-    xterm
+    xterm    
 
-  # The Web Browsers
-  brave
-  firefox
-  #  google-chrome. #stopped working
+  # The Web Browsers  
+  # maintained by in homebrew
 
   # security and some such
   # bitwarden-desktop #Does not compile properly
@@ -80,24 +78,19 @@ with pkgs;
   docker-compose
 
   # Media-related packages
-  dejavu_fonts
-  emacs-all-the-icons-fonts
+
   fd
   ffmpeg
-  font-awesome
-  #   jetbrains-mono
-  hack-font
-  imagemagick
-  meslo-lgs-nf
-  noto-fonts
-  noto-fonts-color-emoji
+ imagemagick
+ 
+
+
 
   # Node.js development tools
   #nodePackages.npm # globally install npm
   #nodePackages.prettier
 
   # Text and terminal utilities
-  xterm
 
   htop
   hunspell
@@ -115,6 +108,7 @@ with pkgs;
   # Python packages
   # python3
   virtualenv
+  uv
 
   (python3.withPackages (
     python-pkgs: with python-pkgs; [
@@ -153,7 +147,7 @@ with pkgs;
   ))
 
   # LLM
-  ollama
+  ollama # Launchd definition in hosts/darwin/default.nix
 
   # Social
   pidgin
@@ -229,6 +223,8 @@ with pkgs;
 
 ### Agents from https://github.com/numtide/llm-agents.nix
 
+
+
 ++ (with llm-agents.packages.${pkgs.stdenv.hostPlatform.system}; [
   hermes-desktop
   hermes-hud