browser reorg to cask. Font.packages

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=" 
+      trusted-public-keys = [
-       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-       ];
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
     };
 
     gc = {
@@ -60,37 +61,58 @@ in
     '';
   };
 
-
+  users.groups = {
-  users.groups= {
+    gidevelopert = {
-    gidevelopert={
+      description = "Git Common Rights";
-      description="Git Common Rights";
+      gid = 500;
-      gid=500;
+      name = "gitdeveloper";
-      name= "gitdeveloper";
+      members = [ "olaf" ];
-      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
+      font-awesome
+      noto-fonts
+      noto-fonts-color-emoji
+      #   jetbrains-mono
+      hack-font
+      meslo-lgs-nf
+      nerd-fonts.fira-code
+      nerd-fonts.droid-sans-mono
+
+    ]
+    # 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
+      # Emacs with automatic package management from overlay
-        (emacsWithPackagesFromUsePackage {
+      (emacsWithPackagesFromUsePackage {
-          config = ../config/emacs/emacs.el;
+        config = ../config/emacs/emacs.el;
-          defaultInitFile = true;
+        defaultInitFile = true;
-          package = emacs-git;
+        package = emacs-git;
-          alwaysEnsure = true;
+        alwaysEnsure = true;
-          extraEmacsPackages = epkgs: with epkgs; [
+        extraEmacsPackages =
+          epkgs: with epkgs; [
             magit
             company
             nix-mode
             use-package
           ];
-        })
+      })
     ]
     ++ (import ../../modules/shared/packages.nix { inherit pkgs llm-agents; })
 
@@ -108,8 +130,7 @@ in
     StandardOutPath = "/tmp/emacs.out.log";
   };
 
-
+  launchd.user.agents.ollama = {
-launchd.user.agents.ollama = {
     command = "${pkgs.ollama}/bin/ollama serve";
     serviceConfig = {
       KeepAlive = true;
@@ -119,7 +140,6 @@ launchd.user.agents.ollama = {
     };
   };
 
-
   system = {
     stateVersion = 4;
     primaryUser = "${user}";

modules/darwin/casks.nix

@@ -68,6 +68,11 @@ _:
   "copilot-cli"
 
   # Browsers
+  "brave-browser"
+  "firefox"
+  "google-chrome"
+ 
+ 
 
 # x11
 "xquartz"

modules/darwin/home-manager.nix

@@ -137,7 +137,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/"; }
         {
@@ -153,7 +153,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 = "0n7hpzf0j7fgizcfxqsk3i1f06k1clmbkdy099sn1sgh2x2h3ig7";
+  emacsOverlaySha256 = "15b6dgv9iaysf7igicmpvjgv71ivh3bll3zqh7kcw4a8v0chhsqf";
 in
 {
 

modules/shared/packages.nix

@@ -15,9 +15,7 @@ with pkgs;
     xterm    
 
   # The Web Browsers  
-  brave
+  # maintained by in homebrew
-  firefox
-  #  google-chrome. #stopped working
 
   # security and some such
   # bitwarden-desktop #Does not compile properly
@@ -80,17 +78,13 @@ with pkgs;
   docker-compose
 
   # Media-related packages
-  dejavu_fonts
+
-  emacs-all-the-icons-fonts
   fd
   ffmpeg
-  font-awesome
+ imagemagick
-  #   jetbrains-mono
+ 
-  hack-font
+
-  imagemagick
+
-  meslo-lgs-nf
-  noto-fonts
-  noto-fonts-color-emoji
 
   # Node.js development tools
   #nodePackages.npm # globally install npm