From 60ad1d213abb332c2a27110444aad9e2c543e966 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Wed, 4 Jun 2025 20:49:05 +0100 Subject: [PATCH] nix: break out vm configuration into separate file Change-Id: zvswzpqpkovtsuzlyrorwwoyxvtussuz Signed-off-by: oppiliappan --- flake.nix | 33 +-------------------------------- nix/vm.nix | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 32 deletions(-) create mode 100644 nix/vm.nix diff --git a/flake.nix b/flake.nix index 8249c8c..63526c3 100644 --- a/flake.nix +++ b/flake.nix @@ -200,39 +200,8 @@ }; }); - nixosConfigurations.knotVM = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - self.nixosModules.knot - ({ - config, - pkgs, - ... - }: { - virtualisation.memorySize = 2048; - virtualisation.diskSize = 10 * 1024; - virtualisation.cores = 2; - services.getty.autologinUser = "root"; - environment.systemPackages = with pkgs; [curl vim git]; - systemd.tmpfiles.rules = let - u = config.services.tangled-knot.gitUser; - g = config.services.tangled-knot.gitUser; - in [ - "d /var/lib/knot 0770 ${u} ${g} - -" # Create the directory first - "f+ /var/lib/knot/secret 0660 ${u} ${g} - KNOT_SERVER_SECRET=38a7c3237c2a585807e06a5bcfac92eb39442063f3da306b7acb15cfdc51d19d" - ]; - services.tangled-knot = { - enable = true; - server = { - secretFile = "/var/lib/knot/secret"; - hostname = "localhost:6000"; - listenAddr = "0.0.0.0:6000"; - }; - }; - }) - ]; - }; nixosModules.appview = import ./nix/modules/appview.nix {inherit self;}; nixosModules.knot = import ./nix/modules/knot.nix {inherit self;}; + nixosConfigurations.knotVM = import ./nix/vm.nix {inherit self nixpkgs;}; }; } diff --git a/nix/vm.nix b/nix/vm.nix new file mode 100644 index 0000000..2167e81 --- /dev/null +++ b/nix/vm.nix @@ -0,0 +1,36 @@ +{ + nixpkgs, + self, +}: +nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + self.nixosModules.knot + ({ + config, + pkgs, + ... + }: { + virtualisation.memorySize = 2048; + virtualisation.diskSize = 10 * 1024; + virtualisation.cores = 2; + services.getty.autologinUser = "root"; + environment.systemPackages = with pkgs; [curl vim git]; + systemd.tmpfiles.rules = let + u = config.services.tangled-knot.gitUser; + g = config.services.tangled-knot.gitUser; + in [ + "d /var/lib/knot 0770 ${u} ${g} - -" # Create the directory first + "f+ /var/lib/knot/secret 0660 ${u} ${g} - KNOT_SERVER_SECRET=38a7c3237c2a585807e06a5bcfac92eb39442063f3da306b7acb15cfdc51d19d" + ]; + services.tangled-knot = { + enable = true; + server = { + secretFile = "/var/lib/knot/secret"; + hostname = "localhost:6000"; + listenAddr = "0.0.0.0:6000"; + }; + }; + }) + ]; +} -- 2.43.0