back to disko module once again

This commit is contained in:
Noah Masur 2023-02-25 10:22:24 -05:00
parent 67af160088
commit b1b5e77f47
2 changed files with 165 additions and 163 deletions

View File

@ -10,6 +10,7 @@ nixpkgs.lib.nixosSystem {
specialArgs = { }; specialArgs = { };
modules = [ modules = [
./hardware-configuration.nix ./hardware-configuration.nix
./disks.nix
../../modules/common ../../modules/common
../../modules/nixos ../../modules/nixos
(removeAttrs globals [ "mail.server" ]) (removeAttrs globals [ "mail.server" ])
@ -17,7 +18,6 @@ nixpkgs.lib.nixosSystem {
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
disko.nixosModules.disko disko.nixosModules.disko
{ {
disko.devices = import ./disks.nix;
server = true; server = true;
gui.enable = false; gui.enable = false;
theme = { colors = (import ../../colorscheme/gruvbox).dark; }; theme = { colors = (import ../../colorscheme/gruvbox).dark; };

View File

@ -1,4 +1,5 @@
{ { ... }: {
disko.devices = {
disk = { disk = {
boot = { boot = {
type = "disk"; type = "disk";
@ -98,14 +99,14 @@
rootFsOptions = { rootFsOptions = {
compression = "on"; # lz4 by default compression = "on"; # lz4 by default
"com.sun:auto-snapshot" = "false"; "com.sun:auto-snapshot" = "false";
ashift = 12; ashift = "12";
}; };
# mountpoint = "/"; # mountpoint = "/";
datasets = { datasets = {
media = { media = {
zfs_type = "filesystem"; zfs_type = "filesystem";
mountpoint = "none"; mountpoint = "/media";
options."com.sun:auto-snapshot" = "false"; options."com.sun:auto-snapshot" = "false";
}; };
# "media/movies" = { # "media/movies" = {
@ -164,4 +165,5 @@
}; };
}; };
}; };
};
} }