diff options
| author | Martin Fischer <martin@push-f.com> | 2025-02-24 20:18:14 +0100 |
|---|---|---|
| committer | Martin Fischer <martin@push-f.com> | 2025-02-24 20:18:14 +0100 |
| commit | f530d6ad41747af5f8bb05b337b278cddbac76d9 (patch) | |
| tree | 2cca1d67a163e0d02b092ff51f6cee3d31e4214f | |
| parent | 3ccacbcf32c30677db8a2729c9e553431fd3b732 (diff) | |
tweak(workstation): use Zed from unstable
| -rw-r--r-- | nixos/hosts/hamac/default.nix | 7 | ||||
| -rw-r--r-- | nixos/npins/sources.json | 6 | ||||
| -rw-r--r-- | nixos/profiles/workstation/dev.nix | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/nixos/hosts/hamac/default.nix b/nixos/hosts/hamac/default.nix index e768648..7085ed3 100644 --- a/nixos/hosts/hamac/default.nix +++ b/nixos/hosts/hamac/default.nix @@ -1,9 +1,14 @@ # channel="nixos" # See the configuration.nix(5) man page and the NixOS manual (accessible by running `nixos-help`). -{ config, pkgs, ... }: +let + sources = import ../../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 7b30aec..4d5cc9f 100644 --- a/nixos/npins/sources.json +++ b/nixos/npins/sources.json @@ -26,6 +26,12 @@ "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.05pre757845.2d068ae5c651/nixexprs.tar.xz", + "hash": "0aa3nlg8jms0al4cqxnqrv22sy9cd94v5gydln71qj38pjybxz7v" } }, "version": 3 diff --git a/nixos/profiles/workstation/dev.nix b/nixos/profiles/workstation/dev.nix index 11d706a..13eba67 100644 --- a/nixos/profiles/workstation/dev.nix +++ b/nixos/profiles/workstation/dev.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, pkgs-unstable, ... }: { environment.systemPackages = with pkgs; [ @@ -19,7 +19,7 @@ gcc # rustc fails if cc linker isn't found chromium - zed-editor + pkgs-unstable.zed-editor vscodium # I'm installing extensions via my install-imperative script. platformio @@ -30,4 +30,3 @@ dockerSocket.enable = true; }; } - |