diff --git a/flake.nix b/flake.nix
index 57d971cf..88199a3a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,6 @@
 { 
-
   # INFORMATION
   # When building for a system, remember to change the hostname variable below
-
   description = "NixOS System Config";
 
   inputs = {
@@ -48,31 +46,22 @@
       ${hostname} = lib.nixosSystem { 
         inherit system;
         modules = [
-          # Hardware Configuration
-          ./hosts/${hostname}/hardware-configuration.nix
+          # Configuration Imports
+          ./hosts/${hostname}/hardware-configuration.nix # Hardware Configuration
+          ./hosts/${hostname}/configuration.nix          # Extra options for the host hardware configuration
+          ./configuration.nix                            # Common NixOS Configuration
 
-          # Extra options for the host hardware configuration
-          ./hosts/${hostname}/configuration.nix
+          # Flake Imports
+          sops-nix.nixosModules.sops          # Handle secrets
+          lanzaboote.nixosModules.lanzaboote  # SecureBoot Configuration
+          nur.nixosModules.nur                # NixOS User Repository
 
-          # Common NixOS Configuration file
-          ./configuration.nix
-
-          # SecureBoot Configuration
-          lanzaboote.nixosModules.lanzaboote
-
-          # Import NUR
-          nur.nixosModules.nur
-
-          # Import agenix
-          agenix.nixosModules.default
-
-          # Tell home-manager to use both global and user packages:
+          # Home Manager settings
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.albert = import ./users/albert/home.nix;
             home-manager.users.root = import ./users/root/home.nix;
-            # nixpkgs overlays
             nixpkgs.overlays = [
               moz_overlay.overlay
               nur.overlay