From fd8c36564d7a3e42be0311e50ae9a5d85315560e Mon Sep 17 00:00:00 2001 From: Ethan Turkeltaub Date: Wed, 27 May 2026 10:58:06 -0400 Subject: [PATCH 1/3] Update `nixpkgs-master`, use `worktrunk` from versioned branch, update Zed settings --- flake.lock | 6 +++--- modules/overlays/default.nix | 2 +- modules/profiles/home/zed-editor.nix | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 70e7b45..5d86ed1 100644 --- a/flake.lock +++ b/flake.lock @@ -3610,11 +3610,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1778510835, - "narHash": "sha256-YphMBrESuIW67m/O3uB94mXhJcvFuHkNQxUR/lI7FRI=", + "lastModified": 1779892783, + "narHash": "sha256-ZLnAB5660SnuWsK3HajMQXY76Igsw0GGLpm+WNlmLbw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "572cda39e3187a543debb844099a347d4653e36e", + "rev": "ab9b686f9c3b0d0de724966e444c1b5328dcbe13", "type": "github" }, "original": { diff --git a/modules/overlays/default.nix b/modules/overlays/default.nix index b41d452..fe9e926 100644 --- a/modules/overlays/default.nix +++ b/modules/overlays/default.nix @@ -11,7 +11,7 @@ in { nixpkgs-master-darwin-linux-builder = nixpkgs-master.darwin.linux-builder; - inherit (nixpkgs-master) ghostty-bin worktrunk zed-editor; + inherit (nixpkgs-master) ghostty-bin zed-editor; }; }; } diff --git a/modules/profiles/home/zed-editor.nix b/modules/profiles/home/zed-editor.nix index f2de758..272c2f2 100644 --- a/modules/profiles/home/zed-editor.nix +++ b/modules/profiles/home/zed-editor.nix @@ -67,9 +67,6 @@ diagnostics = false; metrics = false; }; - - # AI - disable_ai = true; }; }; } From 35a306e751d5f33af8418981982e87ce4c21af68 Mon Sep 17 00:00:00 2001 From: Ethan Turkeltaub Date: Wed, 27 May 2026 17:43:38 -0400 Subject: [PATCH 2/3] Tweak fonts --- modules/packages/fonts/sf-pro.nix | 12 ++++++------ modules/profiles/system/fonts/common.nix | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/packages/fonts/sf-pro.nix b/modules/packages/fonts/sf-pro.nix index 9f7b86a..1a02efc 100644 --- a/modules/packages/fonts/sf-pro.nix +++ b/modules/packages/fonts/sf-pro.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation { hash = "sha256-mAXExj8n8gFHq19HfGy4UOJYKVGPYgarGd/04kUIqX4="; }; - phases = [ "unpackPhase" "installPhase" ]; - pathsToLink = [ "/share/fonts/opentype/" ]; - sourceRoot = "."; installPhase = '' - install_path=$out/share/fonts/opentype - mkdir -p $install_path - cp **/*.{otf,ttf} $install_path + runHook preInstall + + install -Dm644 *.otf -t "$out/share/fonts/opentype/" + install -Dm644 *.ttf -t "$out/share/fonts/truetype/" + + runHook postInstall ''; meta = with lib; { diff --git a/modules/profiles/system/fonts/common.nix b/modules/profiles/system/fonts/common.nix index 4c886fc..8fb6998 100644 --- a/modules/profiles/system/fonts/common.nix +++ b/modules/profiles/system/fonts/common.nix @@ -1,6 +1,9 @@ { pkgs, ... }: { fonts.packages = with pkgs; [ fira + ia-writer-duospace + ia-writer-mono + ia-writer-quattro ibm-plex powerline-fonts pragmatapro From 99b5f4222233cc59bbb633f844a5e3a2525f2074 Mon Sep 17 00:00:00 2001 From: Ethan Turkeltaub Date: Wed, 27 May 2026 17:43:45 -0400 Subject: [PATCH 3/3] Tweak Zed --- modules/profiles/home/zed-editor.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/profiles/home/zed-editor.nix b/modules/profiles/home/zed-editor.nix index 272c2f2..5f59fbd 100644 --- a/modules/profiles/home/zed-editor.nix +++ b/modules/profiles/home/zed-editor.nix @@ -67,6 +67,9 @@ diagnostics = false; metrics = false; }; + + # AI + show_completions_on_input = false; }; }; }