From 0fd8411d36c1ef4c35fe8863d389ba44c8a8d257 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 22 Jun 2023 05:36:07 -0400 Subject: [PATCH] meta: Use default.nix Makes things simpler. --- default.nix | 15 +++++++++++++++ flake.nix | 7 ++----- specializations/default.nix | 6 ++++++ src/main.nix | 4 ---- 4 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 default.nix create mode 100644 specializations/default.nix diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..10a64bb --- /dev/null +++ b/default.nix @@ -0,0 +1,15 @@ +{ home-manager, stylix, nix-gaming, ... }: + +{ + imports = [ + home-manager.nixosModules.home-manager + stylix.nixosModules.stylix + nix-gaming.nixosModules.pipewireLowLatency + ./containers + ./home + ./modules + ./overlays + ./specializations + ./src/main.nix + ]; +} diff --git a/flake.nix b/flake.nix index abd87d8..5f4133c 100644 --- a/flake.nix +++ b/flake.nix @@ -22,15 +22,12 @@ }; }; - outputs = { self, nixpkgs, home-manager, stylix, nix-gaming, ... } @ attrs: let VARIABLES = import ./src/variables.nix; in { + outputs = { self, nixpkgs, ... } @ attrs: let VARIABLES = import ./src/variables.nix; in { nixosConfigurations."${VARIABLES.hostname}" = nixpkgs.lib.nixosSystem { system = VARIABLES.system; specialArgs = attrs; modules = [ - home-manager.nixosModules.home-manager - stylix.nixosModules.stylix - nix-gaming.nixosModules.pipewireLowLatency - ./src/main.nix + ./. ]; }; }; diff --git a/specializations/default.nix b/specializations/default.nix new file mode 100644 index 0000000..35612ae --- /dev/null +++ b/specializations/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./gnome.nix + ./plasma.nix + ]; +} diff --git a/src/main.nix b/src/main.nix index ba6b7c3..28d12e8 100644 --- a/src/main.nix +++ b/src/main.nix @@ -8,10 +8,6 @@ let VARIABLES = import ./variables.nix; in { imports = [ "${VARIABLES.hostHardwareConfiguration}" - ../overlays - ../modules - ../home - ../containers ]; hardware.opengl.driSupport32Bit = true;