bit of cleanup of linux remnants and libreoffice-bin from packages instead of mas

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/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)
@@ -142,10 +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)
-                ];
               };
 
               colors = {
@@ -207,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 = {
@@ -585,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

overlays/10-feather-font.nix

@@ -24,7 +24,7 @@ self: super: with super; {
       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 ];
+      platforms = [ platforms.x86_64-darwin ];
     };
   };
 }