From 02e4105bb6bec4a6592675114d7e378b088ad16f Mon Sep 17 00:00:00 2001 From: Max Audron Date: Sun, 4 Feb 2024 12:33:37 +0100 Subject: update ettves & phaenn to nixos 23.11 --- flake.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 8622c7e..0f5721b 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; flake-parts.url = "github:hercules-ci/flake-parts"; nixinate.url = "github:maxaudron/nixinate"; @@ -21,7 +21,10 @@ }; mkSystem = modules: nixpkgs.lib.nixosSystem { inherit specialArgs system; - modules = modules ++ [ nixinate.nixosModules.default ]; + modules = modules ++ (with self.nixosModules; [ + nixinate.nixosModules.default + common users wireguard crypto + ]); }; in { @@ -29,11 +32,11 @@ nixosConfigurations = with self.nixosModules; { # vultr-image = mkSystem [ common users image vultr ]; - ettves = mkSystem [ (import ./machines/ettves) common users wireguard crypto kubernetes zfs teamspeak postgresql quassel powerdns acme authentik hydra homeassistant palworld ]; - 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 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 ]; + ettves = mkSystem [ (import ./machines/ettves) kubernetes zfs teamspeak postgresql quassel powerdns acme authentik hydra homeassistant palworld ]; + phaenn = mkSystem [ (import ./machines/phaenn) kubernetes zfs acme tlmp ]; + fra01 = mkSystem [ (import ./machines/fra01) vultr bgp powerdns acme garage ]; + nyc01 = mkSystem [ (import ./machines/nyc01) vultr bgp powerdns acme garage ]; + sin01 = mkSystem [ (import ./machines/sin01) vultr bgp powerdns acme garage ]; }; }; systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; -- cgit v1.2.3