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 = {

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

@ -1,5 +1,4 @@
_: { _: {
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";
@ -35,5 +34,4 @@ _: {
]; ];
}; };
}; };
};
} }

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 = {

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

@ -1,5 +1,4 @@
_: { _: {
disko.devices = {
disk = { disk = {
nvme0 = { nvme0 = {
type = "disk"; type = "disk";
@ -128,53 +127,48 @@ _: {
mode = "mirror"; mode = "mirror";
rootFsOptions = { rootFsOptions = {
acltype = "posixacl"; acltype = "posixacl";
canmount = "off";
compression = "zstd"; compression = "zstd";
dnodesize = "auto"; dnodesize = "auto";
normalization = "formD"; normalization = "formD";
relatime = "true"; relatime = "on";
xattr = "sa"; xattr = "sa";
canmount = "off";
encryption = "on";
keyformat = "passphrase";
keylocation = "prompt";
}; };
options = { options = {
ashift = "12"; ashift = "12";
autotrim = "on"; autotrim = "on";
}; };
datasets = { datasets = {
"nixos" = { "root" = {
zfs_type = "filesystem";
options = {
canmount = "off";
encryption = "on";
keyformat = "passphrase";
keylocation = "prompt";
};
};
"nixos/root" = {
zfs_type = "filesystem"; zfs_type = "filesystem";
options.mountpoint = "legacy"; options.mountpoint = "legacy";
mountpoint = "/"; mountpoint = "/";
}; };
"root/nix" = {
"nixos/home" = {
zfs_type = "filesystem"; zfs_type = "filesystem";
options.mountpoint = "legacy"; options.mountpoint = "legacy";
mountpoint = "/home"; mountpoint = "/nix";
}; };
"nixos/var" = { "root/var" = {
zfs_type = "filesystem"; zfs_type = "filesystem";
options.mountpoint = "legacy"; options.mountpoint = "legacy";
mountpoint = "/var"; mountpoint = "/var";
}; };
"nixos/var/log" = { "root/persist" = {
zfs_type = "filesystem"; zfs_type = "filesystem";
options.mountpoint = "legacy"; options.mountpoint = "legacy";
mountpoint = "/var/log"; mountpoint = "/persist";
}; };
"nixos/var/lib" = { "root/home" = {
zfs_type = "filesystem"; zfs_type = "filesystem";
options.mountpoint = "legacy"; options.mountpoint = "legacy";
mountpoint = "/var/lib"; mountpoint = "/home";
}; };
}; };
}; };
@ -183,13 +177,12 @@ _: {
mode = "mirror"; mode = "mirror";
rootFsOptions = { rootFsOptions = {
acltype = "posixacl"; acltype = "posixacl";
canmount = "off";
compression = "lz4"; compression = "lz4";
devices = "off"; devices = "off";
normalization = "formD"; normalization = "formD";
relatime = "on"; relatime = "on";
xattr = "sa"; xattr = "sa";
mountpoint = "/boot"; canmount = "off";
}; };
options = { options = {
@ -198,7 +191,7 @@ _: {
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";
@ -206,5 +199,4 @@ _: {
}; };
}; };
}; };
};
} }

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;

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

@ -1,5 +1,4 @@
_: { _: {
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";
@ -35,5 +34,4 @@ _: {
]; ];
}; };
}; };
};
} }