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