From 51e0a66c44cf45c4ff4b599aa1dcf7317b0d3581 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 15 May 2024 19:04:54 -0400 Subject: [PATCH] splitting things up --- flake.nix | 1 - modules/os/main.nix | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 819993a..2915206 100644 --- a/flake.nix +++ b/flake.nix @@ -39,7 +39,6 @@ firewall = { enable = false; }; - enableCore = true; enableFonts = true; enableNetowrking = true; enableSSH = false; diff --git a/modules/os/main.nix b/modules/os/main.nix index 3c6d4b8..bd40cf4 100644 --- a/modules/os/main.nix +++ b/modules/os/main.nix @@ -1,7 +1,6 @@ { user , hostName , firewall -, enableCore ? true , enableFonts ? true , enableNetowrking ? true , enableSSH ? true @@ -11,11 +10,9 @@ }: { pkgs, ... }: { - imports = [ ] ++ (if enableCore then [ - (import ./core.nix { - user = user; - }) - ] else [ ]) ++ (if enableFonts then [ + imports = [ + ./core.nix + ] ++ (if enableFonts then [ ./fonts.nix ] else [ ]) ++ (if hardware.enable then [ ./hardware.nix