diff --git a/modules/default.nix b/modules/default.nix
index 58a4da2..9808457 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,31 +1,9 @@
-{
-  self,
-  inputs,
-  ...
-}:
-let
-  mods = with self.nixosModules; [
-    user
-    packages
-    agenix
-    boot
-    core
-    easyroam
-    /etc/nixos/hardware-configuration.nix
-  ];
-in
-{
+{ self, inputs, ... }: {
   flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem {
-    modules =
-      with self.nixosModules;
-      [
-        {
-          config.dualBoot = true;
-        }
-      ]
-      ++ mods;
-  };
-  flake.nixosConfigurations.seele = inputs.nixpkgs.lib.nixosSystem {
-    modules = mods;
+    modules = with self.nixosModules; [
+      user
+      packages
+      /etc/nixos/hardware-configuration.nix
+    ];
   };
 }
diff --git a/modules/home/default.nix b/modules/home/default.nix
deleted file mode 100644
index 14fcd00..0000000
--- a/modules/home/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  flake.homeModules.lucy = {
-    
-  };
-}
diff --git a/modules/result b/modules/result
deleted file mode 120000
index 6c508aa..0000000
--- a/modules/result
+++ /dev/null
@@ -1 +0,0 @@
-/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
deleted file mode 100644
index 0583bc5..0000000
--- a/modules/services/easyroam.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ 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
deleted file mode 100644
index a026ef5..0000000
--- a/modules/services/pipewire.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ ... }: {
-  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
deleted file mode 100644
index 814305a..0000000
--- a/modules/services/tlp.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }: {
-  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 00e7b55..c153b55 100644
--- a/modules/system/agenix/agenix.nix
+++ b/modules/system/agenix/agenix.nix
@@ -1,8 +1,5 @@
-{inputs, ... }: {
-  flake.nixosModules.agenix = {config, ...}: {
-    imports = [
-      inputs.agenix.nixosModules.default
-    ];
+{ ... }: {
+  flake.nixosModules = {
     age = {
       enable = true;
       identityPaths = [ "/var/lib/misc/key.age" ];
diff --git a/modules/system/core/boot.nix b/modules/system/core/boot.nix
deleted file mode 100644
index 35e0e3d..0000000
--- a/modules/system/core/boot.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ 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
deleted file mode 100644
index 5fc22ca..0000000
--- a/modules/system/core/core.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ ... }: {
-  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/core/packages.nix b/modules/system/packages.nix
similarity index 100%
rename from modules/system/core/packages.nix
rename to modules/system/packages.nix
diff --git a/modules/system/core/user.nix b/modules/system/user.nix
similarity index 100%
rename from modules/system/core/user.nix
rename to modules/system/user.nix
diff --git a/result b/result
deleted file mode 120000
index 73b6688..0000000
--- a/result
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/dv2b9jwqaymcsdiw2sp81h3xqfnlkac7-nixos-system-nixos-26.05.20261015.26f4107
\ No newline at end of file