diff --git a/systems/common/core/default.nix b/systems/common/core/default.nix
index 4775926..108c412 100644
--- a/systems/common/core/default.nix
+++ b/systems/common/core/default.nix
@@ -1,7 +1,25 @@
-{
-    imports = [
-    ./time_locale.nix
-    ./xorg_plasma.nix
-    ./console.nix
-    ];
+{ inputs, outputs, configLib, ... }: {
+  imports = (configLib.scanPaths ./.)
+    ++ [ inputs.home-manager.nixosModules.home-manager ]
+    ++ (builtins.attrValues outputs.nixosModules);
+
+  #TODO:yubikey-> services.yubikey-agent.enable = true;
+
+  security.sudo.extraConfig = ''
+    Defaults timestamp_timeout=120 # only ask for password every 2h
+    # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic.
+    # Defaults env_keep + =SSH_AUTH_SOCK
+  '';
+
+  home-manager.extraSpecialArgs = { inherit inputs outputs; };
+
+  nixpkgs = {
+    # you can add global overlays here
+    overlays = builtins.attrValues outputs.overlays;
+    config = {
+      allowUnfree = true;
+    };
+  };
+
+  hardware.enableRedistributableFirmware = true;
 }