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 = [
(import ./prime.nix inputs)
(import ./disko.nix inputs)
(import ./gaming.nix inputs)
];
disko.devices = import ./disko.nix;
localModules = {
DE.gnome.enable = true;
DM = {

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

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

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

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

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

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

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

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

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

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