back to plain attrset for disko

This commit is contained in:
Noah Masur 2023-02-25 10:02:54 -05:00
parent 80d0451ff3
commit 67af160088
2 changed files with 153 additions and 155 deletions

View File

@ -10,7 +10,6 @@ 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" ])
@ -18,6 +17,7 @@ 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,5 +1,4 @@
{ ... }: { {
disko.devices = {
disk = { disk = {
boot = { boot = {
type = "disk"; type = "disk";
@ -165,5 +164,4 @@
}; };
}; };
}; };
};
} }