diff --git a/base/callisto/default.nix b/base/callisto/default.nix
index 1749f88..80ec456 100644
--- a/base/callisto/default.nix
+++ b/base/callisto/default.nix
@@ -3,9 +3,9 @@
     ./configuration.nix
     ../overrides.nix
     ../ssh.nix
-    ../firewall.nix
+#    ../firewall.nix
     ../substituters.nix
     ../fonts.nix
-    ../udev.nix
+#    ../udev.nix
   ];
 }
diff --git a/flake.nix b/flake.nix
index b8ef19b..a4c6c84 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,6 +41,27 @@
         }
       ];
     };
+    nixosConfigurations."adventurer" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        ./base/adventurer
+        home-manager.nixosModules.home-manager {
+          home-manager.extraSpecialArgs = {
+            inherit inputs;
+            vars = {
+              isNixOS = true;
+              isTough = false;
+              class = "lowspec";
+              user = "maya";
+              useSyncthing = true;
+            };
+          };
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.users.maya = ./home;
+        }
+      ];
+    };
     nixosConfigurations."apollo" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
@@ -63,5 +84,114 @@
         }
       ];
     };
+    nixosConfigurations."callisto" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        ./base/callisto
+        home-manager.nixosModules.home-manager {
+          home-manager.extraSpecialArgs = {
+            inherit inputs;
+            vars = {
+              isNixOS = true;
+              isTough = false;
+              class = "desktop";
+              user = "maya";
+              useSyncthing = true;
+            };
+          };
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.users.maya = ./home;
+        }
+      ];
+    };
+    nixosConfigurations."hassie" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        ./base/Katara
+        home-manager.nixosModules.home-manager {
+          #imports = [ inputs.nix-index-database.hmModules.nix-index ];
+          home-manager.backupFileExtension = "hm-backup";
+          home-manager.extraSpecialArgs = {
+            inherit inputs;
+            vars = {
+              isNixOS = true;
+              isTough = true;
+              class = "laptop";
+              user = "alyx"; #cursed way of setting username
+            };
+          };
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.users.alyx = ./home;
+        }
+      ];
+    };
+    nixosConfigurations."hypermac" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        ./base/hypermac
+        home-manager.nixosModules.home-manager {
+          home-manager.extraSpecialArgs = {
+            inherit inputs;
+            vars = {
+              isNixOS = true;
+              class = "lowspec";
+              user = "maya";
+              useSyncthing = true;
+            };
+          };
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.users.maya = ./home;
+        }
+      ];
+    };
+    nixosConfigurations."patio" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        ./base/Ishima
+        nixpkgs-xr.nixosModules.nixpkgs-xr
+        jovian.nixosModules.jovian
+        home-manager.nixosModules.home-manager {
+          home-manager.backupFileExtension = "hm-backup";
+          #imports = [ inputs.nix-index-database.hmModules.nix-index ];
+          home-manager.extraSpecialArgs = {
+            inherit inputs;
+            vars = {
+              isNixOS = true;
+              isTough = false;
+              class = "handheld";
+              user = "alyx"; #cursed way of setting username
+            };
+          };
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.users.alyx = ./home;
+        }
+      ];
+    };
+    nixosConfigurations."Umbriel" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        ./base/Umbriel
+        home-manager.nixosModules.home-manager {
+          #imports = [ inputs.nix-index-database.hmModules.nix-index ];
+          home-manager.backupFileExtension = "hm-backup";
+          home-manager.extraSpecialArgs = {
+            inherit inputs;
+            vars = {
+              isNixOS = true;
+              isTough = false;
+              class = "laptop";
+              user = "alyx"; #cursed way of setting username
+            };
+          };
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.users.alyx = ./home;
+        }
+      ];
+    };
   };
-}  
+}