From 037e4c699eca17b08e9d92ddfba20906652c8baf Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 2 Nov 2021 15:48:46 -0400 Subject: [PATCH] hosts/Infini-DESKTOP: redo imports --- hosts/Infini-DESKTOP/default.nix | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/hosts/Infini-DESKTOP/default.nix b/hosts/Infini-DESKTOP/default.nix index 9b17cc7..b6f10dd 100644 --- a/hosts/Infini-DESKTOP/default.nix +++ b/hosts/Infini-DESKTOP/default.nix @@ -1,16 +1,25 @@ { suites, profiles, pkgs, lib, ... }: { - imports = lib.our.flattenListSet { - suites = with suites; [ graphic develop ]; - imports = [ ./hardware-configuration.nix ]; - profiles = with profiles; [ + imports = lib.lists.flatten [ + (with suites; [ + graphic + develop + ]) + + (with profiles; [ boot.systemd-boot networking.wireless - hardware.sound - hardware.gpu.nvidia - # peripherals.printing - ]; - }; + + (with hardware; [ + sound + gpu.nvidia + ]) + + btrfs + ]) + + ./hardware-configuration.nix + ]; system.stateVersion = "21.05";