lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No disk defaults for disko configurations
Some checks failed
/ check (push) Failing after 3m44s
Details

Browse source
This commit is contained in:
Daniel Flanagan 2024-12-27 16:20:48 -06:00
parent 0e62da006c
commit 06a36e534d
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
disko/default.nix
View file

@ -18,7 +18,7 @@
}; };
in { in {
standardWithHibernateSwap = { standardWithHibernateSwap = {
disks ? ["/dev/sda"], disk,
swapSize, swapSize,
... ...
}: { }: {
@ -33,7 +33,7 @@ in {
disk = { disk = {
primary = { primary = {
type = "disk"; type = "disk";
device = builtins.elemAt disks 0; device = disk;
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
@ -73,14 +73,15 @@ in {
content = { content = {
type = "btrfs"; type = "btrfs";
extraArgs = ["-f"]; extraArgs = ["-f"];
mountpoint = "/partition-root";
subvolumes = { subvolumes = {
"/nixos" = { "/rootfs" = {
mountpoint = "/"; mountpoint = "/rootfs";
mountOptions = ["compress=zstd" "noatime"]; mountOptions = ["compress=zstd"];
}; };
"/home" = { "/home" = {
mountpoint = "/home"; mountpoint = "/home";
mountOptions = ["compress=zstd" "noatime"]; mountOptions = ["compress=zstd"];
}; };
"/nix" = { "/nix" = {
mountpoint = "/nix"; mountpoint = "/nix";
@ -110,7 +111,7 @@ in {
ESP = { ESP = {
label = "EFI"; label = "EFI";
name = "ESP"; name = "ESP";
size = "512M"; size = "4G";
type = "EF00"; type = "EF00";
content = { content = {
type = "filesystem"; type = "filesystem";
@ -135,14 +136,15 @@ in {
content = { content = {
type = "btrfs"; type = "btrfs";
extraArgs = ["-f"]; extraArgs = ["-f"];
mountpoint = "/partition-root";
subvolumes = { subvolumes = {
"/root" = { "/root" = {
mountpoint = "/"; mountpoint = "/";
mountOptions = ["compress=zstd" "noatime"]; mountOptions = ["compress=zstd"];
}; };
"/home" = { "/home" = {
mountpoint = "/home"; mountpoint = "/home";
mountOptions = ["compress=zstd" "noatime"]; mountOptions = ["compress=zstd"];
}; };
"/nix" = { "/nix" = {
mountpoint = "/nix"; mountpoint = "/nix";
@ -178,7 +180,7 @@ in {
subvolumes = { subvolumes = {
"/rootfs" = { "/rootfs" = {
mountpoint = "/"; mountpoint = "/";
mountOptions = []; mountOptions = ["compress=zstd"];
}; };
"/home" = { "/home" = {
mountpoint = "/home"; mountpoint = "/home";
@ -394,7 +396,7 @@ in {
}; };
}; };
}; };
legacy = {disks ? ["/dev/vda"], ...}: { legacy = {disks, ...}: {
disko.devices = { disko.devices = {
disk = { disk = {
primary = { primary = {

2
nixos/foxtrot.nix
View file

@ -337,7 +337,7 @@ in
]; ];
# See https://wiki.hyprland.org/Configuring/Keywords/ for more # See https://wiki.hyprland.org/Configuring/Keywords/ for more
monitor = [ monitor = [
"eDP-1,2880x1920@120Hz,0x0,1.66667" "eDP-1,2880x1920@120Hz,0x0,1.5"
]; ];
}; };
}; };