diff options
| author | Martin Fischer <martin@push-f.com> | 2025-04-02 17:25:46 +0200 |
|---|---|---|
| committer | Martin Fischer <martin@push-f.com> | 2025-04-02 17:25:46 +0200 |
| commit | a5ad58aad1237b2acde06b74280858ede2f6e651 (patch) | |
| tree | 96b16d139fb0beeb905b6114404651563972437b | |
| parent | b0e559f749f9ce3fc8a472de70ecbb5090425ffe (diff) | |
| -rw-r--r-- | nixos/npins/sources.json | 4 | ||||
| -rw-r--r-- | nixos/profiles/workstation/dev.nix | 6 | ||||
| -rw-r--r-- | user/zsh/zshrc-workstation.sh | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/nixos/npins/sources.json b/nixos/npins/sources.json index 5d0d4d9..75e5790 100644 --- a/nixos/npins/sources.json +++ b/nixos/npins/sources.json @@ -63,8 +63,8 @@ "nixpkgs-unstable": { "type": "Channel", "name": "nixpkgs-unstable", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre763845.de0fe301211c/nixexprs.tar.xz", - "hash": "1iq1a41c1c6i7lr8xpp2bwbm36v8qijisx1jv4126624swr9467l" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre777917.b7ba7f9f45c5/nixexprs.tar.xz", + "hash": "0jb6b7sv66bn06pchj2l88z0i5dlz0c2vb3z6pjjlq2p8q11zigg" } }, "version": 3 diff --git a/nixos/profiles/workstation/dev.nix b/nixos/profiles/workstation/dev.nix index e550a4c..ea39b83 100644 --- a/nixos/profiles/workstation/dev.nix +++ b/nixos/profiles/workstation/dev.nix @@ -22,7 +22,11 @@ gcc # rustc fails if cc linker isn't found chromium - pkgs-unstable.zed-editor + # 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 "$@" + '') vscodium # I'm installing extensions via my install-imperative script. platformio diff --git a/user/zsh/zshrc-workstation.sh b/user/zsh/zshrc-workstation.sh index e027208..6e1e02f 100644 --- a/user/zsh/zshrc-workstation.sh +++ b/user/zsh/zshrc-workstation.sh @@ -2,7 +2,6 @@ ## Aliases alias code='codium' -alias zed=zeditor alias tokei='tokei -s code -n commas' ## Environment variables |