diff --git a/flake.lock b/flake.lock
index a4c18ad..1a6f95b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -74,11 +74,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1745503349,
-        "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
+        "lastModified": 1745955289,
+        "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
+        "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b",
         "type": "github"
       },
       "original": {
@@ -90,11 +90,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1745526057,
-        "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
+        "lastModified": 1745930157,
+        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
+        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
         "type": "github"
       },
       "original": {
@@ -106,11 +106,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745742390,
-        "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=",
+        "lastModified": 1745921652,
+        "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "26245db0cb552047418cfcef9a25da91b222d6c7",
+        "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3",
         "type": "github"
       },
       "original": {
diff --git a/hostHelper.nix b/hostHelper.nix
index 500d93b..b6e7363 100644
--- a/hostHelper.nix
+++ b/hostHelper.nix
@@ -1,9 +1,9 @@
-inArgs: hostname: {
-  ${hostname} = inArgs.nixpkgs.lib.nixosSystem {
+inArgs: hostname: #{
+  #${hostname} = inArgs.nixpkgs.lib.nixosSystem {
+  inArgs.nixpkgs.lib.nixosSystem {
     specialArgs = {inherit inArgs;};
     modules = [
       {networking.hostName = hostname;}
       (./hosts/${hostname})
     ];
-  };
-}
+  }
diff --git a/hosts/crocoite/default.nix b/hosts/crocoite/default.nix
index 1929622..4c9d95e 100644
--- a/hosts/crocoite/default.nix
+++ b/hosts/crocoite/default.nix
@@ -5,8 +5,6 @@
   nixos-unstable,
   ...
 }: {
-  #networking.hostName = "crocoite"; # Define your hostname.
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
@@ -34,9 +32,9 @@
       #   });
       # })
     ];
+
     # Configure your nixpkgs instance
     config = {
-      # Disable if you don't want unfree packages
       allowUnfree = true;
     };
   };
diff --git a/modules/software/default.nix b/modules/software/default.nix
index 792d1b1..2ffa239 100644
--- a/modules/software/default.nix
+++ b/modules/software/default.nix
@@ -10,7 +10,6 @@
     ./obs-studio.nix
     ./packages.nix
     ./programs.nix
-    ./shell.nix
     ./virt.nix
   ];
 }
diff --git a/modules/software/shells/default.nix b/modules/software/shells/default.nix
index 1991480..c042f4d 100644
--- a/modules/software/shells/default.nix
+++ b/modules/software/shells/default.nix
@@ -1,6 +1,7 @@
 {
   imports = [
-    ./zsh.nix
     ./fish.nix
+    ./shell.nix
+    ./zsh.nix
   ];
 }
diff --git a/modules/software/shells/fish.nix b/modules/software/shells/fish.nix
index b3bb8cd..1d8a994 100644
--- a/modules/software/shells/fish.nix
+++ b/modules/software/shells/fish.nix
@@ -11,5 +11,4 @@
     direnv.enableFishIntegration = true;
     foot.enableFishIntegration = true;
   };
-  environment.systemPackages = [pkgs.starship];
 }
diff --git a/modules/software/shell.nix b/modules/software/shells/shell.nix
similarity index 100%
rename from modules/software/shell.nix
rename to modules/software/shells/shell.nix
diff --git a/outputs.nix b/outputs.nix
index 54c4152..cbfd731 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -9,15 +9,17 @@ inArgs: let
   # pass to it, with each system as an argument
   forAllSystems = inArgs.nixpkgs.lib.genAttrs systems;
 
+  lib = inArgs.nixpkgs.lib;
+
   hostHelper = import ./hostHelper.nix inArgs;
 
 in {
   # NixOS configuration entrypoint
   # Available through 'nixos-rebuild --flake .#your-hostname'
   # to add more append // (host_helper example);
-
-  nixosConfigurations =
-    (hostHelper "crocoite"); #// (host_helper2 "jitsi");
+  nixosConfigurations = builtins.mapAttrs (name: options: (hostHelper name)) {
+    crocoite = {};
+  };
 
   # Your custom packages
   # Accessible through 'nix build', 'nix shell', etc
@@ -33,4 +35,6 @@ in {
   # Formatter for your nix files, available through 'nix fmt'
   # Other options beside 'alejandra' include 'nixpkgs-fmt'
   formatter = forAllSystems (system: inArgs.nixpkgs.legacyPackages.${system}.alejandra);
+
+  #checks = forAllSystems (system: inArgs(hostHelper "crocoite").system.build.toplevel);
 }