gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

switched mount points on gerg-desktop

Browse source
This commit is contained in:
Gerg-L 2023-03-12 02:12:51 +00:00
parent 2651f44be8
commit 2cf332631b
6 changed files with 263 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

3
systems/game-laptop/default.nix
View file

@ -7,10 +7,11 @@ inputs: {
}: { }: {
imports = [ imports = [
(import ./prime.nix inputs) (import ./prime.nix inputs)
(import ./disko.nix inputs)
(import ./gaming.nix inputs) (import ./gaming.nix inputs)
]; ];
disko.devices = import ./disko.nix;
localModules = { localModules = {
DE.gnome.enable = true; DE.gnome.enable = true;
DM = { DM = {

68
systems/game-laptop/disko.nix
View file

@ -1,39 +1,37 @@
_: { _: {
disko.devices = { disk.nvme0n1 = {
disk.nvme0n1 = { device = "/dev/disk/by-id/nvme-WDC_PC_SN530_SDBPNPZ-512G-1006_21311N802456";
device = "/dev/disk/by-id/nvme-WDC_PC_SN530_SDBPNPZ-512G-1006_21311N802456"; type = "disk";
type = "disk"; content = {
content = { type = "table";
type = "table"; format = "gpt";
format = "gpt"; partitions = [
partitions = [ {
{ type = "partition";
type = "partition"; name = "ESP";
name = "ESP"; start = "1MiB";
start = "1MiB"; end = "1GiB";
end = "1GiB"; bootable = true;
bootable = true; content = {
content = { type = "filesystem";
type = "filesystem"; format = "vfat";
format = "vfat"; mountpoint = "/boot";
mountpoint = "/boot"; };
}; }
} {
{ name = "root";
name = "root"; type = "partition";
type = "partition"; start = "1GiB";
start = "1GiB"; end = "100%";
end = "100%"; part-type = "primary";
part-type = "primary"; bootable = true;
bootable = true; content = {
content = { type = "filesystem";
type = "filesystem"; format = "ext4";
format = "ext4"; mountpoint = "/";
mountpoint = "/"; };
}; }
} ];
];
};
}; };
}; };
} }

3
systems/gerg-desktop/default.nix
View file

@ -12,9 +12,10 @@ inputs: {
(import ./spicetify.nix inputs) (import ./spicetify.nix inputs)
(import ./zfs.nix inputs) (import ./zfs.nix inputs)
(import ./containers inputs) (import ./containers inputs)
(import ./disko.nix inputs)
]; ];
disko.devices = import ./disko.nix;
system.stateVersion = "unstable"; system.stateVersion = "unstable";
localModules = { localModules = {
X11Programs = { X11Programs = {

388
systems/gerg-desktop/disko.nix
View file

@ -1,208 +1,200 @@
_: { _: {
disko.devices = { disk = {
disk = { nvme0 = {
nvme0 = { type = "disk";
type = "disk"; device = "/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N22";
device = "/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N22"; content = {
content = { type = "table";
type = "table"; format = "gpt";
format = "gpt"; partitions = [
partitions = [ {
{ name = "boot";
name = "boot"; type = "partition";
type = "partition"; start = "0";
start = "0"; end = "1M";
end = "1M"; part-type = "primary";
part-type = "primary"; flags = ["bios_grub"];
flags = ["bios_grub"]; }
} {
{ name = "ESP";
name = "ESP"; type = "partition";
type = "partition"; start = "1M";
start = "1M"; end = "1G";
end = "1G"; bootable = true;
bootable = true; content = {
content = { type = "filesystem";
type = "filesystem"; format = "vfat";
format = "vfat"; mountpoint = "/boot/efis/nvme-SHPP41-500GM_SSB4N6719101A4N22";
mountpoint = "/boot/efis/nvme-SHPP41-500GM_SSB4N6719101A4N22"; };
}; }
} {
{ name = "zfsboot";
name = "zfsboot"; type = "partition";
type = "partition"; start = "1G";
start = "1G"; end = "5G";
end = "5G"; content = {
content = { type = "zfs";
type = "zfs"; pool = "bpool";
pool = "bpool"; };
}; }
} {
{ name = "swap";
name = "swap"; type = "partition";
type = "partition"; start = "5G";
start = "5G"; end = "21G";
end = "21G"; content = {
content = { type = "swap";
type = "swap"; randomEncryption = true;
randomEncryption = true; };
}; }
} {
{ name = "zfsroot";
name = "zfsroot"; type = "partition";
type = "partition"; start = "21G";
start = "21G"; end = "100%";
end = "100%"; content = {
content = { type = "zfs";
type = "zfs"; pool = "rpool";
pool = "rpool"; };
}; }
} ];
];
};
}; };
nvme1 = { };
type = "disk"; nvme1 = {
device = "/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N0E"; type = "disk";
content = { device = "/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N0E";
type = "table"; content = {
format = "gpt"; type = "table";
partitions = [ format = "gpt";
{ partitions = [
name = "BIOS"; {
type = "partition"; name = "BIOS";
start = "0"; type = "partition";
end = "1M"; start = "0";
part-type = "primary"; end = "1M";
flags = ["bios_grub"]; part-type = "primary";
} flags = ["bios_grub"];
{ }
name = "ESP"; {
type = "partition"; name = "ESP";
start = "1M"; type = "partition";
end = "1G"; start = "1M";
bootable = true; end = "1G";
content = { bootable = true;
type = "filesystem"; content = {
format = "vfat"; type = "filesystem";
mountpoint = "/boot/efis/nvme-SHPP41-500GM_SSB4N6719101A4N0E"; format = "vfat";
}; mountpoint = "/boot/efis/nvme-SHPP41-500GM_SSB4N6719101A4N0E";
} };
{ }
name = "zfsboot"; {
type = "partition"; name = "zfsboot";
start = "1G"; type = "partition";
end = "5G"; start = "1G";
content = { end = "5G";
type = "zfs"; content = {
pool = "bpool"; type = "zfs";
}; pool = "bpool";
} };
{ }
name = "swap"; {
type = "partition"; name = "swap";
start = "5G"; type = "partition";
end = "21G"; start = "5G";
content = { end = "21G";
type = "swap"; content = {
randomEncryption = true; type = "swap";
}; randomEncryption = true;
} };
{ }
name = "zfsroot"; {
type = "partition"; name = "zfsroot";
start = "21G"; type = "partition";
end = "100%"; start = "21G";
content = { end = "100%";
type = "zfs"; content = {
pool = "rpool"; type = "zfs";
}; pool = "rpool";
} };
]; }
];
};
};
};
zpool = {
rpool = {
type = "zpool";
mode = "mirror";
rootFsOptions = {
acltype = "posixacl";
compression = "zstd";
dnodesize = "auto";
normalization = "formD";
relatime = "on";
xattr = "sa";
canmount = "off";
encryption = "on";
keyformat = "passphrase";
keylocation = "prompt";
};
options = {
ashift = "12";
autotrim = "on";
};
datasets = {
"root" = {
zfs_type = "filesystem";
options.mountpoint = "legacy";
mountpoint = "/";
};
"root/nix" = {
zfs_type = "filesystem";
options.mountpoint = "legacy";
mountpoint = "/nix";
};
"root/var" = {
zfs_type = "filesystem";
options.mountpoint = "legacy";
mountpoint = "/var";
};
"root/persist" = {
zfs_type = "filesystem";
options.mountpoint = "legacy";
mountpoint = "/persist";
};
"root/home" = {
zfs_type = "filesystem";
options.mountpoint = "legacy";
mountpoint = "/home";
}; };
}; };
}; };
zpool = { bpool = {
rpool = { type = "zpool";
type = "zpool"; mode = "mirror";
mode = "mirror"; rootFsOptions = {
rootFsOptions = { acltype = "posixacl";
acltype = "posixacl"; compression = "lz4";
canmount = "off"; devices = "off";
compression = "zstd"; normalization = "formD";
dnodesize = "auto"; relatime = "on";
normalization = "formD"; xattr = "sa";
relatime = "true"; canmount = "off";
xattr = "sa";
};
options = {
ashift = "12";
autotrim = "on";
};
datasets = {
"nixos" = {
zfs_type = "filesystem";
options = {
canmount = "off";
encryption = "on";
keyformat = "passphrase";
keylocation = "prompt";
};
};
"nixos/root" = {
zfs_type = "filesystem";
options.mountpoint = "legacy";
mountpoint = "/";
};
"nixos/home" = {
zfs_type = "filesystem";
options.mountpoint = "legacy";
mountpoint = "/home";
};
"nixos/var" = {
zfs_type = "filesystem";
options.mountpoint = "legacy";
mountpoint = "/var";
};
"nixos/var/log" = {
zfs_type = "filesystem";
options.mountpoint = "legacy";
mountpoint = "/var/log";
};
"nixos/var/lib" = {
zfs_type = "filesystem";
options.mountpoint = "legacy";
mountpoint = "/var/lib";
};
};
}; };
bpool = {
type = "zpool";
mode = "mirror";
rootFsOptions = {
acltype = "posixacl";
canmount = "off";
compression = "lz4";
devices = "off";
normalization = "formD";
relatime = "on";
xattr = "sa";
mountpoint = "/boot";
};
options = { options = {
compatibility = "grub2"; compatibility = "grub2";
ashift = "12"; ashift = "12";
autotrim = "on"; autotrim = "on";
}; };
datasets = { datasets = {
"nixos/root" = { "boot" = {
zfs_type = "filesystem"; zfs_type = "filesystem";
options.mountpoint = "legacy"; options.mountpoint = "legacy";
mountpoint = "/boot"; mountpoint = "/boot";
};
}; };
}; };
}; };

4
systems/moms-laptop/default.nix
View file

@ -6,8 +6,10 @@ inputs: {
}: { }: {
imports = [ imports = [
(import ./printing.nix inputs) (import ./printing.nix inputs)
(import ./disko.nix inputs)
]; ];
disko.devices = import ./disko.nix;
localModules = { localModules = {
DM = { DM = {
lightdm.enable = true; lightdm.enable = true;

68
systems/moms-laptop/disko.nix
View file

@ -1,39 +1,37 @@
_: { _: {
disko.devices = { disk.sda = {
disk.sda = { device = "/dev/disk/by-id/ata-WDC_WDS240G2G0A-00JH30_180936803144";
device = "/dev/disk/by-id/ata-WDC_WDS240G2G0A-00JH30_180936803144"; type = "disk";
type = "disk"; content = {
content = { type = "table";
type = "table"; format = "gpt";
format = "gpt"; partitions = [
partitions = [ {
{ type = "partition";
type = "partition"; name = "ESP";
name = "ESP"; start = "1MiB";
start = "1MiB"; end = "1GiB";
end = "1GiB"; bootable = true;
bootable = true; content = {
content = { type = "filesystem";
type = "filesystem"; format = "vfat";
format = "vfat"; mountpoint = "/boot";
mountpoint = "/boot"; };
}; }
} {
{ name = "root";
name = "root"; type = "partition";
type = "partition"; start = "1GiB";
start = "1GiB"; end = "100%";
end = "100%"; part-type = "primary";
part-type = "primary"; bootable = true;
bootable = true; content = {
content = { type = "filesystem";
type = "filesystem"; format = "ext4";
format = "ext4"; mountpoint = "/";
mountpoint = "/"; };
}; }
} ];
];
};
}; };
}; };
} }