diff --git a/nixos/base.nix b/nixos/base.nix
index aaecff2..1e22414 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -24,6 +24,10 @@
     };
   };
 
+  # This will add each flake input as a registry
+  # To make nix commands consistent with your flake
+  nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
+
   # Enable flakes and garbage collection
   nix = {
     settings = {
@@ -35,10 +39,8 @@
     gc = {
       automatic = true;
       dates = "weekly";
-      options = "--delete-older-than 1w"
+      options = "--delete-older-than 1w";
     };
-    # You can also manually optimize the store via nix-store --optimise
-    settings.auto-optimise-store = true;
   };
 
   # Set timezone
diff --git a/nixos/modules/legacy.nix b/nixos/modules/legacy.nix
index e66cfa8..98f1105 100644
--- a/nixos/modules/legacy.nix
+++ b/nixos/modules/legacy.nix
@@ -1,4 +1,4 @@
-{
+{config, inputs, lib, ...}: {
   # This will add each flake input as a registry
   # To make nix commands consistent with your flake
   nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);