deps: update to NixOS 25.05

7 files changed, 12 insertions, 32 deletions

diff --git a/nixos/hosts/hamac/default.nix b/nixos/hosts/hamac/default.nix
index d32ea58..9c4bde6 100644
--- a/nixos/hosts/hamac/default.nix
+++ b/nixos/hosts/hamac/default.nix
@@ -1,13 +1,8 @@
 # See the configuration.nix(5) man page and the NixOS manual (accessible by running `nixos-help`).
 
-let
-  sources = import <top/npins>;
-  pkgs-unstable = import sources.nixpkgs-unstable {};
-in
 { config, lib, pkgs, ... }:
 
 {
-  _module.args = { inherit pkgs-unstable; };
   imports = [
     ./hardware-configuration.nix
     <top/profiles/workstation>
diff --git a/nixos/npins/sources.json b/nixos/npins/sources.json
index 592c651..142fd17 100644
--- a/nixos/npins/sources.json
+++ b/nixos/npins/sources.json
@@ -72,21 +72,15 @@
     },
     "nixos": {
       "type": "Channel",
-      "name": "nixos-24.11",
-      "url": "https://releases.nixos.org/nixos/24.11/nixos-24.11.717608.bf3287dac860/nixexprs.tar.xz",
-      "hash": "1qf7ccpbad2p58q894g4zij3nvsqw503615apjb3iz06yribbrwb"
+      "name": "nixos-25.05",
+      "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802985.a59eb7800787/nixexprs.tar.xz",
+      "hash": "1jsi0pqr5r6ysksswljkg6igb93sniq79bwg4s845c1kzziypyr6"
     },
     "nixos-small": {
       "type": "Channel",
-      "name": "nixos-24.11-small",
-      "url": "https://releases.nixos.org/nixos/24.11-small/nixos-24.11.714830.060b03c5d950/nixexprs.tar.xz",
-      "hash": "1lxm3y9jqkf8p63xrn6phyp5d763jfwcjxb3vpfqgc8iwq5z4cb9"
-    },
-    "nixpkgs-unstable": {
-      "type": "Channel",
-      "name": "nixpkgs-unstable",
-      "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre777917.b7ba7f9f45c5/nixexprs.tar.xz",
-      "hash": "0jb6b7sv66bn06pchj2l88z0i5dlz0c2vb3z6pjjlq2p8q11zigg"
+      "name": "nixos-25.05-small",
+      "url": "https://releases.nixos.org/nixos/25.05-small/nixos-25.05.803242.affe59411e12/nixexprs.tar.xz",
+      "hash": "0dm0dpzd42na772x3ki44hg11v2h1dw51r322c6zkq8ybbizibpy"
     }
   },
   "version": 3
diff --git a/nixos/profiles/workstation/default.nix b/nixos/profiles/workstation/default.nix
index 833ce3c..8adade2 100644
--- a/nixos/profiles/workstation/default.nix
+++ b/nixos/profiles/workstation/default.nix
@@ -60,9 +60,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
diff --git a/nixos/rebuild b/nixos/rebuild
index cfc14cf..1bc6c39 100755
--- a/nixos/rebuild
+++ b/nixos/rebuild
@@ -12,9 +12,7 @@ if [ ! -f $configPath ]; then
 fi
 
 nix-eval() {
-    # FUTURE: use --raw when upgrading to NixOS 25.05
-    nix-instantiate --eval --read-write-mode "$@" \
-      | tr -d \"  # nix-instantiate has no raw output yet (like the experimental nix eval)
+    nix-instantiate --eval --raw --read-write-mode "$@"
 }
 
 channel=$(nix-eval --argstr host "$HOSTNAME" --expr '{host}:
diff --git a/user/zed/settings.json b/user/zed/settings.json
index 6e6d8b2..27b415c 100644
--- a/user/zed/settings.json
+++ b/user/zed/settings.json
@@ -58,7 +58,7 @@
   "features": {
     "edit_prediction_provider": "none"
   },
-  "assistant": {
+  "agent": {
     "enabled": false,
     "version": "2"
   },
@@ -67,7 +67,7 @@
     "button": false
   },
   "chat_panel": {
-    "button": false
+    "button": "never"
   },
   "notification_panel": {
     "button": false
diff --git a/user/zsh/zshrc-workstation.sh b/user/zsh/zshrc-workstation.sh
index 6e1e02f..e027208 100644
--- a/user/zsh/zshrc-workstation.sh
+++ b/user/zsh/zshrc-workstation.sh
@@ -2,6 +2,7 @@
 
 ## Aliases
 alias code='codium'
+alias zed=zeditor
 alias tokei='tokei -s code -n commas'
 
 ## Environment variables