2 files changed, 2 insertions, 16 deletions
diff --git a/nixos/profiles/workstation/default.nix b/nixos/profiles/workstation/default.nix
index 833ce3c..23c1412 100644
--- a/nixos/profiles/workstation/default.nix
+++ b/nixos/profiles/workstation/default.nix
@@ -3,12 +3,6 @@
 let
   cfg = config.workstation;
   sources = import <top/npins>;
-  nixGit = import (pkgs.fetchFromGitHub {
-    owner = "NixOS";
-    repo = "nix";
-    rev = "7a8a28629c61c75af010ff0a5a88c16c4ce536c7";
-    sha256 = "sha256-oqG9AFPXBneKVmiWa9b9ai0hGZqHVKVFaFLdBZitSUA=";
-  });
 in
 {
   options.workstation = {
@@ -60,9 +54,5 @@ in
     # Age defaults to this anyway when openssh is enabled.
     # We're setting this here for workstations where openssh is disabled.
     age.identityPaths = ["/etc/ssh/ssh_host_ed25519_key"];
-
-    # Using nix from git for --raw support in nix-instantiate --eval.
-    # FUTURE: remove once upgrading to NixOS 25.05
-    nix.package = nixGit.packages.${builtins.currentSystem}.default;
   };
 }
diff --git a/nixos/profiles/workstation/dev.nix b/nixos/profiles/workstation/dev.nix
index 92992cb..6c546b6 100644
--- a/nixos/profiles/workstation/dev.nix
+++ b/nixos/profiles/workstation/dev.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, pkgs-unstable, ... }:
+{ config, pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [
@@ -22,11 +22,7 @@
     gcc # rustc fails if cc linker isn't found
     chromium
 
-    # FUTURE: Check if Linux kernel of NixOS 25.05 still has this amdgpu bug.
-    (pkgs.writeShellScriptBin "zed" ''
-      export ZED_PATH_SAMPLE_COUNT=0 # workaround for https://github.com/zed-industries/zed/issues/26143
-      exec ${pkgs-unstable.zed-editor}/bin/zeditor "$@"
-    '')
+    zed-editor
     vscodium
     # I'm installing extensions via my install-imperative script.
     platformio