diff options
| author | Martin Fischer <martin@push-f.com> | 2025-06-02 18:54:24 +0200 |
|---|---|---|
| committer | Martin Fischer <martin@push-f.com> | 2025-06-04 07:33:00 +0200 |
| commit | a16199f9c7aded2841784c070f1d0a3753076d09 (patch) | |
| tree | 6ee28163dc5c510179b91859440f4ebbf0edd4aa /nixos/profiles | |
| parent | 04f8ec6294a145020b7c05d704913247f131aceb (diff) | |
deps: update to NixOS 25.05
Diffstat (limited to 'nixos/profiles')
| -rw-r--r-- | nixos/profiles/workstation/default.nix | 4 | ||||
| -rw-r--r-- | nixos/profiles/workstation/dev.nix | 8 |
2 files changed, 2 insertions, 10 deletions
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 |