diff --git a/flake.nix b/flake.nix
index 00d8434..af54c0d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,7 @@
     nixosConfigurations.default = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        ./configuration.nix
+        ./hosts/default/configuration.nix
         nvf.nixosModules.default
         home-manager.nixosModules.home-manager
         {
diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
new file mode 100644
index 0000000..9d048c1
--- /dev/null
+++ b/hosts/default/configuration.nix
@@ -0,0 +1,60 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    ./hardware-configuration.nix
+    ./modules/system/nix/default.nix
+  ];
+
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+      permittedInsecurePackages = [
+        "freeimage-unstable-2021-11-01"
+      ];
+    };
+  };
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+
+  systemd = {
+    services = {
+      modem-manager.enable = false;
+      mpd.environment = {
+        XDG_RUNTIME_DIR = "/run/user/1000";
+      };
+    };
+  };
+  
+  time.timeZone = "Europe/Berlin";
+  console = {
+    font = "Lat2-Terminus16";
+    useXkbConfig = true;
+  };
+
+  xdg.portal = {
+    enable = false;
+    extraPortals = [
+      pkgs.xdg-desktop-portal-gtk
+    ];
+  };
+
+  programs = {
+    nix-ld.enable = true;
+    fish.enable = true;
+  };
+
+  environment.etc = {
+    "makepkg.conf".source = "${pkgs.pacman}/etc/makepkg.conf";
+    "pacman.conf".source = ./modules/system/raw/pacman.conf;
+  };
+
+  system.stateVersion = "unstable";
+
+}