Infinidoge/universe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Infini-STICK: reconfigure for new usb stick

Browse source
This commit is contained in:
Infinidoge 2024-09-04 02:08:05 -04:00
parent 4d323f6a79
commit 07b3a6db95
Signed by: Infinidoge
SSH key fingerprint: SHA256:oAMyvotlNFraMmZmr+p6AxnNfW/GioTs1pOn3V4tQ7A
2 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hosts/Infini-STICK/default.nix
View file

@ -4,6 +4,7 @@
./filesystems.nix ./filesystems.nix
]; ];
system.stateVersion = "24.11";
networking.hostId = "06a3f197"; networking.hostId = "06a3f197";
boot.kernelPackages = lib.mkForce config.boot.zfs.package.latestCompatibleLinuxPackages; boot.kernelPackages = lib.mkForce config.boot.zfs.package.latestCompatibleLinuxPackages;
@ -15,13 +16,7 @@
}; };
}; };
persist = { specialisation."Graphical".configuration = {
directories = [ modules.desktop.wm.enable = true;
];
files = [
];
}; };
system.stateVersion = "23.11";
} }

23
hosts/Infini-STICK/filesystems.nix
View file

@ -1,18 +1,21 @@
{ config, lib, pkgs, ... }: { ... }:
let let
uuid = uuid: "/dev/disk/by-uuid/${uuid}"; uuid = uuid: "/dev/disk/by-uuid/${uuid}";
main = uuid "ae3f3d98-1d87-47b4-a4ed-d69a896eee69"; commonOptions = [ "autodefrag" "noatime" "compress-force=zstd:1" ];
commonOptions = [ "autodefrag" "noatime" "compress-force=zstd:4" ];
mkMain' = options: { mkMain' = options: {
device = main; device = uuid "85d60c21-bc62-471e-b305-f7e26499adb3";
fsType = "btrfs"; fsType = "btrfs";
options = commonOptions ++ options; options = commonOptions ++ options;
}; };
mkMain = options: (mkMain' options) // { neededForBoot = true; }; mkMain = options: (mkMain' options) // { neededForBoot = true; };
in in
{ {
environment.etc.crypttab.text = ''
vault UUID=8fe59989-cd9c-4142-bdf7-fc748cb56b34 - luks,noauto
'';
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "none"; device = "none";
@ -21,6 +24,16 @@ in
}; };
"/media/main" = mkMain' [ ]; "/media/main" = mkMain' [ ];
"/media/storage" = {
device = uuid "B56A-F857";
fsType = "exfat";
options = [ "defaults" "noatime" ];
};
"/media/vault" = {
device = "/dev/mapper/vault";
fsType = "ext4";
options = [ "defaults" "noauto" ];
};
"/persist" = mkMain [ "subvol=root" ]; "/persist" = mkMain [ "subvol=root" ];
"/etc/ssh" = mkMain [ "subvol=root/etc/ssh" ]; "/etc/ssh" = mkMain [ "subvol=root/etc/ssh" ];
@ -28,7 +41,7 @@ in
"/boot" = mkMain [ "subvol=boot" ]; "/boot" = mkMain [ "subvol=boot" ];
"/boot/efi" = { "/boot/efi" = {
device = uuid "D7DB-2291"; device = uuid "C167-F1F0";
fsType = "vfat"; fsType = "vfat";
neededForBoot = true; neededForBoot = true;
}; };