This commit is contained in:
mjallen18
2026-01-26 15:38:24 -06:00
parent d1d68e154d
commit 8b4489cf8f
5 changed files with 59 additions and 19 deletions

59
checks/disksnstuff.sh Normal file → Executable file
View File

@@ -1,13 +1,52 @@
sudo mount -t tmpfs -o mode=755 none /mnt
sudo mkdir -p /mnt/{boot,home,root,etc,nix,var/log}
sudo mount /dev/mmcblk0p2 /mnt/boot
sudo mkdir -p /mnt/boot/firmware
sudo mount /dev/mmcblk0p1 /mnt/boot/firmware
sudo mount /dev/mmcblk0p3 -o compress=zstd,subvol=home /mnt/home
sudo mount /dev/mmcblk0p3 -o compress=zstd,noatime,subvol=root /mnt/root
sudo mount /dev/mmcblk0p3 -o compress=zstd,noatime,subvol=etc /mnt/etc
sudo mount /dev/mmcblk0p3 -o compress=zstd,noatime,subvol=nix /mnt/nix
sudo mount /dev/mmcblk0p3 -o compress=zstd,noatime,subvol=log /mnt/var/log
#!/usr/bin/env bash
disk=/dev/sdd
# sudo mkfs.vfat "$disk"1
# sudo bcachefs format --encrypted "$disk"2
# sudo mount -t tmpfs -o mode=755 none /mnt
# sudo mkdir -p /mnt/{boot,home,root,etc,nix,var/log,tmp,persist}
# sudo mount "$disk"1 /mnt/boot
# sudo mkdir -p /mnt/boot/firmware
# sudo mount "$disk"2 /mnt/boot/firmware
# sudo mount "$disk"2 -o compress=zstd,subvol=home /mnt/home
# sudo mount "$disk"2 -o compress=zstd,noatime,subvol=root /mnt/root
# sudo mount "$disk"2 -o compress=zstd,noatime,subvol=etc /mnt/etc
# sudo mount "$disk"2 -o compress=zstd,noatime,subvol=nix /mnt/nix
# sudo mount "$disk"2 -o compress=zstd,noatime,subvol=log /mnt/var/log
# sudo bcachefs unlock -k session "$disk"2
# sudo mount "$disk"2 /mnt/tmp
# cd /mnt/tmp
# sudo bcachefs subvolume create nix
# sudo bcachefs subvolume create etc
# sudo bcachefs subvolume create log
# sudo bcachefs subvolume create root
# sudo bcachefs subvolume create persist
# sudo bcachefs subvolume create home
# cd /etc/nixos
# sudo umount /mnt/tmp
# sudo mount -o noatime,X-mount.subdir=nix "$disk"2 /mnt/nix
# sudo mount -o noatime,X-mount.subdir=etc "$disk"2 /mnt/etc
# sudo mount -o noatime,X-mount.subdir=log "$disk"2 /mnt/var/log
# sudo mount -o noatime,X-mount.subdir=root "$disk"2 /mnt/root
# sudo mount -o noatime,X-mount.subdir=persist "$disk"2 /mnt/persist
# sudo mount -o X-mount.subdir=home "$disk"2 /mnt/home
# tree /mnt
# sudo nixos-install --flake /etc/nixos#nuc-nixos
sudo umount /mnt/boot
sudo umount /mnt/var/log
sudo umount /mnt/persist
sudo umount /mnt/home
sudo umount /mnt/root
sudo umount /mnt/etc
sudo umount /mnt/nix
sudo umount /mnt
# wpa_passphrase "Joey's Jungle 5G" "kR8v&3Qd" > 5g.conf
# wpa_supplicant -i wlp6s0 -c 5g.conf -B

View File

@@ -37,14 +37,14 @@ let
size = "100%";
content = {
type = cfg.filesystem;
# Subvolumes must set a mountpoint in order to be mounted,
# unless their parent is mounted
subvolumes = subvolumes;
}
// (
if cfg.filesystem == "btrfs" then
{
extraArgs = [ "-f" ]; # Override existing partition
# Subvolumes must set a mountpoint in order to be mounted,
# unless their parent is mounted
subvolumes = subvolumes;
}
else
{
@@ -79,14 +79,14 @@ let
};
content = {
type = cfg.filesystem;
# Subvolumes must set a mountpoint in order to be mounted,
# unless their parent is mounted
subvolumes = subvolumes;
}
// (
if cfg.filesystem == "btrfs" then
{
extraArgs = [ "-f" ]; # Override existing partition
# Subvolumes must set a mountpoint in order to be mounted,
# unless their parent is mounted
subvolumes = subvolumes;
}
else
{
@@ -185,7 +185,7 @@ in
bcachefs_filesystems = lib.mkIf (cfg.filesystem == "bcachefs") {
mounted_subvolumes_in_multi = {
type = "bcachefs_filesystem";
# passwordFile = "/etc/nixos/pool.jwe";
passwordFile = "/etc/nixos/test.key";
extraFormatArgs = [
"--compression=${cfg.compression}"
];

View File

@@ -26,7 +26,7 @@ in
swapSize = mkOpt types.str "16G" "size of swap part";
rootDisk = mkOpt types.str "/dev/nvme0n1" "Root disk";
rootDisk = mkOpt types.str "/dev/sdd" "Root disk";
compression = mkOpt types.str "zstd" "Type of compression to enable";

View File

@@ -17,7 +17,7 @@
hardware.disko = {
enable = true;
filesystem = "btrfs";
filesystem = "bcachefs";
};
headless.enable = true;

1
test.key Normal file
View File

@@ -0,0 +1 @@
Lucifer008!