diff --git a/modules/default.nix b/modules/default.nix
index 9808457..58a4da2 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,9 +1,31 @@
-{ self, inputs, ... }: {
+{
+  self,
+  inputs,
+  ...
+}:
+let
+  mods = with self.nixosModules; [
+    user
+    packages
+    agenix
+    boot
+    core
+    easyroam
+    /etc/nixos/hardware-configuration.nix
+  ];
+in
+{
   flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem {
-    modules = with self.nixosModules; [
-      user
-      packages
-      /etc/nixos/hardware-configuration.nix
-    ];
+    modules =
+      with self.nixosModules;
+      [
+        {
+          config.dualBoot = true;
+        }
+      ]
+      ++ mods;
+  };
+  flake.nixosConfigurations.seele = inputs.nixpkgs.lib.nixosSystem {
+    modules = mods;
   };
 }
diff --git a/modules/home/default.nix b/modules/home/default.nix
new file mode 100644
index 0000000..14fcd00
--- /dev/null
+++ b/modules/home/default.nix
@@ -0,0 +1,5 @@
+{...}: {
+  flake.homeModules.lucy = {
+    
+  };
+}
diff --git a/modules/result b/modules/result
new file mode 120000
index 0000000..6c508aa
--- /dev/null
+++ b/modules/result
@@ -0,0 +1 @@
+/nix/store/5jpn9svda3qw6mnzk9gbkzb4q7lg4vdw-nixos-system-nixos-26.05.20261015.26f4107
\ No newline at end of file
diff --git a/modules/services/easyroam.nix b/modules/services/easyroam.nix
new file mode 100644
index 0000000..0583bc5
--- /dev/null
+++ b/modules/services/easyroam.nix
@@ -0,0 +1,16 @@
+{ inputs, ... }: {
+  flake.nixosModules.easyroam = { config, ... }: {
+    imports = [
+      inputs.nix-easyroam.nixosModules.nix-easyroam
+    ];
+    services.easyroam = {
+      enable = true;
+      pkcsFile = config.age.secrets.easyroam.path;
+      networkmanager.enable = true;
+    };
+    systemd.services.wpa_supplicant = {
+      wants = [ "easyroam-cert-setup.service" ];
+      after = [ "easyroam-cert-setup.service" ];
+    };
+  };
+}
diff --git a/modules/services/pipewire.nix b/modules/services/pipewire.nix
new file mode 100644
index 0000000..a026ef5
--- /dev/null
+++ b/modules/services/pipewire.nix
@@ -0,0 +1,10 @@
+{ ... }: {
+  flake.nixosModules.pipewire = {
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+    };
+  };
+}
diff --git a/modules/services/tlp.nix b/modules/services/tlp.nix
new file mode 100644
index 0000000..814305a
--- /dev/null
+++ b/modules/services/tlp.nix
@@ -0,0 +1,8 @@
+{ ... }: {
+  flake.nixosModules.tlp = {
+    services.tlp = {
+      enable = true;
+      pd.enable = true;
+    };
+  };
+}
diff --git a/modules/system/agenix/agenix.nix b/modules/system/agenix/agenix.nix
index c153b55..00e7b55 100644
--- a/modules/system/agenix/agenix.nix
+++ b/modules/system/agenix/agenix.nix
@@ -1,5 +1,8 @@
-{ ... }: {
-  flake.nixosModules = {
+{inputs, ... }: {
+  flake.nixosModules.agenix = {config, ...}: {
+    imports = [
+      inputs.agenix.nixosModules.default
+    ];
     age = {
       enable = true;
       identityPaths = [ "/var/lib/misc/key.age" ];
diff --git a/modules/system/core/boot.nix b/modules/system/core/boot.nix
new file mode 100644
index 0000000..35e0e3d
--- /dev/null
+++ b/modules/system/core/boot.nix
@@ -0,0 +1,22 @@
+{ lib, config, ... }: {
+  flake.nixosModules.boot = { config, ... }: {
+    options = {
+      dualBoot = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "wether to enable windows boot entry to limine or not";
+      };
+    };
+    config.boot.loader = {
+      efi.canTouchEfiVariables = true;
+      limine = {
+        enable = true;
+        extraEntries = lib.mkIf config.dualBoot ''
+          /Windows 11
+           protocol: efi_boot_entry
+           entry: Windows Boot Manager
+        '';
+      };
+    };
+  };
+}
diff --git a/modules/system/core/core.nix b/modules/system/core/core.nix
new file mode 100644
index 0000000..5fc22ca
--- /dev/null
+++ b/modules/system/core/core.nix
@@ -0,0 +1,26 @@
+{ ... }: {
+  flake.nixosModules.core = {
+    time.timeZone = "Europe/Berlin";
+    i18n.defaultLocale = "en_US.UTF-8";
+    i18n.extraLocaleSettings = {
+      LC_ADDRESS = "de_DE.UTF-8";
+      LC_IDENTIFICATION = "de_DE.UTF-8";
+      LC_MEASUREMENT = "de_DE.UTF-8";
+      LC_MONETARY = "de_DE.UTF-8";
+      LC_NAME = "de_DE.UTF-8";
+      LC_NUMERIC = "de_DE.UTF-8";
+      LC_PAPER = "de_DE.UTF-8";
+      LC_TELEPHONE = "de_DE.UTF-8";
+      LC_TIME = "de_DE.UTF-8";
+    };
+    security = {
+      rtkit.enable = true;
+      polkit.enable = true; # polkit
+#      polkit.enablePkexecWrapper = true;
+    };
+    nix.settings.experimental-features = [
+      "nix-command"
+      "flakes"
+    ];
+  };
+}
diff --git a/modules/system/packages.nix b/modules/system/core/packages.nix
similarity index 100%
rename from modules/system/packages.nix
rename to modules/system/core/packages.nix
diff --git a/modules/system/user.nix b/modules/system/core/user.nix
similarity index 100%
rename from modules/system/user.nix
rename to modules/system/core/user.nix
diff --git a/result b/result
new file mode 120000
index 0000000..73b6688
--- /dev/null
+++ b/result
@@ -0,0 +1 @@
+/nix/store/dv2b9jwqaymcsdiw2sp81h3xqfnlkac7-nixos-system-nixos-26.05.20261015.26f4107
\ No newline at end of file