From fd7ddf71f39bf97557ba5945071b513bba16a707 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Sun, 8 Feb 2026 22:34:56 -0500 Subject: [PATCH] update to fix builds on macos --- flake.lock | 30 ++++++++++++++----- flake.nix | 2 +- pkgs/firefox-history-exporter/manifest.json | 2 +- pkgs/firefox-history-exporter/package.nix | 2 +- .../services/daily-summary/daily-summary.nix | 4 +-- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index a9ea057..7fab722 100644 --- a/flake.lock +++ b/flake.lock @@ -198,9 +198,7 @@ "cl-nix-lite": "cl-nix-lite", "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_3", "systems": "systems_2", "treefmt-nix": "treefmt-nix_2" }, @@ -339,6 +337,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1732617236, + "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1761236834, "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", @@ -354,7 +368,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1770197578, "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", @@ -370,7 +384,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", @@ -415,7 +429,7 @@ "mac-app-util": "mac-app-util", "nix2vim": "nix2vim", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", "rust-overlay": "rust-overlay", @@ -426,7 +440,7 @@ }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1770433312, @@ -522,7 +536,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1766000401, diff --git a/flake.nix b/flake.nix index f9a57fd..8904fb1 100644 --- a/flake.nix +++ b/flake.nix @@ -37,7 +37,7 @@ # Better App install management in macOS mac-app-util = { url = "github:hraban/mac-app-util"; - inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list for their inputs + # inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list for their inputs }; # Manage disk format and partitioning diff --git a/pkgs/firefox-history-exporter/manifest.json b/pkgs/firefox-history-exporter/manifest.json index 2b83202..5b72546 100644 --- a/pkgs/firefox-history-exporter/manifest.json +++ b/pkgs/firefox-history-exporter/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 3, "name": "History Exporter", - "version": "1.0", + "version": "1.1", "description": "Automatically exports today's browsing history.", "permissions": [ "history", diff --git a/pkgs/firefox-history-exporter/package.nix b/pkgs/firefox-history-exporter/package.nix index dc5fa31..b48ead3 100644 --- a/pkgs/firefox-history-exporter/package.nix +++ b/pkgs/firefox-history-exporter/package.nix @@ -2,7 +2,7 @@ pkgs.stdenv.mkDerivation rec { pname = "firefox-history-exporter"; - version = "1.0"; + version = "1.1"; src = ./.; nativeBuildInputs = [ pkgs.zip ]; diff --git a/platforms/nix-darwin/modules/nmasur/presets/services/daily-summary/daily-summary.nix b/platforms/nix-darwin/modules/nmasur/presets/services/daily-summary/daily-summary.nix index d82cc26..cd4a7ee 100644 --- a/platforms/nix-darwin/modules/nmasur/presets/services/daily-summary/daily-summary.nix +++ b/platforms/nix-darwin/modules/nmasur/presets/services/daily-summary/daily-summary.nix @@ -17,7 +17,7 @@ let # ]; # } (builtins.readFile ./process-urls.py); # prompt = "Based on my browser usage for today from the markdown file located in /Users/${username}/Downloads/Sidebery/todays_urls.md, create or update a daily summary markdown file in the generated notes directory located in /Users/${username}/dev/personal/notes/generated/ with the filename format 'YYYY-MM-DD Daily Summary.md'. The resulting markdown file should use /Users/${username}/dev/personal/notes/templates/generated-summary.md as a format template, and it should summarize where I have spent my time today and highlight any notable links that I have visited. Please create markdown links to other relevant notes in /Users/${username}/dev/personal/notes/. If there is an existing markdown file for today, update it to include the newest information."; - prompt = "Based on my browser usage for today from the JSON file located in /Users/${username}/Downloads/firefox-history/history-YYYY-MM-DD.json, create or update a daily summary markdown file in the generated notes directory located in /Users/${username}/dev/personal/notes/generated/ with the filename format 'YYYY-MM-DD Daily Summary.md'. The resulting markdown file should use /Users/${username}/dev/personal/notes/templates/generated-summary.md as a format template, and it should summarize where I have spent my time today and highlight any notable pages that I have visited, using the titles of each URL in the JSON file for markdown links. Please create markdown links to other relevant notes in /Users/${username}/dev/personal/notes/ and explain why they are being referenced. If there is an existing markdown file for today, update it to include the newest information."; + prompt = "Based on my browser usage for today from the JSON file located in /Users/${username}/Downloads/firefox-history/history-YYYY-MM-DD.json, create or update a daily summary markdown file in the generated notes directory located in /Users/${username}/dev/personal/notes/generated/ with the filename format 'YYYY-MM-DD Daily Summary.md'. If the JSON file for today doesn't exist, exit. The resulting markdown file should use /Users/${username}/dev/personal/notes/templates/generated-summary.md as a format template, and it should summarize where I have spent my time today and highlight any notable pages that I have visited, using the titles of each URL in the JSON file for markdown links. Please create markdown links to other relevant notes in /Users/${username}/dev/personal/notes/ and explain why they are being referenced. If there is an existing markdown file for today, update it to include the newest information."; in { @@ -32,7 +32,7 @@ in # GEMINI_API_KEY=$(cat /Users/${username}/.config/gemini/.gemini_api_key) ${pkgs.gemini-cli}/bin/gemini --allowed-tools all --yolo --include-directories /Users/${username}/Downloads/Sidebery/ --include-directories /Users/${username}/dev/personal/notes/ "${prompt}" # ''; script = '' - GEMINI_API_KEY=$(cat /Users/${username}/.config/gemini/.gemini_api_key) ${pkgs.gemini-cli}/bin/gemini --allowed-tools all --yolo --include-directories /Users/${username}/Downloads/firefox-history/ --include-directories /Users/${username}/dev/personal/notes/ "${prompt}" + GEMINI_API_KEY=$(cat /Users/${username}/.config/gemini/.gemini_api_key) ${pkgs.gemini-cli}/bin/gemini --allowed-tools all --yolo --include-directories "/Users/${username}/Downloads/firefox-history/,/Users/${username}/dev/personal/notes/" "${prompt} | tee -a /Users/${username}/dev/personal/gemini-archive/daily-summary-logs/$(date +"%Y-%m-%d").log" ''; path = [