Unverified Commit 7e95d036 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

Merge pull request #333730 from adamcstephens/incus/from-lxd 

nixos/incus: add incus-only vm and container images
parents aa4e3496 e68a336a

.github/CODEOWNERS

+2 −5
Original line number Diff line number Diff line
@@ -369,16 +369,13 @@ nixos/modules/services/web-apps/pretalx.nix @mweinelt 
nixos/tests/web-apps/pretix.nix @mweinelt

nixos/tests/web-apps/pretalx.nix @mweinelt



# incus/lxc/lxd

nixos/maintainers/scripts/lxd/          @adamcstephens

# incus/lxc

nixos/maintainers/scripts/incus/        @adamcstephens

nixos/modules/virtualisation/incus.nix  @adamcstephens

nixos/modules/virtualisation/lxc*       @adamcstephens

nixos/modules/virtualisation/lxd*       @adamcstephens

nixos/tests/incus/                      @adamcstephens

nixos/tests/lxd/                        @adamcstephens

pkgs/by-name/in/incus/                  @adamcstephens

pkgs/by-name/lx/lxc*                    @adamcstephens

pkgs/by-name/lx/lxd*                    @adamcstephens



# ExpidusOS, Flutter

/pkgs/development/compilers/flutter @RossComputerGuy

nixos/maintainers/scripts/incus/incus-container-image-inner.nix

0 → 100644
+34 −0
Original line number Diff line number Diff line 
# Edit this configuration file to define what should be installed on

# your system.  Help is available in the configuration.nix(5) man page

# and in the NixOS manual (accessible by running ‘nixos-help’).



{ modulesPath, ... }:



{

  imports = [

    # Include the default incus configuration.

    "${modulesPath}/virtualisation/lxc-container.nix"

    # Include the container-specific autogenerated configuration.

    ./incus.nix

  ];



  networking = {

    dhcpcd.enable = false;

    useDHCP = false;

    useHostResolvConf = false;

  };



  systemd.network = {

    enable = true;

    networks."50-eth0" = {

      matchConfig.Name = "eth0";

      networkConfig = {

        DHCP = "ipv4";

        IPv6AcceptRA = true;

      };

      linkConfig.RequiredForOnline = "routable";

    };

  };



  system.stateVersion = "@stateVersion@"; # Did you read the comment?

}

nixos/maintainers/scripts/incus/incus-container-image.nix

0 → 100644
+47 −0
Original line number Diff line number Diff line 
{ lib, pkgs, ... }:



{

  imports = [ ../../../modules/virtualisation/lxc-container.nix ];



  virtualisation.lxc.templates.nix = {

    enable = true;

    target = "/etc/nixos/incus.nix";

    template = ./nix.tpl;

    when = [

      "create"

      "copy"

    ];

  };



  # copy the config for nixos-rebuild

  system.activationScripts.config =

    let

      config = pkgs.substituteAll {

        src = ./incus-container-image-inner.nix;

        stateVersion = lib.trivial.release;

      };

    in

    ''

      if [ ! -e /etc/nixos/configuration.nix ]; then

        install -m 0644 -D ${config} /etc/nixos/configuration.nix

      fi

    '';



  networking = {

    dhcpcd.enable = false;

    useDHCP = false;

    useHostResolvConf = false;

  };



  systemd.network = {

    enable = true;

    networks."50-eth0" = {

      matchConfig.Name = "eth0";

      networkConfig = {

        DHCP = "ipv4";

        IPv6AcceptRA = true;

      };

      linkConfig.RequiredForOnline = "routable";

    };

  };

}

nixos/maintainers/scripts/incus/incus-virtual-machine-image-inner.nix

0 → 100644
+34 −0
Original line number Diff line number Diff line 
# Edit this configuration file to define what should be installed on

# your system.  Help is available in the configuration.nix(5) man page

# and in the NixOS manual (accessible by running ‘nixos-help’).



{ modulesPath, ... }:



{

  imports = [

    # Include the default incus configuration.

    "${modulesPath}/virtualisation/incus-virtual-machine.nix"

    # Include the container-specific autogenerated configuration.

    ./incus.nix

  ];



  networking = {

    dhcpcd.enable = false;

    useDHCP = false;

    useHostResolvConf = false;

  };



  systemd.network = {

    enable = true;

    networks."50-enp5s0" = {

      matchConfig.Name = "enp5s0";

      networkConfig = {

        DHCP = "ipv4";

        IPv6AcceptRA = true;

      };

      linkConfig.RequiredForOnline = "routable";

    };

  };



  system.stateVersion = "@stateVersion@"; # Did you read the comment?

}

nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix

0 → 100644
+48 −0
Original line number Diff line number Diff line 
{ lib, pkgs, ... }:



{

  imports = [ ../../../modules/virtualisation/incus-virtual-machine.nix ];



  virtualisation.lxc.templates.nix = {

    enable = true;

    target = "/etc/nixos/incus.nix";

    template = ./nix.tpl;

    when = [

      "create"

      "copy"

    ];

  };



  # copy the config for nixos-rebuild

  system.activationScripts.config =

    let

      config = pkgs.substituteAll {

        src = ./incus-virtual-machine-image-inner.nix;

        stateVersion = lib.trivial.release;

      };

    in

    ''

      if [ ! -e /etc/nixos/configuration.nix ]; then

        install -m 0644 -D ${config} /etc/nixos/configuration.nix

      fi

    '';



  # Network

  networking = {

    dhcpcd.enable = false;

    useDHCP = false;

    useHostResolvConf = false;

  };



  systemd.network = {

    enable = true;

    networks."50-enp5s0" = {

      matchConfig.Name = "enp5s0";

      networkConfig = {

        DHCP = "ipv4";

        IPv6AcceptRA = true;

      };

      linkConfig.RequiredForOnline = "routable";

    };

  };

}