comment on how to test the overlay is needed.

apps/aarch64-darwin/apply

@@ -113,20 +113,11 @@ confirm_details
 replace_tokens() {
   local file="$1"
   if [[ $(basename $1) != "apply" ]]; then
-    if [[ "$OS" == "Darwin" ]]; then
       # macOS
       LC_ALL=C LANG=C sed -i '' -e "s/%USER%/$USERNAME/g" "$file"
       LC_ALL=C LANG=C sed -i '' -e "s/%EMAIL%/$GIT_EMAIL/g" "$file"
       LC_ALL=C LANG=C sed -i '' -e "s/%NAME%/$GIT_NAME/g" "$file"
-    else
+ 
-      # Linux or other
-      sed -i -e "s/%USER%/$USERNAME/g" "$file"
-      sed -i -e "s/%EMAIL%/$GIT_EMAIL/g" "$file"
-      sed -i -e "s/%NAME%/$GIT_NAME/g" "$file"
-      sed -i -e "s/%INTERFACE%/$PRIMARY_IFACE/g" "$file"
-      sed -i -e "s/%DISK%/$BOOT_DISK/g" "$file"
-      sed -i -e "s/%HOST%/$HOST_NAME/g" "$file"
-    fi
   fi
 }
 

apps/x86_64-darwin/apply

@@ -113,20 +113,10 @@ confirm_details
 replace_tokens() {
   local file="$1"
   if [[ $(basename $1) != "apply" ]]; then
-    if [[ "$OS" == "Darwin" ]]; then
       # macOS
       LC_ALL=C LANG=C sed -i '' -e "s/%USER%/$USERNAME/g" "$file"
       LC_ALL=C LANG=C sed -i '' -e "s/%EMAIL%/$GIT_EMAIL/g" "$file"
       LC_ALL=C LANG=C sed -i '' -e "s/%NAME%/$GIT_NAME/g" "$file"
-    else
-      # Linux or other
-      sed -i -e "s/%USER%/$USERNAME/g" "$file"
-      sed -i -e "s/%EMAIL%/$GIT_EMAIL/g" "$file"
-      sed -i -e "s/%NAME%/$GIT_NAME/g" "$file"
-      sed -i -e "s/%INTERFACE%/$PRIMARY_IFACE/g" "$file"
-      sed -i -e "s/%DISK%/$BOOT_DISK/g" "$file"
-      sed -i -e "s/%HOST%/$HOST_NAME/g" "$file"
-    fi
   fi
 }
 

modules/darwin/casks.nix

@@ -14,6 +14,7 @@ _:
   "inkscape"
   "vcv-rack"
   "affinity"
+
   
   # Communication Tools
   "adium"

modules/darwin/default.nix

@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 let
-  emacsOverlaySha256 = "0h15850dpx3p2jr5g4nv0gir0w9dgml1mqzc5yq8686y246r33br";
+  emacsOverlaySha256 = "1smprpp3zqh04jdv0b7ibc69n025j1bnpp76lnwyvidilf055g2h";
 in
 {
   home-manager.backupFileExtension = "nix-backup";

modules/darwin/files.nix

@@ -9,11 +9,32 @@ let
   xdg_configHome = "${config.users.users.${user}.home}/.config";
   xdg_dataHome = "${config.users.users.${user}.home}/.local/share";
   xdg_stateHome = "${config.users.users.${user}.home}/.local/state";
+  inkscapeExtensionsHome = "${config.users.users.${user}.home}/Library/Application Support/org.inkscape.Inkscape/config/inkscape/extensions";
+  hatchFillSource = pkgs.fetchzip {
+    url = "https://gitlab.com/moini_ink/hatch_fill/-/archive/master/hatch_fill-master.tar.gz";
+    sha256 = "1m3qhvf158dngg7shwd33xhn3bawn9yxw2srv2k8qjn889wjvi82";
+  };
 in
 {
 
   # Shared file definitions moved into the Darwin module set.
 
+  "${config.users.users.${user}.home}/.gnupg/common.conf" = {
+    text = ''
+      # keyboxd configuration collides with gpg keymanager.app
+      # use-keyboxd
+    '';
+  };
+
+  "${config.users.users.${user}.home}/.ssh/authorized_keys" = {
+    text = ''
+      sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAILVdAx+U1xhcJmh1hRaF0CVB0ivIF/U0oIbAWYPwko4iAAAABHNzaDo= Yubikey 35775013
+      sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIIjnJyJUDnia6ZWPRa5iSBKCb+DMGmFtiFa+9gkeiTwQAAAABHNzaDo= Yubikey 36431751
+      sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIFhuPQUHUHchx8wHVCciMi6etzZStkpECbG/r/1imy+kAAAABHNzaDo= Yubikey 36431881
+      ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILCEBZrQ9F3nLhEM9uqdPijut11vhYkdmLtj7gT/zgV3 Key Nov 2024
+    '';
+  };
+
   # Raycast script so that "Run Emacs" is available and uses Emacs daemon
   "${xdg_dataHome}/bin/emacsclient" = {
     executable = true;
@@ -39,4 +60,7 @@ in
       fi
     '';
   };
+
+  "${inkscapeExtensionsHome}/hatch_fill.inx".source = "${hatchFillSource}/hatch_fill.inx";
+  "${inkscapeExtensionsHome}/hatch_fill.py".source = "${hatchFillSource}/hatch_fill.py";
 }

modules/darwin/home-manager.nix

@@ -65,7 +65,7 @@ in
       "Fedistar" = 6445863996; # (1.13.1)
       "Home Assistant" = 1099568401; # (2025.7.1)
       "Ice Cubes for Mastodon" = 6444915884; # (1.11.3)
-      "LibreOffice" = 1630474372;
+      #"LibreOffice" = 1630474372;
       "Monal - XMPP Chatting " = 1637078500;
       "MQTT Explorer" = 1455214828; # (0.3.5)
       "Native SQLite Manager" = 1416282836; # (1.31.0)
@@ -124,6 +124,13 @@ in
 
               window = {
                 opacity = 1.0;
+                dynamic_padding = true;
+                decorations = "full";
+                title = "Terminal";
+                class = {
+                  instance = "Alacritty";
+                  general = "Alacritty";
+                };
                 padding = {
                   x = 24;
                   y = 24;
@@ -135,18 +142,7 @@ in
                   family = "MesloLGS NF";
                   style = "Regular";
                 };
-                size = lib.mkMerge [
+                size =  14;
-                  (lib.mkIf pkgs.stdenv.hostPlatform.isLinux 10)
-                  (lib.mkIf pkgs.stdenv.hostPlatform.isDarwin 14)
-                ];
-              };
-
-              dynamic_padding = true;
-              decorations = "full";
-              title = "Terminal";
-              class = {
-                instance = "Alacritty";
-                general = "Alacritty";
               };
 
               colors = {
@@ -208,10 +204,7 @@ in
               "vps3.evangineer.net".forwardAgent = true;
               "vps2.evangineer.net".forwardAgent = true;
             };
-            includes = [
+              includes = [ "/Users/${user}/.ssh/config_external" ];
-              (lib.mkIf pkgs.stdenv.hostPlatform.isLinux "/home/${user}/.ssh/config_external")
-              (lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "/Users/${user}/.ssh/config_external")
-            ];
           };
 
           gpg = {
@@ -586,7 +579,7 @@ in
         { path = "/Applications/Visual Studio Code.app/"; }
         { path = "/Applications/Home Assistant.app/"; }
         { path = "/Applications/reMarkable.app/"; }
-        { path = "/Applications/LibreOffice.app/"; }
+        { path = "/run/current-system/Applications/LibreOffice.app/"; }
         { path = "/Applications/Microsoft Word.app/"; }
         { path = "/Applications/Microsoft PowerPoint.app/"; }
         { path = "/Applications/Microsoft Teams.app/"; }

modules/darwin/packages.nix

@@ -87,6 +87,7 @@ with pkgs;
   hunspell
   iftop
   inetutils # includes Telnet
+  libreoffice-bin
   ripgrep
   tmux
   tree
@@ -109,6 +110,7 @@ with pkgs;
       flask-socketio
       h11
       idna
+      intelhex
       importlib-metadata
       itsdangerous
       jinja2

overlays/10-feather-font.nix

@@ -1,30 +0,0 @@
-self: super: with super; {
-
-  feather-font = let
-    version = "1.0";
-    pname = "feather-font";
-  in stdenv.mkDerivation {
-    name = "${pname}-${version}";
-
-    src = fetchzip {
-      url = "https://github.com/dustinlyons/feather-font/archive/refs/tags/${version}.zip";
-      sha256 = "sha256-Zsz8/qn7XAG6BVp4XdqooEqioFRV7bLH0bQkHZvFbsg=";
-    };
-
-    buildInputs = [ unzip ];
-    phases = [ "unpackPhase" "installPhase" ];
-
-    installPhase = ''
-      mkdir -p $out/share/fonts/truetype
-      cp $src/feather.ttf $out/share/fonts/truetype/
-    '';
-
-    meta = with lib; {
-      homepage = "https://www.feathericons.com/";
-      description = "Set of font icons from the open source collection Feather Icons";
-      license = licenses.mit;
-      maintainers = [ maintainers.dlyons ];
-      platforms = [ platforms.x86_64-linux platforms.x86_64-darwin ];
-    };
-  };
-}

overlays/20-zotero-pin.nix

@@ -0,0 +1,27 @@
+# To test if a new Zotero package works without the overlay try
+# nix --extra-experimental-features 'nix-command flakes' eval --raw --impure --expr '
+# let
+#  flake = builtins.getFlake (toString ./.);
+#  pkgs = import flake.inputs.nixpkgsAarch64 {
+#    system = "aarch64-darwin";
+#    config.allowUnfree = true;
+#  };
+# in
+# pkgs.zotero.version
+# '
+
+final: prev:
+
+let
+  pinnedPkgs = import (builtins.fetchTarball {
+    # Last nixpkgs Zotero package revision before 10.0.2.
+    url = "https://github.com/NixOS/nixpkgs/archive/4118d63e017feb54b48e7341e4b6f0ac5348f074.tar.gz";
+    sha256 = "1w33226pjk7hs9hbzy0ghcvgps0yicm0r2zxnnrzsr26pzvjjm6z";
+  }) {
+    system = prev.stdenv.hostPlatform.system;
+    config = prev.config;
+  };
+in
+{
+  zotero = pinnedPkgs.zotero;
+}