ldsalkjdsalkjdsalkj

This commit is contained in:
2024-04-16 06:49:45 +02:00
parent 1cc9257346
commit 22a3158e3c
17 changed files with 1198 additions and 147 deletions
+11 -5
View File
@@ -53,6 +53,10 @@
sops-nix-2305.inputs.nixpkgs.follows = "nixpkgs-2305";
sops-nix-2305.inputs.nixpkgs-stable.follows = "nixpkgs-2305";
## https://github.com/h7x4/maunium-stickerpicker-nix
#maunium-stickerpicker-nix.url = "github:h7x4/maunium-stickerpicker-nix";
#maunium-stickerpicker-nix.inputs.nixpkgs.follows = "nixpkgs-2311";
/** /
https://willbush.dev/blog/impermanent-nixos/
matrix-next.url = "github:dali99/nixos-matrix-modules"; # see https://git.pvv.ntnu.no/Drift/pvv-nixos-config/src/main/flake.nix
@@ -199,7 +203,7 @@
nix.nixPath = [
"nixpkgs=${inputs.nixpkgs}"
"nixpkgs-unstable=${inputs.unstable}"
"nixpkgs-git=github:NixOS/nixpkgs/nixos-unstable-small"
"nixpkgs-git=github:NixOS/nixpkgs/refs/tags/nixos-unstable-small" # is this right?
];
});
mkConfig = extra-modules: domain: system: inputs: stateVersion: modules: hostname: inputs.nixpkgs.lib.nixosSystem {
@@ -298,8 +302,8 @@
nixosReports = mkHosts (mkReport []);
packages = forAllSystems ({ inputs, pkgs, lib, flakes, ... }: let
mk-nspawn-deployer = hostname: # TODO: nspawn-tarball.nix populates /etc/nixos with junk
(pkgs.callPackage ./pkgs/mk-nspawn-deployer {})
mk-nspawn-setup = hostname: # TODO: nspawn-tarball.nix populates /etc/nixos with junk
(pkgs.callPackage ./pkgs/mk-nspawn-setup {})
(mkHosts (mkConfig [ "${nixos-nspawn}/nspawn-tarball.nix" ])).${hostname};
in {
# TODO: get faketty to work ${expect}/bin/unbuffer is bad
@@ -311,9 +315,11 @@
fi
'';
nspawn-setup-brumlebasse = mk-nspawn-deployer "brumlebasse";
device-mon = pkgs.callPackage ./pkgs/device-mon {};
#pdoc-docs = (pkgs.callPackage ./pkgs/pdocs.nix {}).pdocs;
#pdoc3-docs = (pkgs.callPackage ./pkgs/pdocs.nix {}).pdocs3;
# nixos-generators images
nspawn-setup-brumlebasse = mk-nspawn-setup "brumlebasse";
image-brumlebasse-openstack = nixos-generators-2311.nixosGenerate {
system = "x86_64-linux";
specialArgs = { inherit inputs flakes; };