From 31c09af227ee2c0994b491512f21fbd33ba1f141 Mon Sep 17 00:00:00 2001
From: panotaka <panotaka@additionalpenguin.com>
Date: Fri, 22 Dec 2023 22:28:10 -0400
Subject: [PATCH] Reorganized flake.nix

---
 devenv.nix |  2 +-
 flake.nix  | 23 ++++++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/devenv.nix b/devenv.nix
index 70cb40f..39fc9bf 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -4,5 +4,5 @@
     deadnix.enable = true;
   };
 
-  packages = with pkgs; [nixpkgs-fmt nixfmt];
+  packages = with pkgs; [nixpkgs-fmt nixfmt alejandra deadnix];
 }
diff --git a/flake.nix b/flake.nix
index b76ee61..acf1d91 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,18 +29,24 @@
   in {
     nixosConfigurations = {
       Equinox = nixpkgs.lib.nixosSystem {
+        # System
         system = "x86_64-linux";
         specialArgs = {
           inherit inputs;
           inherit system;
         };
+
+        # Modules
         modules = [
-          # Theme
+          # Theme Modules
           stylix.nixosModules.stylix
           ./themes/targets/all.nix
           ./themes/sandstone-forest
 
+          # Host Module
           ./hosts/Equinox
+
+          # Home Manager Modules
           home-manager.nixosModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
@@ -49,7 +55,6 @@
               inherit inputs;
               inherit system;
             };
-
             home-manager.users.panotaka = {
               imports = [./home ./home/shell ./home/desktop];
             };
@@ -58,13 +63,24 @@
       };
 
       Blackbird = nixpkgs.lib.nixosSystem {
+        # System
         system = "x86_64-linux";
         specialArgs = {
           inherit inputs;
           inherit system;
         };
+
+        # Modules
         modules = [
+          # Theme Modules
+          stylix.nixosModules.stylix
+          ./themes/targets/all.nix
+          ./themes/spaceduck
+
+          # Host Module
           ./hosts/Blackbird
+
+          # Home Manager Modules
           home-manager.nixosModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
@@ -78,9 +94,6 @@
               imports = [./home ./home/shell ./home/desktop];
             };
           }
-          stylix.nixosModules.stylix
-          ./themes/targets/all.nix
-          ./themes/spaceduck
         ];
       };
     };