diff --git a/configs/sshConfig b/configs/sshConfig index 27da86e..74a8d26 100644 --- a/configs/sshConfig +++ b/configs/sshConfig @@ -1,5 +1,7 @@ Host broodje.freenen.nl Port 1675 +Host home.freenen.nl + Port 2653 Host git.finnvanreenen.nl Port 1234 IdentityFile ~/.ssh/id_rsa diff --git a/elfDesktop.sfdisk b/elfDesktop.sfdisk new file mode 100644 index 0000000..68c6127 --- /dev/null +++ b/elfDesktop.sfdisk @@ -0,0 +1,12 @@ +label: gpt +label-id: 181CDCBC-511C-4F07-B00D-AB210C4BCCBC +device: /dev/nvme0n1 +unit: sectors +first-lba: 2048 +last-lba: 1953525134 +sector-size: 512 + +/dev/nvme0n1p1 : start= 2048, size= 1048576, type=C12A7328-F81F-11D2-BA4B-00A0C93EC93B, uuid=1765C25B-7606-4F9C-8174-04EFEFD3FCE2 +/dev/nvme0n1p2 : start= 1050624, size= 8388608, type=0657FD6D-A4AB-43C4-84E5-0933C84B4F4F, uuid=C0DA7E9C-D507-4E9A-96AE-E7AF26DBCE9F +/dev/nvme0n1p3 : start= 9439232, size= 1572864000, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=219EFC65-B9ED-4E10-BF4B-01CD6A7CC8C7 + diff --git a/elfDesktop.sh b/elfDesktop.sh index 8ce50ed..8ae6002 100644 --- a/elfDesktop.sh +++ b/elfDesktop.sh @@ -1,12 +1,11 @@ HOSTNAME="ELFDesktop" -UEFI_DISK="/dev/sdb" -DISK="/dev/sdb" +UEFI_DISK="/dev/nvme0n1" +DISK="/dev/nvme0n1" USERNAME="freenen" SFDISK_FILE="./elfDesktop.sfdisk" -UEFI_PARTITION="${UEFI_DISK}1" -SWAP_PARTITION="${DISK}2" -ROOT_PARTITION="${DISK}3" +UEFI_PARTITION="${UEFI_DISK}p1" +SWAP_PARTITION="${DISK}p2" +ROOT_PARTITION="${DISK}p3" -bash ./elf_os.sh diff --git a/elf_os.sh b/elf_os.sh old mode 100644 new mode 100755 index 35986cd..f7cdb02 --- a/elf_os.sh +++ b/elf_os.sh @@ -1,3 +1,6 @@ +#!/bin/bash + +. "$1" function run(){ echo "[ ] $1" @@ -116,7 +119,7 @@ echo run-chroot "config initramfs" "sed --in-place -e 's/HOOKS=(.*)/HOOKS=(base udev autodetect microcode modconf kms keyboard block encrypt filesystems fsck)/' /etc/mkinitcpio.conf" run-chroot "generate initramfs" "mkinitcpio -P" -DISKUUID=$(blkid --output export ${DISK}3 | grep '^UUID' | sed 's/UUID=//') +DISKUUID=$(blkid --output export ${ROOT_PARTITION} | grep '^UUID' | sed 's/UUID=//') run-chroot "install systemd-boot" "bootctl install" run-chroot "create boot config for main" "cat >/boot/loader/entries/arch.conf <