From 30e64f888308fd3f7aca9dacb7d4ff4db6ffb7c1 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 27 Apr 2024 13:52:33 -0400 Subject: [PATCH] trying flakes --- modules/os/main.nix | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/os/main.nix b/modules/os/main.nix index 9002166..af1568e 100644 --- a/modules/os/main.nix +++ b/modules/os/main.nix @@ -14,24 +14,24 @@ { imports = [ (import ./nix.nix { - systemStateVersion = systemStateVersion - }) - ] ++ (if enableCore then [ - (import ./core.nix { - user = user; + systemStateVersion = systemStateVersion; + }) + ] ++ (if enableCore then [ + (import ./core.nix { + user = user; }) ] else [ ]) ++ (if enableFonts then [ - ./fonts.nix + ./fonts.nix ] else [ ]) ++ (if hardware.enable then [ - (import ./hardware.nix hardware) - ] else [ ]) ++ (if enableNetowrking then [ - (import ./networking.nix { - hostName = hostName; - firewall = firewall; -}) -] else [ ]) ++ (if enableSSH then [ -(import ./core.nix { -enableSSHServer = true; -}) -] else []); + (import ./hardware.nix hardware) + ] else [ ]) ++ (if enableNetowrking then [ + (import ./networking.nix { + hostName = hostName; + firewall = firewall; + }) + ] else [ ]) ++ (if enableSSH then [ + (import ./core.nix { + enableSSHServer = true; + }) + ] else [ ]); }