diff --git a/flake.nix b/flake.nix
index e0166c1..8b331b2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,28 +39,40 @@
     # stable inputs
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
 
-    home-manager.url = "github:nix-community/home-manager/release-24.11";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager = {
+      url = "github:nix-community/home-manager/release-24.11";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # unstable inputs
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    home-manager-unstable.url = "github:nix-community/home-manager";
-    home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable";
+    home-manager-unstable = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
 
-    disko.url = "github:nix-community/disko/master";
-    disko.inputs.nixpkgs.follows = "nixpkgs";
+    disko = {
+      url = "github:nix-community/disko/master";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    sops-nix.url = "github:Mic92/sops-nix";
-    sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
+    sops-nix = {
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
 
-    git-hooks.url = "github:cachix/git-hooks.nix";
-    git-hooks.inputs.nixpkgs.follows = "nixpkgs-unstable";
+    git-hooks = {
+      url = "github:cachix/git-hooks.nix";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
 
-    slippi.url = "github:lytedev/slippi-nix";
-    # slippi.url = "git+file:///home/daniel/code/open-source/slippi-nix"; # used during flake development
-    slippi.inputs.nixpkgs.follows = "nixpkgs-unstable";
-    slippi.inputs.home-manager.follows = "home-manager-unstable";
+    slippi = {
+      url = "github:lytedev/slippi-nix";
+      # url = "git+file:///home/daniel/code/open-source/slippi-nix"; # used during flake development
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      inputs.home-manager.follows = "home-manager-unstable";
+    };
 
     jovian.url = "github:Jovian-Experiments/Jovian-NixOS/development";
     # jovian.inputs.nixpkgs.follows = "nixpkgs-unstable";
diff --git a/lib/modules/nixos/default-module.nix b/lib/modules/nixos/default-module.nix
index 76264f4..4b9db3a 100644
--- a/lib/modules/nixos/default-module.nix
+++ b/lib/modules/nixos/default-module.nix
@@ -111,28 +111,8 @@
         trusted-users = [
           "@wheel"
         ];
-        extra-experimental-features = [
-          "nix-command"
-          "flakes"
-        ];
         auto-optimise-store = lib.mkDefault true;
-        extra-substituters = [
-          "https://cache.nixos.org/"
-          "https://nix-community.cachix.org"
-          "https://nix.h.lyte.dev"
-
-          "https://helix.cachix.org"
-          "https://ghostty.cachix.org"
-        ];
-        extra-trusted-public-keys = [
-          "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-          "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-          "h.lyte.dev-2:te9xK/GcWPA/5aXav8+e5RHImKYMug8hIIbhHsKPN0M="
-
-          "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
-          "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns="
-        ];
-      };
+      } // ((import ../../../flake.nix).nixConfig);
     };
 
     sops = {