summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseth <[email protected]>2023-04-23 07:21:23 -0400
committerseth <[email protected]>2023-04-23 07:21:23 -0400
commit07af751ba8cccf8009cf3586f07d746141f2ebab (patch)
treed1ce4adf95ffb299696837385eb99b8310122d2d
parentb4e31ae959e612771f411bd4f9ee05ad16ac8d19 (diff)
add nixinate
-rw-r--r--flake.lock21
-rw-r--r--flake.nix6
-rw-r--r--hosts/default.nix11
-rw-r--r--hosts/p-body/default.nix6
-rw-r--r--users/_secrets/pbodyPassword.agebin433 -> 566 bytes
5 files changed, 42 insertions, 2 deletions
diff --git a/flake.lock b/flake.lock
index d018597..76b3027 100644
--- a/flake.lock
+++ b/flake.lock
@@ -283,6 +283,26 @@
"type": "github"
}
},
+ "nixinate": {
+ "inputs": {
+ "nixpkgs": [
+ "nixpkgsUnstable"
+ ]
+ },
+ "locked": {
+ "lastModified": 1671116920,
+ "narHash": "sha256-QmDGsUUmAGn77UTR7eQJmebl8f3IIUCtmbbAdJqKA3s=",
+ "owner": "MatthewCroughan",
+ "repo": "nixinate",
+ "rev": "b4d17b8e2a4abc47e93e1a1c466e0286a63640d8",
+ "type": "github"
+ },
+ "original": {
+ "owner": "MatthewCroughan",
+ "repo": "nixinate",
+ "type": "github"
+ }
+ },
"nixos-hardware": {
"locked": {
"lastModified": 1680876084,
@@ -464,6 +484,7 @@
"haumea": "haumea",
"home-manager": "home-manager",
"lanzaboote": "lanzaboote",
+ "nixinate": "nixinate",
"nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs",
diff --git a/flake.nix b/flake.nix
index 4779da6..4f7a448 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,6 +53,10 @@
# TODO: ditto
inputs.rust-overlay.follows = "rust-overlay";
};
+ nixinate = {
+ url = "github:MatthewCroughan/nixinate";
+ inputs.nixpkgs.follows = "nixpkgsUnstable";
+ };
nixos-wsl = {
url = "github:nix-community/NixOS-WSL/main";
inputs.nixpkgs.follows = "nixpkgs";
@@ -81,6 +85,7 @@
haumea,
getchoo,
flake-utils,
+ nixinate,
openwrt-imagebuilder,
pre-commit-hooks,
...
@@ -102,6 +107,7 @@
eachDefaultSystem (system: let
pkgs = import nixpkgs {inherit system;};
in {
+ apps = nixinate.nixinate.${system} self;
checks = {
pre-commit-check = pre-commit-hooks.lib.${system}.run {
src = ./.;
diff --git a/hosts/default.nix b/hosts/default.nix
index 97574c5..7b13c1b 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -45,7 +45,7 @@ in {
nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
nixos-hardware.nixosModules.common-pc-ssd
lanzaboote.nixosModules.lanzaboote
- (import "${self}/modules/nixos/virtualisation")
+ (import "${self}/modules/nixos/virtualisation.nix")
];
};
glados-wsl = {
@@ -81,7 +81,16 @@ in {
pbodyPassword.file = "${self}/users/_secrets/pbodyPassword.age";
};
};
+
nixos.enable = true;
+
+ _module.args.nixinate = {
+ host = "167.99.145.73";
+ sshUser = "root";
+ buildOn = "remote";
+ substituteOnTarget = true;
+ hermetic = false;
+ };
}
];
};
diff --git a/hosts/p-body/default.nix b/hosts/p-body/default.nix
index 3ee026f..4e3d7b7 100644
--- a/hosts/p-body/default.nix
+++ b/hosts/p-body/default.nix
@@ -10,11 +10,15 @@
];
base = {
+ enable = true;
documentation.enable = false;
defaultPackages.enable = false;
};
- nixos.networking.enable = false;
+ nixos = {
+ enable = true;
+ networking.enable = false;
+ };
networking = {
hostName = "p-body";
diff --git a/users/_secrets/pbodyPassword.age b/users/_secrets/pbodyPassword.age
index 6061cf7..15dfcf1 100644
--- a/users/_secrets/pbodyPassword.age
+++ b/users/_secrets/pbodyPassword.age
Binary files differ