diff --git a/flake.lock b/flake.lock index d728d241..42e88477 100644 --- a/flake.lock +++ b/flake.lock @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1782772816, - "narHash": "sha256-s9BuFv0mRuZx9C1MF8qPHRdcAK14ONi0A5m6E2wqOoM=", + "lastModified": 1784665499, + "narHash": "sha256-9BMxlTxCCDAeoNLtb1a/st7udtTIJep+wpUzquA29VU=", "owner": "nix-community", "repo": "bun2nix", - "rev": "5a39d717029e94163ac223aee8d5c9946cafed1c", + "rev": "0f2a1f0b6f42cebe3b149bf62d38754c5e0e9729", "type": "github" }, "original": { @@ -769,11 +769,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1783944029, - "narHash": "sha256-koCSvxhJVO2ceDFmnqT4jpWgrlAb3pACWK7NitZP5bU=", + "lastModified": 1787650344, + "narHash": "sha256-32la5GMQSrtTmynUaP8n7vLeogQ61PmQzQCy3QEZkaQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9bae184ed0c04cf270fbb0c9ba886d49bc9cc5e2", + "rev": "310a9af807997c395d816ae827f7d91692eeb4f2", "type": "github" }, "original": { @@ -1447,11 +1447,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "lastModified": 1787559586, + "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1", "type": "github" }, "original": { @@ -1504,11 +1504,11 @@ ] }, "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "lastModified": 1787559586, + "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1", "type": "github" }, "original": { @@ -2546,11 +2546,11 @@ ] }, "locked": { - "lastModified": 1783288480, - "narHash": "sha256-H/blql4kDC0HY3ephQO86deTaLt2UfFvhYzZsHTz6pk=", + "lastModified": 1787503743, + "narHash": "sha256-+j7OOYezVrLpPQTUoSv6vlz551Zh+GbCg0tkjaJpDg4=", "owner": "nix-community", "repo": "haumea", - "rev": "3bc16acb4e17a32fcc04045ff2a4ac56a8cefcf6", + "rev": "252218e686de786f45311c323e105bd4340c2179", "type": "github" }, "original": { @@ -2730,11 +2730,11 @@ ] }, "locked": { - "lastModified": 1783740085, - "narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=", + "lastModified": 1787377438, + "narHash": "sha256-Sxu1NLTD/Ern6hFGLlZmtKCSct3YQXZI/lls8RE1XeM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb", + "rev": "65258d5c65a250189fde2e35f490d15e064c4c62", "type": "github" }, "original": { @@ -3034,11 +3034,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1783941568, - "narHash": "sha256-AHQn1X6GKbYBEElx+eCVuyouKodXq/39u3CuUUsHQy8=", + "lastModified": 1787660833, + "narHash": "sha256-4R2DeS9btVaawjYmkfA9c1QHYCwg0TM2PjlFOSlKk0Y=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "5cefe9e186d79d89abd38b3a225d8eb3b6d64ae3", + "rev": "60e7fc4eab599ae19f53818784955f2f5aab72ec", "type": "github" }, "original": { @@ -4011,11 +4011,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1783868237, - "narHash": "sha256-MDQLbs882ugMi408mpSwa2nw2yzN43hHtOxx0zbUcZA=", + "lastModified": 1787626384, + "narHash": "sha256-2YdJsk8iydhQVgz12pmfWFVtUBEv2Zak6TdgoaDi/+Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "76fe02659c00bef75e12fbfdd45ca665115e9302", + "rev": "3dff45fe84c7cc09bff396fdc7b39d0ceba10656", "type": "github" }, "original": { @@ -4043,11 +4043,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1782614948, - "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", + "lastModified": 1785031560, + "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", + "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c", "type": "github" }, "original": { @@ -4241,11 +4241,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1783948021, - "narHash": "sha256-FMPfWbOOeHNWDDrYoG42l4K2xPiWQzmakKU5Pskf+cY=", + "lastModified": 1787670526, + "narHash": "sha256-ewvTn0x8EcsrLqpJMQlMx9FoZmY7hdwLk9eT7D/ekYA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d76caa6c7b4707d1089a18f6179b0bc474cbc981", + "rev": "b41534db4ca4ed3f4f385d69e31a8ce94442fdb7", "type": "github" }, "original": { @@ -4382,11 +4382,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1783856661, - "narHash": "sha256-ZGP04e+Q6WyQJGA9ZvI5CL6+heGQldbAG9U1T9NGvmU=", + "lastModified": 1787525875, + "narHash": "sha256-sKbMlkDCBVmAjUVT94LwhVtET/YEMtZaFdn5UduWxz8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "569d578509928497eddc3fdbf94a799027050be4", + "rev": "a3b98866eecd08edac6e61a3081e69540a35020f", "type": "github" }, "original": { @@ -4526,11 +4526,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1783816212, - "narHash": "sha256-2aZisVTVGSFEk3MYcOiWQp3zvwyzbqpktB69Rcfp150=", + "lastModified": 1787424095, + "narHash": "sha256-dWLO5AHhKaw6rdWCtTes8hnntT1r0/J5yhQGm0f0ZgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3b32825de172d0bc85664f495edb096b10862524", + "rev": "174eb786fb68e3a13e4e535a3deea479a0c07a6a", "type": "github" }, "original": { @@ -5637,11 +5637,11 @@ ] }, "locked": { - "lastModified": 1783174389, - "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=", + "lastModified": 1786629091, + "narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9", + "rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f", "type": "github" }, "original": { @@ -6596,11 +6596,11 @@ ] }, "locked": { - "lastModified": 1780220602, - "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", + "lastModified": 1786901030, + "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "db947814a175b7ca6ded66e21383d938df01c227", + "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", "type": "github" }, "original": { @@ -6798,11 +6798,11 @@ ] }, "locked": { - "lastModified": 1780220602, - "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", + "lastModified": 1786901030, + "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "db947814a175b7ca6ded66e21383d938df01c227", + "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", "type": "github" }, "original": { diff --git a/hosts/eMac/configuration.nix b/hosts/eMac/configuration.nix index 07f23c29..9c87db95 100644 --- a/hosts/eMac/configuration.nix +++ b/hosts/eMac/configuration.nix @@ -13,7 +13,6 @@ ++ [ profiles.users.ethan profiles.builders.builder - profiles.builders.fabricator profiles.builders.linux-builder ]; diff --git a/lib/compat/darwin/default.nix b/lib/compat/darwin/default.nix index 556e03a5..f1b2716e 100644 --- a/lib/compat/darwin/default.nix +++ b/lib/compat/darwin/default.nix @@ -1,4 +1,4 @@ -_: { +{ environment.darwinConfig = "/Users/ethan/Workspace/tilde/lib/compat/darwin"; system.stateVersion = 5; } diff --git a/lib/src/darwin.nix b/lib/src/darwin.nix index 3c7591cb..ebdf490f 100644 --- a/lib/src/darwin.nix +++ b/lib/src/darwin.nix @@ -23,6 +23,7 @@ let profiles = flake.profiles.darwin; }; + # Generates a new entry for `darwinConfigurations` using `darwinSystem` mkDarwinConfiguration = { system, configuration }: withSystem system ( diff --git a/lib/src/hm.nix b/lib/src/hm.nix index 99ab6432..12e046ab 100644 --- a/lib/src/hm.nix +++ b/lib/src/hm.nix @@ -14,6 +14,7 @@ let profiles = flake.profiles.home; }; + # Creates a new entry for `homeConfigurations` using `homeManagerConfiguration` mkHomeManagerConfiguration = { system, configuration }: withSystem system ( diff --git a/modules/development/shell.nix b/modules/development/shell.nix index 01a76c17..c6b3c993 100644 --- a/modules/development/shell.nix +++ b/modules/development/shell.nix @@ -16,6 +16,7 @@ just nh nix-output-monitor + nix-update sops inputs.home-manager.packages.${system}.default ]; diff --git a/modules/overlays/default.nix b/modules/overlays/default.nix index 9d2a6ce6..8366a72d 100644 --- a/modules/overlays/default.nix +++ b/modules/overlays/default.nix @@ -11,8 +11,6 @@ }; in { - nixpkgs-master-darwin-linux-builder = nixpkgs-master.darwin.linux-builder; - inherit (nixpkgs-master) ghostty-bin zed-editor; }; }; diff --git a/modules/packages/default.nix b/modules/packages/default.nix index b38099a1..6df8059d 100644 --- a/modules/packages/default.nix +++ b/modules/packages/default.nix @@ -13,11 +13,11 @@ }; packages = { - firehydrant-mcp = pkgs.callPackage ./firehydrant-mcp.nix { }; - mcp-remote = pkgs.callPackage ./mcp-remote.nix { }; - oh-my-tmux = pkgs.callPackage ./oh-my-tmux.nix { }; - postgres-mcp = pkgs.callPackage ./postgres-mcp.nix { }; - sf-pro = pkgs.callPackage ./fonts/sf-pro.nix { }; + firehydrant-mcp = pkgs.callPackage ./firehydrant-mcp { }; + mcp-remote = pkgs.callPackage ./mcp-remote { }; + oh-my-tmux = pkgs.callPackage ./oh-my-tmux { }; + postgres-mcp = pkgs.callPackage ./postgres-mcp { }; + sf-pro = pkgs.callPackage ./fonts/sf-pro { }; }; }; } diff --git a/modules/packages/firehydrant-mcp.nix b/modules/packages/firehydrant-mcp/default.nix similarity index 84% rename from modules/packages/firehydrant-mcp.nix rename to modules/packages/firehydrant-mcp/default.nix index 28663964..38151ea0 100644 --- a/modules/packages/firehydrant-mcp.nix +++ b/modules/packages/firehydrant-mcp/default.nix @@ -1,7 +1,8 @@ -{ - lib, - buildNpmPackage, - fetchFromGitHub, +{ lib +, buildNpmPackage +, fetchFromGitHub +, nix-update-script +, }: buildNpmPackage (finalAttrs: { @@ -19,6 +20,8 @@ buildNpmPackage (finalAttrs: { npmPackFlags = [ "--ignore-scripts" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Official FireHydrant MCP server"; homepage = "https://github.com/firehydrant/firehydrant-mcp"; diff --git a/modules/packages/fonts/sf-pro.nix b/modules/packages/fonts/sf-pro/default.nix similarity index 100% rename from modules/packages/fonts/sf-pro.nix rename to modules/packages/fonts/sf-pro/default.nix diff --git a/modules/packages/mcp-remote.nix b/modules/packages/mcp-remote/default.nix similarity index 78% rename from modules/packages/mcp-remote.nix rename to modules/packages/mcp-remote/default.nix index f370569c..de2f3af6 100644 --- a/modules/packages/mcp-remote.nix +++ b/modules/packages/mcp-remote/default.nix @@ -1,12 +1,13 @@ -{ - stdenv, - pnpm_10, - fetchFromGitHub, - fetchPnpmDeps, - pnpmConfigHook, - nodejs, - makeWrapper, - lib, +{ stdenv +, pnpm_10 +, fetchFromGitHub +, fetchPnpmDeps +, pnpmConfigHook +, nodejs +, makeWrapper +, lib +, nix-update-script +, }: let @@ -14,20 +15,20 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "mcp-remote"; - version = "0.1.38"; + version = "0.2.1"; src = fetchFromGitHub { owner = "geelen"; repo = "mcp-remote"; tag = "v${version}"; - hash = "sha256-+oNI2Uq7gW3sLzJS4ky2+BXhTmo44+WpcdYgieGPpmI="; + hash = "sha256-xloxs1RimInxuIn5YSr6IKic+KqBt9TTf2w7cVniRVE="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 4; - hash = "sha256-5podB1HJahhn2vlMBnu0wm7AJ0bjq8pvXqPgdR8c3GQ="; + hash = "sha256-ABYIv8gLyTO9Na2vPvKf4iMvQgQ2ExZfClslV7hXu+o="; }; nativeBuildInputs = [ @@ -64,6 +65,8 @@ stdenv.mkDerivation (finalAttrs: rec { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Connect an MCP Client that only supports local (stdio) servers to a Remote MCP Server, with auth support"; homepage = "https://github.com/geelen/mcp-remote"; diff --git a/modules/packages/oh-my-tmux.nix b/modules/packages/oh-my-tmux/default.nix similarity index 100% rename from modules/packages/oh-my-tmux.nix rename to modules/packages/oh-my-tmux/default.nix diff --git a/modules/packages/postgres-mcp.nix b/modules/packages/postgres-mcp/default.nix similarity index 90% rename from modules/packages/postgres-mcp.nix rename to modules/packages/postgres-mcp/default.nix index 0b43747d..9b47b1c9 100644 --- a/modules/packages/postgres-mcp.nix +++ b/modules/packages/postgres-mcp/default.nix @@ -1,7 +1,8 @@ -{ - lib, - python312Packages, - fetchFromGitHub, +{ lib +, python312Packages +, fetchFromGitHub +, nix-update-script +, }: python312Packages.buildPythonApplication { @@ -40,6 +41,8 @@ python312Packages.buildPythonApplication { pythonRelaxDeps = [ "pglast" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "PostgreSQL MCP server with tuning and analysis capabilities"; homepage = "https://github.com/crystaldba/postgres-mcp"; diff --git a/modules/profiles/system/builders/fabricator.nix b/modules/profiles/system/builders/fabricator.nix deleted file mode 100644 index 48319ed4..00000000 --- a/modules/profiles/system/builders/fabricator.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - imports = [ ./common.nix ]; - - nix = { - buildMachines = [ - { - hostName = "fabricator"; - protocol = "ssh-ng"; - systems = [ "x86_64-linux" ]; - maxJobs = 32; - speedFactor = 1; - supportedFeatures = [ - "nixos-test" - "benchmark" - "big-parallel" - "kvm" - ]; - mandatoryFeatures = [ ]; - sshUser = "builder"; - sshKey = "/Users/ethan/Workspace/e10/keys/builder_rsa"; - } - ]; - - settings = { - builders-use-substitutes = true; - }; - }; -} diff --git a/modules/profiles/system/darwin/common.nix b/modules/profiles/system/darwin/common.nix index 1b7403ee..5c24150b 100644 --- a/modules/profiles/system/darwin/common.nix +++ b/modules/profiles/system/darwin/common.nix @@ -9,6 +9,7 @@ extra-experimental-features = [ "nix-command" "flakes" + "pipe-operator" ]; }; };