aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Audron <audron@cocaine.farm>2023-10-10 15:32:33 +0200
committerMax Audron <audron@cocaine.farm>2023-10-10 15:32:33 +0200
commitaecc853bae6cf75c2f7e5fc8cb0e22c7190b9b86 (patch)
tree423f941fd0227ef576e97d6f4ca0b6eb5d9fd80f
parentmove to module defined deploy variables (diff)
update nixinate to use nixos module
-rw-r--r--flake.lock6
-rw-r--r--flake.nix8
2 files changed, 7 insertions, 7 deletions
diff --git a/flake.lock b/flake.lock
index fa2a5e0..7f2b061 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,11 +42,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1696458398,
- "narHash": "sha256-z8qTV8uDEH7RH4wPFU/URH6PM0SIbjgwGMM++I0pMlQ=",
+ "lastModified": 1696944707,
+ "narHash": "sha256-/3mkN7ikzP89G3LqYnZ4jXw1AurEKr1xKkXtA2/WG88=",
"owner": "maxaudron",
"repo": "nixinate",
- "rev": "455204cc06f156350c40731469cb8e0b931ac9cc",
+ "rev": "09cbd84c8595f7ca10cf5c1b8adcad9ba732a565",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 649a006..ee27ea2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,7 @@
};
mkSystem = modules: nixpkgs.lib.nixosSystem {
inherit specialArgs system;
- modules = modules;
+ modules = modules ++ [ nixinate.nixosModules.default ];
};
in
{
@@ -31,9 +31,9 @@
ettves = mkSystem [ (import ./machines/ettves) common users wireguard crypto kubernetes zfs teamspeak postgresql quassel powerdns acme ];
phaenn = mkSystem [ (import ./machines/phaenn) common users wireguard crypto kubernetes zfs acme tlmp ];
- fra01 = mkSystem [ (import ./machines/fra01) common users wireguard crypto kubernetes vultr bgp powerdns ];
- nyc01 = mkSystem [ (import ./machines/nyc01) common users wireguard crypto kubernetes vultr bgp powerdns ];
- sin01 = mkSystem [ (import ./machines/sin01) common users wireguard crypto kubernetes vultr bgp powerdns ];
+ fra01 = mkSystem [ (import ./machines/fra01) common users wireguard crypto kubernetes vultr bgp powerdns acme ];
+ nyc01 = mkSystem [ (import ./machines/nyc01) common users wireguard crypto kubernetes vultr bgp powerdns acme ];
+ sin01 = mkSystem [ (import ./machines/sin01) common users wireguard crypto kubernetes vultr bgp powerdns acme ];
};
};
systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];