From 2b7d613737c9b987f9e633825060d6ebceb311a5 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Tue, 28 Nov 2023 10:30:17 -0600 Subject: [PATCH] NixOS 23.11 and Flaking --- distros/nixos/23.05/http/configuration.nix | 9 ++- distros/nixos/23.05/http/flake.nix | 15 +++++ distros/nixos/23.05/http/install.sh | 3 +- distros/nixos/23.11/amd64.pkrvars.hcl.sh | 42 ++++++++++++++ distros/nixos/23.11/finalize.sh | 2 + distros/nixos/23.11/http/configuration.nix | 65 ++++++++++++++++++++++ distros/nixos/23.11/http/flake.nix | 15 +++++ distros/nixos/23.11/http/in-chroot.sh | 10 ++++ distros/nixos/23.11/http/install.sh | 49 ++++++++++++++++ distros/nixos/23.11/qemu.sh | 12 ++++ distros/nixos/23.11/virtualbox.sh | 15 +++++ distros/nixos/23.11/vmware.sh | 15 +++++ distros/nixos/supports.yml | 3 +- 13 files changed, 252 insertions(+), 3 deletions(-) create mode 100644 distros/nixos/23.05/http/flake.nix create mode 100755 distros/nixos/23.11/amd64.pkrvars.hcl.sh create mode 100644 distros/nixos/23.11/finalize.sh create mode 100644 distros/nixos/23.11/http/configuration.nix create mode 100644 distros/nixos/23.11/http/flake.nix create mode 100644 distros/nixos/23.11/http/in-chroot.sh create mode 100644 distros/nixos/23.11/http/install.sh create mode 100644 distros/nixos/23.11/qemu.sh create mode 100644 distros/nixos/23.11/virtualbox.sh create mode 100644 distros/nixos/23.11/vmware.sh diff --git a/distros/nixos/23.05/http/configuration.nix b/distros/nixos/23.05/http/configuration.nix index 3d506e9..4bea79e 100644 --- a/distros/nixos/23.05/http/configuration.nix +++ b/distros/nixos/23.05/http/configuration.nix @@ -6,6 +6,8 @@ #PROVIDER_PLACEHOLDER ]; + system.stateVersion = "23.05"; + # Packages installed on the whole system environment.systemPackages = with pkgs; [ curl @@ -54,5 +56,10 @@ useXkbConfig = true; }; - system.stateVersion = "23.05"; + nix = { + package = pkgs.nixFlakes; + settings = { + experimental-features = "nix-command flakes"; + }; + }; } diff --git a/distros/nixos/23.05/http/flake.nix b/distros/nixos/23.05/http/flake.nix new file mode 100644 index 0000000..f69c643 --- /dev/null +++ b/distros/nixos/23.05/http/flake.nix @@ -0,0 +1,15 @@ +{ + description = "A basic NixOS Vagrant install"; + + inputs = { + nixstable.url = "github:nixos/nixpkgs/nixos-23.05"; + }; + + outputs = { nixstable, self, ... }@inputs: + { + nixosConfigurations.vagrant = nixstable.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ ./configuration.nix ]; + }; + }; +} diff --git a/distros/nixos/23.05/http/install.sh b/distros/nixos/23.05/http/install.sh index 202369f..d0f2270 100644 --- a/distros/nixos/23.05/http/install.sh +++ b/distros/nixos/23.05/http/install.sh @@ -36,9 +36,10 @@ mount "${disk}1" /mnt # Bootstrap system nixos-generate-config --root /mnt curl -o /mnt/etc/nixos/configuration.nix "http://${host}:${port}/configuration.nix" +curl -o /mnt/etc/nixos/flake.nix "http://${host}:${port}/flake.nix" sed -i -E -e "s,@BOOT_DEVICE@,${disk}," /mnt/etc/nixos/configuration.nix sed -i -E -e 's,(.*device = "/dev/disk/).*(".*),\1by-label/root\2,' /mnt/etc/nixos/hardware-configuration.nix -nixos-install --no-root-password +nixos-install --no-root-password --flake "/mnt/etc/nixos/#vagrant" # Run stuff in the chroot curl -o /mnt/root/in-chroot.sh "http://${host}:${port}/in-chroot.sh" diff --git a/distros/nixos/23.11/amd64.pkrvars.hcl.sh b/distros/nixos/23.11/amd64.pkrvars.hcl.sh new file mode 100755 index 0000000..92d2af4 --- /dev/null +++ b/distros/nixos/23.11/amd64.pkrvars.hcl.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +set -exo pipefail + +# Name of the file to write out +name="${0%.sh}" + +version="23.11" + +# Base URL +base="https://channels.nixos.org/nixos-${version}/latest-nixos-minimal-x86_64-linux.iso" + +# Working directory +tmp="$(mktemp -d)" +checksums="${tmp}/checksums" + +# Read the SHA256 sum value +curl -L -o "${checksums}" "${base}.sha256" +until curl -f -L -o "${checksums}" "${base}.sha256"; do + sleep 1 +done +sha="$(cat "${checksums}" | grep minimal | cut -d' ' -f 1)" + +# Write out HCL file +cat << EOF > "${name}" +distro = "nixos" +version = "${version}" +iso = { + url = "${base}" + checksum = "${sha}" +} +boot_command = [ + " net.ifnames=0 biosdevnames=0", + "", # Wait for system to come up? + "curl -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/install.sh", + "", + "sudo bash /tmp/install.sh {{ .HTTPPort }} {{ .HTTPIP }}" +] +http_directory = "distros/nixos/23.05/http/" +boot_wait = "5s" +EOF + +rm -r "${tmp}" diff --git a/distros/nixos/23.11/finalize.sh b/distros/nixos/23.11/finalize.sh new file mode 100644 index 0000000..4cfad53 --- /dev/null +++ b/distros/nixos/23.11/finalize.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +set -ex diff --git a/distros/nixos/23.11/http/configuration.nix b/distros/nixos/23.11/http/configuration.nix new file mode 100644 index 0000000..037c852 --- /dev/null +++ b/distros/nixos/23.11/http/configuration.nix @@ -0,0 +1,65 @@ +{config, pkgs, lib, ...}: + +{ + imports = [ + ./hardware-configuration.nix + #PROVIDER_PLACEHOLDER + ]; + + system.stateVersion = "23.11"; + + # Packages installed on the whole system + environment.systemPackages = with pkgs; [ + curl + nano + python3 + ]; + # Services that are running + services = { + openssh.enable = true; + #xserver.enable = true; + }; + # User setup + users.groups.vagrant = {}; + users.users.vagrant = { + isNormalUser = true; + group = "vagrant"; + extraGroups = [ "wheel" ]; + password = "vagrant"; + }; + security.sudo.extraRules = [ + { + users = [ "vagrant" ]; + groups = [ "vagrant" ]; + commands = [ + { command = "ALL"; options = [ "NOPASSWD" ]; } + ]; + } + ]; + + boot.loader.grub = { + enable = true; + devices = [ "@BOOT_DEVICE@" ]; + }; + networking = { + hostName = "vagrant"; + networkmanager.enable = true; + #proxy.default = "http://user:password@proxy:port/"; + #proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + }; + time.timeZone = "UTC"; + + i18n.defaultLocale = "en_US.UTF-8"; + console = { + font = "Lat2-Terminux16"; + keyMap = lib.mkForce "us"; + useXkbConfig = true; + }; + + nix = { + package = pkgs.nixFlakes; + settings = { + experimental-features = "nix-command flakes"; + }; + }; +} diff --git a/distros/nixos/23.11/http/flake.nix b/distros/nixos/23.11/http/flake.nix new file mode 100644 index 0000000..7994fc3 --- /dev/null +++ b/distros/nixos/23.11/http/flake.nix @@ -0,0 +1,15 @@ +{ + description = "A basic NixOS Vagrant install"; + + inputs = { + nixstable.url = "github:nixos/nixpkgs/nixos-23.11"; + }; + + outputs = { nixstable, self, ... }@inputs: + { + nixosConfigurations.vagrant = nixstable.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ ./configuration.nix ]; + }; + }; +} diff --git a/distros/nixos/23.11/http/in-chroot.sh b/distros/nixos/23.11/http/in-chroot.sh new file mode 100644 index 0000000..60c21f1 --- /dev/null +++ b/distros/nixos/23.11/http/in-chroot.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +set -ex + +# Set passwords +echo "vagrant:vagrant" | chpasswd +echo "root:vagrant" | chpasswd + +# Set ownership of things vagrant should own +chown -R vagrant:vagrant ~vagrant/ +chown -R vagrant:wheel /etc/nixos diff --git a/distros/nixos/23.11/http/install.sh b/distros/nixos/23.11/http/install.sh new file mode 100644 index 0000000..d0f2270 --- /dev/null +++ b/distros/nixos/23.11/http/install.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash +#vim: set ft=bash: +set -ex + +port="${1}" # HTTP port that packer is running on +host="${2}" + +if [ -e /dev/vda ]; then + disk="/dev/vda" +elif [ -e /dev/sda ]; then + disk="/dev/sda" +else + exit 1 # Need to teach the script which device to use in this case +fi + +# The sed bit is just to strip out the extra fluff, like comments +sed -e 's/\s*\([\+0-9a-zA-Z]*\).*/\1/' << EOF | fdisk ${disk} + o # create new DOS partition table + n # new + p # primary partition + 1 # part number + # default start + # default to full disk + p # print, for debugging + w # write the partition table and exit +EOF + #t # set partition type + #1 # on partition 1 + #4 # BIOS boot + +# Format and mount partitions +mkfs.ext4 -L root "${disk}1" + +mount "${disk}1" /mnt + +# Bootstrap system +nixos-generate-config --root /mnt +curl -o /mnt/etc/nixos/configuration.nix "http://${host}:${port}/configuration.nix" +curl -o /mnt/etc/nixos/flake.nix "http://${host}:${port}/flake.nix" +sed -i -E -e "s,@BOOT_DEVICE@,${disk}," /mnt/etc/nixos/configuration.nix +sed -i -E -e 's,(.*device = "/dev/disk/).*(".*),\1by-label/root\2,' /mnt/etc/nixos/hardware-configuration.nix +nixos-install --no-root-password --flake "/mnt/etc/nixos/#vagrant" + +# Run stuff in the chroot +curl -o /mnt/root/in-chroot.sh "http://${host}:${port}/in-chroot.sh" +nixos-enter --root /mnt -c 'bash /root/in-chroot.sh' +rm /mnt/root/in-chroot.sh + +reboot diff --git a/distros/nixos/23.11/qemu.sh b/distros/nixos/23.11/qemu.sh new file mode 100644 index 0000000..b55b32d --- /dev/null +++ b/distros/nixos/23.11/qemu.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +set -ex + +sed -i -e 's,#PROVIDER_PLACEHOLDER,./guest-agent.nix,' /etc/nixos/configuration.nix +cat << EOF > /etc/nixos/guest-agent.nix +{...}: +{ + services.qemuGuest.enable = true; +} +EOF +chown vagrant:vagrant /etc/nixos/guest-agent.nix +nixos-rebuild switch diff --git a/distros/nixos/23.11/virtualbox.sh b/distros/nixos/23.11/virtualbox.sh new file mode 100644 index 0000000..33feaec --- /dev/null +++ b/distros/nixos/23.11/virtualbox.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +set -ex + +sed -i -e 's,#PROVIDER_PLACEHOLDER,./guest-agent.nix,' /etc/nixos/configuration.nix +cat << EOF > /etc/nixos/guest-agent.nix +{...}: +{ + virtualisation.virtualbox.guest = { + enable = true; + x11 = false; + }; +} +EOF +chown vagrant:vagrant /etc/nixos/guest-agent.nix +nixos-rebuild switch diff --git a/distros/nixos/23.11/vmware.sh b/distros/nixos/23.11/vmware.sh new file mode 100644 index 0000000..e3b0b6e --- /dev/null +++ b/distros/nixos/23.11/vmware.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +set -ex + +sed -i -e 's,#PROVIDER_PLACEHOLDER,./guest-agent.nix,' /etc/nixos/configuration.nix +cat << EOF > /etc/nixos/guest-agent.nix +{...}: +{ + virtualisation.vmware.guest = { + enable = true; + headless = false; + }; +} +EOF +chown vagrant:vagrant /etc/nixos/guest-agent.nix +nixos-rebuild switch diff --git a/distros/nixos/supports.yml b/distros/nixos/supports.yml index d359808..8d31ec2 100644 --- a/distros/nixos/supports.yml +++ b/distros/nixos/supports.yml @@ -1,7 +1,8 @@ -23.05: +23.05: &supp - arch: amd64 provider: qemu - arch: amd64 provider: virtualbox-iso - arch: amd64 provider: vmware-iso +23.11: *supp