From 606343b11f60b6d476a313f6339f2e8596343290 Mon Sep 17 00:00:00 2001 From: clerie Date: Mon, 8 Apr 2024 08:41:05 +0200 Subject: [PATCH] configuration/common: add bij to programs --- configuration/common/programs.nix | 1 + flake.lock | 21 +++++++++++++++++++++ flake.nix | 4 ++++ lib/flake-helper.nix | 4 +++- 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/configuration/common/programs.nix b/configuration/common/programs.nix index afb6e4f..b37a656 100644 --- a/configuration/common/programs.nix +++ b/configuration/common/programs.nix @@ -7,6 +7,7 @@ htop parted tmux + bij colmena vim agenix diff --git a/flake.lock b/flake.lock index 65e82b1..441d904 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,26 @@ "type": "github" } }, + "bij": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712512137, + "narHash": "sha256-crxzFc3lc/ViHYVK+IKmIbifxF6zyHgSwhBKd0lLgWE=", + "ref": "refs/heads/main", + "rev": "221052d8465f0a4437cb8cae3cc9998c87e88f68", + "revCount": 2, + "type": "git", + "url": "https://git.clerie.de/clerie/bij.git" + }, + "original": { + "type": "git", + "url": "https://git.clerie.de/clerie/bij.git" + } + }, "chaosevents": { "inputs": { "nixpkgs": [ @@ -229,6 +249,7 @@ "root": { "inputs": { "agenix": "agenix", + "bij": "bij", "chaosevents": "chaosevents", "fernglas": "fernglas", "fieldpoc": "fieldpoc", diff --git a/flake.nix b/flake.nix index ac69e14..aa59880 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,10 @@ url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; + bij = { + url = "git+https://git.clerie.de/clerie/bij.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; chaosevents = { url = "git+https://git.clerie.de/clerie/chaosevents.git"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/lib/flake-helper.nix b/lib/flake-helper.nix index 69d1413..1f28cdb 100644 --- a/lib/flake-helper.nix +++ b/lib/flake-helper.nix @@ -1,4 +1,4 @@ -{ self, nixpkgs, agenix, chaosevents, fernglas, fieldpoc, nixos-exporter, solid-xmpp-alarm, ... }@inputs: +{ self, nixpkgs, agenix, bij, chaosevents, fernglas, fieldpoc, nixos-exporter, solid-xmpp-alarm, ... }@inputs: rec { generateNixosSystem = { @@ -30,6 +30,8 @@ rec { (_: _: { inherit (agenix.packages."x86_64-linux") agenix; + inherit (bij.packages."${system}") + bij; inherit (chaosevents.packages."x86_64-linux") chaosevents; })