diff options
| author | Martin Fischer <martin@push-f.com> | 2025-07-21 06:15:08 +0200 |
|---|---|---|
| committer | Martin Fischer <martin@push-f.com> | 2025-07-21 06:39:51 +0200 |
| commit | 01a80a6c2e5ad4fcee50de5da50d97a9fd34518d (patch) | |
| tree | 19683bb61b9ea34d2d807e99255a11b452711127 | |
| parent | deadb9491705c32b6a82530b9334aa67d1904aac (diff) | |
| -rw-r--r-- | nixos/hosts/hamac/default.nix | 5 | ||||
| -rw-r--r-- | nixos/npins/sources.json | 6 | ||||
| -rw-r--r-- | nixos/profiles/workstation/dev.nix | 3 | ||||
| -rw-r--r-- | user/jj/config.toml | 8 |
4 files changed, 21 insertions, 1 deletions
diff --git a/nixos/hosts/hamac/default.nix b/nixos/hosts/hamac/default.nix index 9c4bde6..523b7d6 100644 --- a/nixos/hosts/hamac/default.nix +++ b/nixos/hosts/hamac/default.nix @@ -2,7 +2,12 @@ { config, lib, pkgs, ... }: +let + sources = import <top/npins>; + pkgs-unstable = import sources.nixpkgs-unstable {}; +in { + _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 1f18fa6..320dc04 100644 --- a/nixos/npins/sources.json +++ b/nixos/npins/sources.json @@ -99,6 +99,12 @@ "name": "nixos-25.05-small", "url": "https://releases.nixos.org/nixos/25.05-small/nixos-25.05.803753.e5cb99555c45/nixexprs.tar.xz", "hash": "028xrxm9ykl7fwdjyy161jaxh3ydngndv8s27x0spws2mwxyckvc" + }, + "nixpkgs-unstable": { + "type": "Channel", + "name": "nixpkgs-unstable", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre832020.6b4955211758/nixexprs.tar.xz", + "hash": "128piyf6sw0r07bxhix6i998h30zqqgaz1sknzrgy6yvh8jgawaz" } }, "version": 5 diff --git a/nixos/profiles/workstation/dev.nix b/nixos/profiles/workstation/dev.nix index 4ea7f06..a40d574 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; [ @@ -13,6 +13,7 @@ docker-compose gnumake jq + pkgs-unstable.jujutsu just sqlite-interactive scc diff --git a/user/jj/config.toml b/user/jj/config.toml new file mode 100644 index 0000000..72e8c4e --- /dev/null +++ b/user/jj/config.toml @@ -0,0 +1,8 @@ +"$schema" = "https://jj-vcs.github.io/jj/latest/config-schema.json" + +[user] +name = "Martin Fischer" +email = "martin@push-f.com" + +[ui] +pager = ["less", "--quit-if-one-screen", "--RAW-CONTROL-CHARS"] |