diff --git a/modules/common/nix.nix b/modules/common/nix.nix
index 37955d8..0963114 100644
--- a/modules/common/nix.nix
+++ b/modules/common/nix.nix
@@ -1,16 +1,24 @@
-{pkgs, ...}: {
+{pkgs, lib, inputs, config, ...}: {
   environment.systemPackages = with pkgs; [
-    git
     nix-output-monitor
   ];
-  nix = {
-    settings.experimental-features = [ "nix-command" "flakes" ];
+  programs.git.enable = true;
+  nix = let
+    flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
+  in {
+    settings = {
+      experimental-features = [ "nix-command" "flakes" ];
+      flake-registry = "";
+      nix-path = config.nix.nixPath;
+    };
     gc = {
       automatic = true;
       options = "--delete-older-than 30d";
       dates = "weekly";
     };
     optimise.automatic = true;
+    registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs;
+    nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
   };
   system.autoUpgrade = {
     enable = true;