diff options
| author | Karel Kočí <cynerd@email.cz> | 2022-10-06 13:37:43 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2022-10-06 13:37:43 +0200 |
| commit | 129ca0a69defc08cbab0b0840806d3165f45a414 (patch) | |
| tree | f04cf3a68648746c92be75215ecdb15614321f9f | |
| parent | fbb909aedbc677f86f6cdebf1d1ba819caebf70a (diff) | |
| download | nixos-personal-129ca0a69defc08cbab0b0840806d3165f45a414.tar.gz nixos-personal-129ca0a69defc08cbab0b0840806d3165f45a414.tar.bz2 nixos-personal-129ca0a69defc08cbab0b0840806d3165f45a414.zip | |
nixos: fix build of vps machines
| -rw-r--r-- | flake.lock | 19 | ||||
| -rw-r--r-- | flake.nix | 5 | ||||
| -rw-r--r-- | nixos/machine/lipwig.nix | 3 | ||||
| -rw-r--r-- | nixos/machine/mrpump.nix | 3 |
4 files changed, 22 insertions, 8 deletions
@@ -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", @@ -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; |