clerie
/
nixfiles
1
0
Fork 0
Code

Update from updated-inputs-2024-04-09-01-03

This commit is contained in:
clerie 2024-04-09 03:03:05 +02:00
parent 4a20ffc5f1 816aa0b86d
commit 07526cec2c
6 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configuration/common/programs.nix
View File

@ -7,6 +7,7 @@
htop
parted
tmux
bij
colmena
vim
agenix

21
flake.lock
View File

@ -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",

4
flake.nix
View File

@ -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";

2
hosts/hydra-1/configuration.nix
View File

@ -26,7 +26,7 @@
networking.nameservers = [ "2001:638:904:ffcc::3" "2001:638:904:ffcc::4" "141.24.40.3" "141.24.40.4" ];
nix = {
settings.allowed-uris = "http: https: github:";
settings.allowed-uris = "http: https: git+https: github:";
distributedBuilds = true;
buildMachines = [
{

2
hosts/hydra-2/configuration.nix
View File

@ -26,7 +26,7 @@
networking.nameservers = [ "2001:638:904:ffcc::3" "2001:638:904:ffcc::4" "141.24.40.3" "141.24.40.4" ];
# Allow Hydra to fetch remote URLs in restricted mode
nix.settings.allowed-uris = "http: https: github:";
nix.settings.allowed-uris = "http: https: git+https: github:";
services.openssh.settings= {
PermitRootLogin = "yes";

6
lib/flake-helper.nix
View File

@ -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;
})
@ -57,7 +59,7 @@ rec {
generateColmenaHost = name: hostSystem: {
deployment = {
targetHost = "${name}.net.clerie.de";
targetHost = hostSystem.config.networking.fqdn;
targetUser = null;
tags = let
group = nixpkgs.lib.attrByPath [ "clerie" "monitoring" "serviceLevel" ] null hostSystem.config;