From 4bd733777a65199372df0115fdf41c87c969e25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Barnouin?= Date: Tue, 7 Jan 2025 13:38:19 +0100 Subject: [PATCH] Changes in flake --- flake.nix | 36 +++++++++++++++++------------------- services/default.nix | 1 - 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/flake.nix b/flake.nix index 8844cde..4659243 100644 --- a/flake.nix +++ b/flake.nix @@ -58,15 +58,23 @@ modules = [ agenix.nixosModules.default "${inputs.nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix" + "${inputs.self}/systems/minimalLXCConfig.nix" "${inputs.self}/services" { networking.hostName = "nginx"; services.vm_nginx = { enable = true; }; - services.lxc = { - enable = true; - }; + } + ]; + }; + template = nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + agenix.nixosModules.default + "${inputs.self}/systems/minimalVMConfig.nix" + { + networking.hostName = "nixos"; } ]; }; @@ -75,16 +83,12 @@ modules = [ agenix.nixosModules.default microvm.nixosModules.microvm - "${inputs.nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix" - "${inputs.self}/systems" + "${inputs.self}/systems/minimalVMConfig.nix" "${inputs.self}/services" { services.vm_jellyfin = { enable = true; }; - services.vm = { - enable = true; - }; } ]; }; @@ -93,15 +97,13 @@ modules = [ agenix.nixosModules.default "${inputs.nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix" + "${inputs.self}/systems/minimalLXCConfig.nix" "${inputs.self}/services" { networking.hostName = "redis"; services.vm_redis = { enable = true; }; - services.lxc = { - enable = true; - }; } ]; }; @@ -110,6 +112,7 @@ modules = [ agenix.nixosModules.default "${inputs.nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix" + "${inputs.self}/systems/minimalLXCConfig.nix" "${inputs.self}/services" { services.vm_grafana = { @@ -118,9 +121,6 @@ proxy_ip = proxy_host; pgsql_ip = pgsql_host; }; - services.lxc = { - enable = true; - }; } ]; }; @@ -129,8 +129,7 @@ modules = [ agenix.nixosModules.default microvm.nixosModules.microvm - "${inputs.nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix" - "${inputs.self}/systems" + "${inputs.self}/systems/minimalMicrovmConfig.nix" "${inputs.self}/services" { services.vm_grafana = { @@ -155,7 +154,6 @@ modules = [ agenix.nixosModules.default inputs.authentik-nix.nixosModules.default - "${inputs.nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix" { services.authentik = { enable = true; @@ -170,7 +168,7 @@ }; } microvm.nixosModules.microvm - "${inputs.self}/systems" + "${inputs.self}/systems/minimalMicrovmConfig.nix" "${inputs.self}/services" { microvm = { @@ -182,7 +180,7 @@ } ]; }; - services.vm = { + services.micro_vm = { enable = true; hostname = "authentik"; vm_ip = "192.168.1.25"; diff --git a/services/default.nix b/services/default.nix index 227cded..0193eff 100644 --- a/services/default.nix +++ b/services/default.nix @@ -9,6 +9,5 @@ ./grafana ./authentik ./postgresql - ./minimalConfig ]; }