diff --git a/applications/proxmox-lxc.nix b/applications/proxmox-lxc.nix deleted file mode 100644 index 9f1c970..0000000 --- a/applications/proxmox-lxc.nix +++ /dev/null @@ -1,96 +0,0 @@ -/* -Once https://github.com/NixOS/nixpkgs/pull/267764 is merged this can be removed -*/ -{ - config, - pkgs, - lib, - ... -}: -with lib; { - options.proxmoxLXC = { - enable = mkOption { - default = true; - type = types.bool; - description = lib.mdDoc "Whether to enable the Proxmox VE LXC module."; - }; - privileged = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable privileged mounts - ''; - }; - manageNetwork = mkOption { - type = types.bool; - default = false; - description = '' - Whether to manage network interfaces through nix options - When false, systemd-networkd is enabled to accept network - configuration from proxmox. - ''; - }; - manageHostName = mkOption { - type = types.bool; - default = false; - description = '' - Whether to manage hostname through nix options - When false, the hostname is picked up from /etc/hostname - populated by proxmox. - ''; - }; - }; - - config = let - cfg = config.proxmoxLXC; - in - mkIf cfg.enable { - system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix { - storeContents = [ - { - object = config.system.build.toplevel; - symlink = "none"; - } - ]; - - contents = [ - { - source = config.system.build.toplevel + "/init"; - target = "/sbin/init"; - } - ]; - - extraCommands = "mkdir -p root etc/systemd/network"; - }; - - boot = { - isContainer = true; - loader.initScript.enable = true; - }; - - console.enable = true; - - networking = mkIf (!cfg.manageNetwork) { - useDHCP = false; - useHostResolvConf = false; - useNetworkd = true; - # pick up hostname from /etc/hostname generated by proxmox - hostName = mkIf (!cfg.manageHostName) (mkForce ""); - }; - - services.openssh = { - enable = mkDefault true; - startWhenNeeded = mkDefault true; - }; - - systemd = { - mounts = mkIf (!cfg.privileged) [ - { - enable = false; - where = "/sys/kernel/debug"; - } - ]; - services."getty@".unitConfig.ConditionPathExists = ["" "/dev/%I"]; - }; - }; -} diff --git a/machines/_base.nix b/machines/_base.nix index 0fa84e6..18da744 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -11,9 +11,8 @@ with lib; let cfg = config.skynet; in { imports = [ - # custom lxc mocule until the patch gets merged in - ../applications/proxmox-lxc.nix - # (modulesPath + "/virtualisation/proxmox-lxc.nix") + # This is required for LXC to function properly + (modulesPath + "/virtualisation/proxmox-lxc.nix") # for the secrets inputs.agenix.nixosModules.default