diff --git a/install/install.sh b/install/install.sh index 4abe02f..d51018f 100644 --- a/install/install.sh +++ b/install/install.sh @@ -1,8 +1,9 @@ #!/usr/bin/env bash -CONFIG_FOLDER=$(pwd)/.. +cd .. +CONFIG_FOLDER=$(pwd) +cd install ENCRYPT_ROOT=true -ENCRYPT_SWAP=false FORMAT_BOOT_PARTITION=false DEVICE_NAME=Dell-Laptop @@ -10,7 +11,6 @@ DEVICE=/dev/nvme0n1 BOOT_PARTITION=/dev/nvme0n1p1 SWAP_PARTITION=/dev/nvme0n1p3 ROOT_PARTITION=/dev/nvme0n1p2 -SWAP_NAME=cryptswap ROOT_NAME=cryptnixos gdisk $DEVICE @@ -31,7 +31,6 @@ else mkfs.btrfs -f -L root $ROOT_PARTITION mount -t btrfs -o compress=zstd,noatime,ssd $ROOT_PARTITION /mnt fi -# read -p "Press enter to continue" btrfs subvolume create /mnt/@nixos btrfs subvolume create /mnt/@nix-store btrfs subvolume create /mnt/@home @@ -46,35 +45,19 @@ mount -t btrfs -o subvol=@home,compress=zstd,noatime,ssd $ROOT_NAME /mnt/home mount -t btrfs -o subvol=@nix-store,compress=zstd,noatime,ssd $ROOT_NAME /mnt/nix/store btrfs subvolume create /mnt/tmp btrfs subvolume create /mnt/var -# read -p "Press enter to continue" # Mount boot mkdir /mnt/boot mount $BOOT_PARTITION /mnt/boot -# read -p "Press enter to continue" # Create swap -if [[ "$ENCRYPT_SWAP" == true ]]; then - mkdir -p /mnt/root - dd count=1 bs=256 if=/dev/urandom of=/mnt/root/swap.key - cryptsetup --type luks2 --cipher aes-xts-plain64 --key-size 256 --hash sha512 --key-file /mnt/root/swap.key luksFormat $SWAP_PARTITION - cryptsetup --key-file /mnt/root/swap.key luksOpen $SWAP_PARTITION $SWAP_NAME - mkswap -L swap /dev/mapper/$SWAP_NAME -else - mkswap -L swap $SWAP_PARTITION -fi +mkswap -L swap $SWAP_PARTITION # Generate config (hardware) nixos-generate-config --root /mnt/ -# Copy config to new system -# mkdir -p /mnt/root/nixos-config -# cp -r $(pwd)/.. /mnt/root/nixos-config echo "import $CONFIG_FOLDER \"$DEVICE_NAME\"" > /mnt/etc/nixos/configuration.nix nano /mnt/etc/nixos/configuration.nix -sed -i 's/\/etc\/nixos/\/mnt\/etc\/nixos/g' /mnt/root/nixos-config/default.nix read -p "Please, add swap device into nixos-config/modules/filesystems.nix before continue" read -p "Press enter to continue" nixos-install -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz -sed -i 's/\/mnt\/etc\/nixos/\/etc\/nixos/g' /mnt/root/nixos-config/default.nix mkdir -p /mnt/home/alukard/nixos-config -cp -r $CONFIG_FOLDER /mnt/home/alukard/nixos-config -chown -R alukard:users /mnt/home/alukard/nixos-config -# sed -i 's/\/mnt\/root/\/root/g' /mnt/etc/nixos/configuration.nix -# read -p "Installation complete!" +cp -aT $CONFIG_FOLDER /mnt/home/alukard/nixos-config +chown -R 1000:100 /mnt/home/alukard/nixos-config +echo "import /home/alukard/nixos-config \"$DEVICE_NAME\"" > /mnt/etc/nixos/configuration.nix