From 503428c7448fde28502fad3c4af2f58e691fd6f7 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Thu, 31 Aug 2023 13:27:44 -0400 Subject: [PATCH] Infini-SERVER: regenerate bash scripts --- hosts/Infini-SERVER/bare_install.bash | 2 +- hosts/Infini-SERVER/data_setup.bash | 10 +++++----- hosts/Infini-SERVER/install.bash | 14 +++++++------- hosts/Infini-SERVER/mount.bash | 6 +++--- hosts/Infini-SERVER/prep.bash | 10 +++++----- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/hosts/Infini-SERVER/bare_install.bash b/hosts/Infini-SERVER/bare_install.bash index 54c2498..ded4b7a 100755 --- a/hosts/Infini-SERVER/bare_install.bash +++ b/hosts/Infini-SERVER/bare_install.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash # [[file:readme.org::bare_install][bare_install]] -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::installing][installing]]][installing]] +# [[file:readme.org::bare_install][installing]] echo "LOG: Installing NixOS" sudo nixos-install --flake /etc/nixos#Infini-SERVER --no-root-password # installing ends here diff --git a/hosts/Infini-SERVER/data_setup.bash b/hosts/Infini-SERVER/data_setup.bash index 564eb37..2efc4fc 100755 --- a/hosts/Infini-SERVER/data_setup.bash +++ b/hosts/Infini-SERVER/data_setup.bash @@ -1,32 +1,32 @@ #!/usr/bin/env bash # [[file:readme.org::data_setup][data_setup]] -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::boilerplate][boilerplate]]][boilerplate]] +# [[file:readme.org::data_setup][boilerplate]] DISK=$1 PART=$DISK$2 sudo mkdir -p /mnt # boilerplate ends here -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::mount_check][mount_check]]][mount_check]] +# [[file:readme.org::data_setup][mount_check]] if mountpoint -q -- "/mnt"; then echo "ERROR: /mnt is a mounted filesystem, aborting" exit 1 fi # mount_check ends here -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::data_partitioning][data_partitioning]]][data_partitioning]] +# [[file:readme.org::data_partitioning][data_partitioning]] echo "LOG: Partitioning $DISK for data storage" sudo parted $DISK -- mktable gpt sudo parted $DISK -s -- mkpart primary btrfs 0% 100% # data_partitioning ends here -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::data_filesystems][data_filesystems]]][data_filesystems]] +# [[file:readme.org::data_filesystems][data_filesystems]] echo "LOG: Making data filesystems" echo "- Making btrfa filesystem on ${PART}1" sudo mkfs.btrfs "${PART}1" --csum xxhash -L "data" -f # data_filesystems ends here -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::data_subvolumes][data_subvolumes]]][data_subvolumes]] +# [[file:readme.org::data_subvolumes][data_subvolumes]] echo "LOG: Making data subvolumes on ${PART}1" sudo mount "${PART}1" /mnt sudo btrfs subvolume create /mnt/root diff --git a/hosts/Infini-SERVER/install.bash b/hosts/Infini-SERVER/install.bash index c7657b1..9876ae5 100755 --- a/hosts/Infini-SERVER/install.bash +++ b/hosts/Infini-SERVER/install.bash @@ -1,21 +1,21 @@ #!/usr/bin/env bash # [[file:readme.org::install][install]] -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::mount][mount]]][mount]] -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::boilerplate][boilerplate]]][boilerplate]] +# [[file:readme.org::mount][mount]] +# [[file:readme.org::mount][boilerplate]] DISK=$1 PART=$DISK$2 sudo mkdir -p /mnt # boilerplate ends here -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::mount_check][mount_check]]][mount_check]] +# [[file:readme.org::mount][mount_check]] if mountpoint -q -- "/mnt"; then echo "ERROR: /mnt is a mounted filesystem, aborting" exit 1 fi # mount_check ends here -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::mounting][mounting]]][mounting]] +# [[file:readme.org::mounting][mounting]] echo "LOG: Mounting tmpfs" sudo mount -t tmpfs root /mnt @@ -35,12 +35,12 @@ sudo mount "${PART}1" /mnt/boot/efi # mounting ends here # mount ends here -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::installing][installing]]][installing]] +# [[file:readme.org::installing][installing]] echo "LOG: Installing NixOS" sudo nixos-install --flake /etc/nixos#Infini-SERVER --no-root-password # installing ends here -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::install_extra][install_extra]]][install_extra]] +# [[file:readme.org::install_extra][install_extra]] echo "LOG: Cloning configuration" sudo chown -R infinidoge /mnt/persist/etc/nixos git clone --no-hardlinks --progress https://gitlab.com/infinidoge/universe.git /mnt/persist/etc/nixos @@ -50,7 +50,7 @@ git clone --no-hardlinks --progress --depth 1 https://github.com/hlissner/doom-e HOME=/mnt/persist/home/infinidoge /mnt/persist/home/infinidoge/.config/emacs/bin/doom -y install --no-config # install_extra ends here -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::cleanup][cleanup]]][cleanup]] +# [[file:readme.org::cleanup][cleanup]] echo "LOG: Unmounting all" sudo umount -R /mnt # cleanup ends here diff --git a/hosts/Infini-SERVER/mount.bash b/hosts/Infini-SERVER/mount.bash index 9cdb81b..503dd8d 100755 --- a/hosts/Infini-SERVER/mount.bash +++ b/hosts/Infini-SERVER/mount.bash @@ -1,20 +1,20 @@ #!/usr/bin/env bash # [[file:readme.org::mount][mount]] -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::boilerplate][boilerplate]]][boilerplate]] +# [[file:readme.org::mount][boilerplate]] DISK=$1 PART=$DISK$2 sudo mkdir -p /mnt # boilerplate ends here -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::mount_check][mount_check]]][mount_check]] +# [[file:readme.org::mount][mount_check]] if mountpoint -q -- "/mnt"; then echo "ERROR: /mnt is a mounted filesystem, aborting" exit 1 fi # mount_check ends here -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::mounting][mounting]]][mounting]] +# [[file:readme.org::mount][mounting]] echo "LOG: Mounting tmpfs" sudo mount -t tmpfs root /mnt diff --git a/hosts/Infini-SERVER/prep.bash b/hosts/Infini-SERVER/prep.bash index c2a01bb..c479551 100755 --- a/hosts/Infini-SERVER/prep.bash +++ b/hosts/Infini-SERVER/prep.bash @@ -1,20 +1,20 @@ #!/usr/bin/env bash # [[file:readme.org::preparation][preparation]] -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::boilerplate][boilerplate]]][boilerplate]] +# [[file:readme.org::boilerplate][boilerplate]] DISK=$1 PART=$DISK$2 sudo mkdir -p /mnt # boilerplate ends here -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::mount_check][mount_check]]][mount_check]] +# [[file:readme.org::mount_check][mount_check]] if mountpoint -q -- "/mnt"; then echo "ERROR: /mnt is a mounted filesystem, aborting" exit 1 fi # mount_check ends here -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::partitioning][partitioning]]][partitioning]] +# [[file:readme.org::partitioning][partitioning]] echo "LOG: Partitioning $DISK" sudo parted $DISK -- mktable gpt sudo parted $DISK -s -- mkpart ESP fat32 1MiB 512MiB @@ -23,7 +23,7 @@ sudo parted $DISK -s -- mkpart primary linux-swap -24GiB 100% sudo parted $DISK -s -- set 1 esp on # partitioning ends here -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::filesystems][filesystems]]][filesystems]] +# [[file:readme.org::filesystems][filesystems]] echo "LOG: Making filesystems" echo "- Making fat32 filesystem on ${PART}1" sudo mkfs.fat -F 32 -n boot "${PART}1" @@ -33,7 +33,7 @@ echo "- Making swap space on ${PART}3" sudo mkswap -L swap "${PART}3" # filesystems ends here -# [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::subvolumes][subvolumes]]][subvolumes]] +# [[file:readme.org::subvolumes][subvolumes]] echo "LOG: Making subvolumes on ${PART}2" sudo mount "${PART}2" /mnt sudo btrfs subvolume create /mnt/root