From 020b53eabb9d35b2fd2613946686646cf38039b3 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 16 May 2024 01:32:23 -0400 Subject: [PATCH] big top level config --- flake.nix | 51 +++++++++---------- .../{optional => }/home-manager-config.nix | 0 modules/main.nix | 49 ++++++++++++++++++ 3 files changed, 73 insertions(+), 27 deletions(-) rename modules/{optional => }/home-manager-config.nix (100%) create mode 100644 modules/main.nix diff --git a/flake.nix b/flake.nix index e191b85..b1f6289 100644 --- a/flake.nix +++ b/flake.nix @@ -15,13 +15,10 @@ fullName = "Ari Sosnovsky"; email = "ariel@sosnovsky.ca"; }; - dataDir = "/mnt/Data"; - systemStateVersion = "23.11"; homeMangerVersion = "24.05"; - hostName = "fwbook"; in { - nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem { + nixosConfigurations."fwbook" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ nixos-hardware.nixosModules.framework-13-7040-amd @@ -29,33 +26,33 @@ (import ./hosts/fwbook.nix { user = user; }) - (import ./modules/nix/main.nix { + (import ./modules/main.nix { user = user; - systemStateVersion = systemStateVersion; - }) - (import ./modules/os/main.nix { - user = user; - hostName = hostName; - firewall = { + systemStateVersion = "23.11"; + hostName = "fwbook"; + home-manager = { enable = false; + version = homeMangerVersion; }; - enableFonts = true; - enableNetowrking = true; - enableSSH = false; - hardware = { - enable = true; + desktop = { + enable = false; + user = user; + enableKDE = true; + enableHypr = true; + enableX11 = true; + }; + os = { + enable = false; + firewall = { + enable = false; + }; + enableFonts = true; + enableNetowrking = true; + enableSSH = false; + hardware = { + enable = true; + }; }; - }) - (import ./modules/desktop/main.nix { - user = user; - enableKDE = true; - enableHypr = true; - enableX11 = true; - }) - (import ./modules/optional/home-manager-config.nix { - user = user; - hostName = hostName; - homeMangerVersion = homeMangerVersion; }) ]; }; diff --git a/modules/optional/home-manager-config.nix b/modules/home-manager-config.nix similarity index 100% rename from modules/optional/home-manager-config.nix rename to modules/home-manager-config.nix diff --git a/modules/main.nix b/modules/main.nix new file mode 100644 index 0000000..5a7b661 --- /dev/null +++ b/modules/main.nix @@ -0,0 +1,49 @@ +{ user +, systemStateVersion +, hostName + # Desktop Module +, desktop ? { + enable = false; + } + # os +, os ? { + enable = false; + } + # Home Manager +, home-manager ? { + enable = false; + } +}: +{ ... }: +{ + imports = [ + (import ./nix/main.nix { + user = user; + systemStateVersion = "23.11"; + }) + ] ++ (if desktop.enable then [ + (import ./modules/desktop/main.nix { + user = user; + enableKDE = desktop.enableKDE; + enableHypr = desktop.enableHypr; + enableX11 = desktop.enableX11; + }) + ] else [ ]) ++ (if os.enable then [ + (import ./modules/os/main.nix { + user = user; + hostName = hostName; + firewall = os.firewall; + enableFonts = os.enableFonts; + enableNetowrking = os.enableNetowrking; + enableSSH = os.enableSSH; + hardware = os.hardware; + }) + ] else [ ]) ++ (if home-manager.enable then [ + (import ./home-manager-config.nix { + user = user; + homeMangerVersion = home-manager.version; + hostName = hostName; + }) + ] else [ ]) + ; +}