Fix errors

This commit is contained in:
2026-03-13 19:14:07 +00:00
parent 69232abb6c
commit d869bc0cf9
4 changed files with 45 additions and 32 deletions

View File

@@ -1,4 +1,4 @@
{ disko, ... }: { disko, hostname, ... }:
let let
mkDisk = { hostname, drive }: { mkDisk = { hostname, drive }: {
@@ -54,8 +54,10 @@ in
imports = [ disko.nixosModules.disko ]; imports = [ disko.nixosModules.disko ];
disko.devices = { disko.devices = {
disk = { disk = {
station = mkDisk { hostname = "station"; drive = "/dev/nvme0n1"; }; "${hostname}" = mkDisk {
stationette= mkDisk { hostname = "stationette"; drive = "/dev/sda"; }; inherit hostname;
drive = if hostname == "station" then "/dev/nvme0n1" else "/dev/sda";
};
}; };
}; };
} }

View File

@@ -31,33 +31,36 @@ in
umount /btrfs_tmp umount /btrfs_tmp
''; '';
fileSystems."/" = { # fileSystems."/" = {
device = rootDisk; # device = rootDisk;
fsType = "btrfs"; # fsType = "btrfs";
options = [ "subvol=root" ]; # options = [ "subvol=root" ];
}; # };
#
# fileSystems."/persist" = {
# device = rootDisk;
# neededForBoot = true;
# fsType = "btrfs";
# options = [ "subvol=persist" ];
# };
#
# fileSystems."/nix" = {
# device = rootDisk;
# neededForBoot = true;
# fsType = "btrfs";
# options = [ "subvol=nix" ];
# };
#
# fileSystems."/boot" = {
# device = bootDisk;
# fsType = "vfat";
# options = [ "fmask=0022" "dmask=0022" "umask=0077" ];
# };
#
# swapDevices = [ {
# device = "/.swapvol/swapfile";
# } ];
fileSystems."/persist" = { fileSystems."/persist".neededForBoot = true;
device = rootDisk; fileSystems."/nix".neededForBoot = true;
neededForBoot = true;
fsType = "btrfs";
options = [ "subvol=persist" ];
};
fileSystems."/nix" = {
device = rootDisk;
neededForBoot = true;
fsType = "btrfs";
options = [ "subvol=nix" ];
};
fileSystems."/boot" = {
device = bootDisk;
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" "umask=0077" ];
};
swapDevices = [ {
device = "/.swapvol/swapfile";
} ];
} }

View File

@@ -0,0 +1,8 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View File

@@ -50,7 +50,7 @@ in
initrd.verbose = false; initrd.verbose = false;
kernelParams = [ kernelParams = [
"resume_offset=${hibernateBootOffset}" "resume_offset=${resumeOffset}"
"quiet" "quiet"
"udev.log_level=3" "udev.log_level=3"
"systemd.show_status=auto" "systemd.show_status=auto"