add servicepoint tools

This commit is contained in:
Vinzenz Schroeter 2025-05-10 13:24:08 +02:00
parent 8394652443
commit 24a3148044
3 changed files with 146 additions and 7 deletions

View file

@ -89,6 +89,26 @@
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"
}
},
"naersk": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1745925850,
"narHash": "sha256-cyAAMal0aPrlb1NgzMxZqeN1mAJ2pJseDhm2m6Um8T0=",
"owner": "nix-community",
"repo": "naersk",
"rev": "38bc60bbc157ae266d4a0c96671c6c742ee17a5f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github"
}
},
"niri": {
"inputs": {
"niri-stable": "niri-stable",
@ -149,6 +169,36 @@
"type": "github"
}
},
"nix-filter": {
"locked": {
"lastModified": 1731533336,
"narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-filter_2": {
"locked": {
"lastModified": 1731533336,
"narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1746055187,
@ -185,12 +235,63 @@
"inputs": {
"home-manager": "home-manager",
"lix-module": "lix-module",
"naersk": "naersk",
"niri": "niri",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"servicepoint-cli": "servicepoint-cli",
"servicepoint-simulator": "servicepoint-simulator",
"zerforschen-plus": "zerforschen-plus"
}
},
"servicepoint-cli": {
"inputs": {
"naersk": [
"naersk"
],
"nix-filter": "nix-filter",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1746866001,
"narHash": "sha256-6jqzJyBRXdwmd5SKIJTfbJ5pRVNshVNPzCtFqobRgTE=",
"ref": "refs/heads/main",
"rev": "e9d3b32f57674e06db1ebf0762bfd736e1f5ea31",
"revCount": 41,
"type": "git",
"url": "https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git"
},
"original": {
"type": "git",
"url": "https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git"
}
},
"servicepoint-simulator": {
"inputs": {
"naersk": [
"naersk"
],
"nix-filter": "nix-filter_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1746268672,
"narHash": "sha256-IIgxxA5Fk1iLwXiCGbCLrVdduTDAA54DJ2gnfvCOMLQ=",
"ref": "refs/heads/main",
"rev": "33301a51bf501a6886ec2e1c6ad8111247141d2f",
"revCount": 108,
"type": "git",
"url": "https://git.berlin.ccc.de/servicepoint/servicepoint-simulator.git"
},
"original": {
"type": "git",
"url": "https://git.berlin.ccc.de/servicepoint/servicepoint-simulator.git"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,

View file

@ -24,6 +24,23 @@
url = "git+https://git.berlin.ccc.de/vinzenz/zerforschen.plus";
inputs.nixpkgs.follows = "nixpkgs";
};
naersk = {
url = "github:nix-community/naersk";
inputs.nixpkgs.follows = "nixpkgs";
};
servicepoint-cli = {
url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git";
inputs.nixpkgs.follows = "nixpkgs";
inputs.naersk.follows = "naersk";
};
servicepoint-simulator = {
url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-simulator.git";
inputs.nixpkgs.follows = "nixpkgs";
inputs.naersk.follows = "naersk";
};
};
outputs =
@ -35,6 +52,9 @@
niri,
zerforschen-plus,
nixpkgs-unstable,
servicepoint-cli,
servicepoint-simulator,
naersk,
}:
let
devices = {
@ -54,11 +74,12 @@
rec {
nixosConfigurations = forDevice (
device: system:
let specialArgs = {
inherit inputs device;
pkgs-unstable = nixpkgs-unstable.legacyPackages."${system}";
};
in nixpkgs.lib.nixosSystem {
let
specialArgs = {
inherit inputs device;
};
in
nixpkgs.lib.nixosSystem {
inherit system specialArgs;
modules =
[
@ -74,7 +95,11 @@
./hosts/${device}/imports.nix
./hosts/${device}/configuration.nix
{ nixpkgs.overlays = [ overlays.unstable-packages ]; }
{
nixpkgs.overlays = [
overlays.unstable-packages
];
}
]
++ (nixpkgs.lib.optionals (builtins.elem device homeDevices) [
home-manager.nixosModules.home-manager
@ -84,7 +109,12 @@
./modules/i18n.nix
niri.nixosModules.niri
{ nixpkgs.overlays = [ niri.overlays.niri ]; }
{
nixpkgs.overlays = [
niri.overlays.niri
overlays.servicepoint-packages
];
}
]);
}
);
@ -96,6 +126,11 @@
config = prev.config;
};
};
servicepoint-packages = final: prev: {
servicepoint-cli = servicepoint-cli.legacyPackages."${prev.system}".servicepoint-cli;
servicepoint-simulator =
servicepoint-simulator.legacyPackages."${prev.system}".servicepoint-simulator;
};
};
formatter = {

View file

@ -51,6 +51,9 @@
kikit
unstable.ut1999
servicepoint-cli
servicepoint-simulator
];
home.file."policy.json" = {