From 129ca0a69defc08cbab0b0840806d3165f45a414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 6 Oct 2022 13:37:43 +0200
Subject: nixos: fix build of vps machines

---
 flake.lock               | 19 ++++++++++++++++++-
 flake.nix                |  5 ++++-
 nixos/machine/lipwig.nix |  3 ---
 nixos/machine/mrpump.nix |  3 ---
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index fca985f..b7b4476 100644
--- a/flake.lock
+++ b/flake.lock
@@ -143,7 +143,8 @@
         "nixturris": "nixturris",
         "personal-secret": "personal-secret",
         "shellrc": "shellrc",
-        "sterm": "sterm"
+        "sterm": "sterm",
+        "vpsadminos": "vpsadminos"
       }
     },
     "shellrc": {
@@ -182,6 +183,22 @@
         "repo": "sterm",
         "type": "github"
       }
+    },
+    "vpsadminos": {
+      "locked": {
+        "lastModified": 1665048880,
+        "narHash": "sha256-VbpeFHwhGLZBi/GL/TH+nvEOXFXejXHWL3l7qjlwBzE=",
+        "owner": "Cynerd",
+        "repo": "vpsadminos",
+        "rev": "b1dc09353a9000f7cfda4dcde6572e6e2afd1b7d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Cynerd",
+        "ref": "nix-flake",
+        "repo": "vpsadminos",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 4c24a59..ff46671 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,7 +51,10 @@
           };
         amd64System = genericSystem { };
         vpsSystem = genericSystem {
-          extra_modules = [ vpsadminos.nixosConfigurations.default ];
+          extra_modules = [
+            vpsadminos.nixosConfigurations.default
+            { boot.loader.systemd-boot.enable = false; }
+          ];
         };
         raspi2System = genericSystem {
           system = "armv7l-linux";
diff --git a/nixos/machine/lipwig.nix b/nixos/machine/lipwig.nix
index 0069638..8a7e9a6 100644
--- a/nixos/machine/lipwig.nix
+++ b/nixos/machine/lipwig.nix
@@ -5,9 +5,6 @@ with lib;
 {
 
   config = {
-    boot.isContainer = true;
-    boot.loader.initScript.enable = true;
-
     cynerd.openvpn.personal = true;
 
     # Git ######################################################################
diff --git a/nixos/machine/mrpump.nix b/nixos/machine/mrpump.nix
index 66cdbb5..99ce26d 100644
--- a/nixos/machine/mrpump.nix
+++ b/nixos/machine/mrpump.nix
@@ -5,9 +5,6 @@ with lib;
 {
 
   config = {
-    boot.isContainer = true;
-    boot.loader.initScript.enable = true;
-
     # Gitlab worker
     services.gitlab-runner = {
       enable = true;
-- 
cgit v1.2.3