From 3dd7fa12b01e6a0a9828244a76cdbc95b5c4e05a Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Sat, 25 Feb 2023 09:55:57 -0500 Subject: [PATCH] don't make disks.nix proper nixos module --- hosts/swan/default.nix | 3 +-- hosts/swan/disks.nix | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hosts/swan/default.nix b/hosts/swan/default.nix index ba632f0..170c795 100644 --- a/hosts/swan/default.nix +++ b/hosts/swan/default.nix @@ -10,10 +10,9 @@ nixpkgs.lib.nixosSystem { specialArgs = { }; modules = [ ./hardware-configuration.nix - ./disks.nix ../../modules/common ../../modules/nixos - (removeAttrs globals [ "mail.server" ]) + (import ./disks.nix) wsl.nixosModules.wsl home-manager.nixosModules.home-manager disko.nixosModules.disko diff --git a/hosts/swan/disks.nix b/hosts/swan/disks.nix index b12d919..3658b3f 100644 --- a/hosts/swan/disks.nix +++ b/hosts/swan/disks.nix @@ -1,4 +1,4 @@ -{ ... }: { +{ disko.devices = { disk = { boot = {