From 4b28c13b60358826b7de20ab34c4aaf68f3ad4af Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Tue, 17 Jan 2023 23:55:24 +0100 Subject: [PATCH] Tweaks --- machines/heimdall/configuration.nix | 22 +++++++++++--------- machines/heimdall/hardware-configuration.nix | 5 ----- 2 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 machines/heimdall/hardware-configuration.nix diff --git a/machines/heimdall/configuration.nix b/machines/heimdall/configuration.nix index 82ad6cf..5f4d6ab 100644 --- a/machines/heimdall/configuration.nix +++ b/machines/heimdall/configuration.nix @@ -1,10 +1,12 @@ { self, ... } @ inputs: +{ modulesPath, ... }: let pkgs = self.inputs.nixpkgs.legacyPackages.x86_64-linux; in { imports = [ - ./hardware-configuration.nix + "${modulesPath}/virtualisation/proxmox-lxc.nix" + ../../users/root ../../users/erwin ]; @@ -17,13 +19,13 @@ in }; }; - proxmox.qemuConf = { - name = "heimdall"; + proxmoxLXC = { + privileged = true; }; networking = { - hostName = "heimdall"; - useDHCP = false; + # hostName = "heimdall"; + # useDHCP = false; nat = { enable = true; @@ -37,7 +39,7 @@ in }; }; - firewall.trustedInterfaces = [ "eth1" ]; + # firewall.trustedInterfaces = [ "eth1" ]; bridges = { br0 = { @@ -46,10 +48,10 @@ in }; }; - defaultGateway = { - address = "10.2.0.1"; - interface = "eth1"; - }; + # defaultGateway = { + # address = "10.2.0.1"; + # interface = "eth1"; + # }; nameservers = [ "10.0.0.254" ]; wireguard.interfaces = { diff --git a/machines/heimdall/hardware-configuration.nix b/machines/heimdall/hardware-configuration.nix deleted file mode 100644 index 5437eb4..0000000 --- a/machines/heimdall/hardware-configuration.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ modulesPath, ... }: { - imports = [ - (modulesPath + "/virtualisation/proxmox-image.nix") - ]; -}