diff --git a/#configuration.nix# b/#configuration.nix#
new file mode 100755
index 0000000..405a38f
--- /dev/null
+++ b/#configuration.nix#
@@ -0,0 +1,199 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+
+  age.enable = true;
+  age.identityPaths = [ "/var/lib/misc/key.age" ];
+  age.secrets.easyroam.file = ./secrets/easyroam.age;
+  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" ];
+  };
+  services.tlp = lib.mkIf (config.networking.hostName == "seele") {
+    enable = true;
+    pd.enable = true;
+  };
+  programs.steam.enable = true;
+  services.syncthing = {
+    user = "lucy";
+    dataDir = "/home/lucy/sync";
+    configDir = "/home/lucy/.config/syncthing";
+    enable = true;
+    openDefaultPorts = true;
+    settings = {
+      devices = {
+        "cyberia" = {
+          id = "OOJBAJU-AAIKLHO-BKMMHBU-2NXE75Z-HE64A6V-LET4ZXB-Q2FT2Y4-GZON3AD";
+        };
+      };
+    };
+  };
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = false;
+    input.General.ClassicBondedOnly = false;
+
+    settings = {
+
+      General = {
+        Experimental = true;
+
+      };
+    };
+  };
+
+  hardware.graphics.enable = true;
+  services.blueman.enable = true;
+  services.xserver.videoDrivers = lib.mkIf (config.networking.hostName == "nerv") [ "nvidia" ];
+  hardware.nvidia = lib.mkIf (config.networking.hostName == "nerv") {
+    modesetting.enable = true;
+    open = true;
+    package = config.boot.kernelPackages.nvidiaPackages.new_feature;
+  };
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+  boot.loader.systemd-boot.enable = false;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.limine = {
+    enable = true;
+    extraEntries = lib.mkIf (config.networking.hostName == "nerv") ''
+      /Windows 11
+       protocol: efi
+       path: uuid(6E25-7E8D):/EFI/Microsoft/Boot/bootmgfw.efi
+    '';
+
+  };
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  networking.networkmanager.enable = true;
+
+  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";
+  };
+  services.displayManager.gdm.enable = true;
+  services.emacs.enable = false;
+  services.xserver.xkb = {
+    layout = "eu";
+    variant = "";
+  };
+  services.printing.enable = true;
+  services.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.upower.enable = true;
+
+  # add niri
+  security.polkit.enable = true; # polkit
+  security.polkit.enablePkexecWrapper = true;
+  services.gnome.gnome-keyring.enable = true;
+  services.gvfs.enable = true;
+  services.udisks2.enable = true;
+  programs.niri.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+  programs.nixcord = {
+    enable = true;
+    user = "lucy";
+    discord.enable = false;
+    vesktop.enable = true;
+    config.plugins = {
+      messageLogger.enable = true;
+      messageClickActions.enable = true;
+    };
+    config.enabledThemes = [ "tinted.css" ];
+  };
+  programs.mango.enable = true;
+  users.users."lucy" = {
+    isNormalUser = true;
+    description = "lucy";
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+    ];
+    packages = with pkgs; [
+      stow
+      ufetch
+      rbw
+      clang
+      clang-tools
+      gnumake
+      emacs
+      tinty
+      foot
+      pinentry-gnome3
+      git
+      nixd
+      nixfmt
+      xournalpp
+      btop
+      chromium
+      fuzzel
+      quickshell
+      kdePackages.qtdeclarative
+      jq
+      grim
+      slurp
+      wl-clipboard
+      adw-gtk3
+      papirus-icon-theme
+      apple-cursor
+      polkit_gnome
+      xwayland-satellite
+      nautilus
+      libwacom
+      xf86-input-wacom
+      libreoffice-stable
+      gdb
+    ];
+  };
+  fonts.packages = with pkgs; [
+    jetbrains-mono
+    nerd-fonts.jetbrains-mono
+    noto-fonts
+    noto-fonts-cjk-sans
+    noto-fonts-color-emoji
+    inter
+  ];
+  programs.chromium.enable = true;
+  programs.chromium.extensions = [
+    "nngceckbapebfimnlniiiahkandclblb" # bitwarden
+    "ddkjiahejlhfcafbddmgiahcphecmpfh" # ublock origin lite
+  ];
+  nixpkgs.config.allowUnfree = true;
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+  environment.etc = {
+    "chromium" = {
+      enable = true;
+      mode = "symlink";
+      source = "/home/lucy/.local/share/tinted-theming/tinty/tinted-chromium-build-file.json";
+      target = "chromium/policies/managed/theme.json";
+    };
+  };
+  system.stateVersion = "26.05"; # Did you read the comment?
+
+}
diff --git a/configuration.nix b/configuration.nix
index c84eb12..692bc71 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -6,10 +6,62 @@
 }:
 
 {
+
   age.enable = true;
   age.identityPaths = [ "/var/lib/misc/key.age" ];
   age.secrets.easyroam.file = ./secrets/easyroam.age;
+  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" ];
+  };
+  services.tlp = lib.mkIf (config.networking.hostName == "seele") {
+    enable = true;
+    pd.enable = true;
+  };
+  programs.steam.enable = true;
+  services.syncthing = {
+    user = "lucy";
+    dataDir = "/home/lucy/sync";
+    configDir = "/home/lucy/.config/syncthing";
+    enable = true;
+    openDefaultPorts = true;
+    settings = {
+      devices = {
+        "cyberia" = {
+          id = "OOJBAJU-AAIKLHO-BKMMHBU-2NXE75Z-HE64A6V-LET4ZXB-Q2FT2Y4-GZON3AD";
+        };
+      };
+    };
+  };
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = false;
+    input.General.ClassicBondedOnly = false;
+
+    settings = {
+
+      General = {
+        Experimental = true;
+
+      };
+    };
+  };
+
+  hardware.graphics.enable = true;
+  services.blueman.enable = true;
+  services.xserver.videoDrivers = lib.mkIf (config.networking.hostName == "nerv") [ "nvidia" ];
+  hardware.nvidia = lib.mkIf (config.networking.hostName == "nerv") {
+    modesetting.enable = true;
+    open = true;
+    package = config.boot.kernelPackages.nvidiaPackages.new_feature;
+  };
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
+  boot.loader.systemd-boot.enable = false;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.limine = {
     enable = true;
@@ -18,9 +70,12 @@
        protocol: efi
        path: uuid(6E25-7E8D):/EFI/Microsoft/Boot/bootmgfw.efi
     '';
+
   };
   boot.kernelPackages = pkgs.linuxPackages_latest;
+
   networking.networkmanager.enable = true;
+
   time.timeZone = "Europe/Berlin";
   i18n.defaultLocale = "en_US.UTF-8";
   i18n.extraLocaleSettings = {
@@ -34,10 +89,55 @@
     LC_TELEPHONE = "de_DE.UTF-8";
     LC_TIME = "de_DE.UTF-8";
   };
+  services.displayManager.gdm.enable = true;
+  services.emacs.enable = false;
+  services.xserver.xkb = {
+    layout = "eu";
+    variant = "";
+  };
+  services.printing.enable = true;
+  services.pulseaudio.enable = false;
   security.rtkit.enable = true;
+  services.upower.enable = true;
+
+  # add niri
   security.polkit.enable = true; # polkit
   security.polkit.enablePkexecWrapper = true;
+  services.gnome.gnome-keyring.enable = true;
+  services.gvfs.enable = true;
+  services.udisks2.enable = true;
   programs.niri.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+  programs.nixcord = {
+    enable = true;
+    user = "lucy";
+    discord.enable = false;
+    vesktop.enable = true;
+    config.plugins = {
+      messageLogger.enable = true;
+      messageClickActions.enable = true;
+    };
+    config.enabledThemes = [ "tinted.css" ];
+  };
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestions.enable = true;
+    syntaxHighlighting.enable = true;
+    ohMyZsh = {
+      enable = true;
+      theme = "gentoo";
+    };
+    shellInit = ''export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/rbw/ssh-agent-socket"'';
+  };
+  system.userActivationScripts.zshrc = "touch .zshrc";
+
+
   users.users."lucy" = {
     isNormalUser = true;
     description = "lucy";
diff --git a/flake.nix b/flake.nix
index 6216fde..bf5f1ff 100755
--- a/flake.nix
+++ b/flake.nix
@@ -44,7 +44,6 @@
         nix-easyroam.nixosModules.nix-easyroam
         ./configuration.nix
         ./maid.nix
-        ./modules/default.nix
       ];
     in
     {
diff --git a/modules/default.nix b/modules/default.nix
deleted file mode 100644
index 0e2ea03..0000000
--- a/modules/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./programs
-    ./services
-    ./hardware
-  ];
-}
diff --git a/modules/hardware/bluetooth.nix b/modules/hardware/bluetooth.nix
deleted file mode 100644
index 5b22ad4..0000000
--- a/modules/hardware/bluetooth.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = false;
-    input.General.ClassicBondedOnly = false;
-    settings = {
-      General = {
-        Experimental = true;
-      };
-    };
-  };
-}
diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix
deleted file mode 100644
index 06df819..0000000
--- a/modules/hardware/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./nvidia.nix
-    ./bluetooth.nix
-  ];
-  hardware.graphics.enable = true;
-}
diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix
deleted file mode 100644
index 858e67a..0000000
--- a/modules/hardware/nvidia.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ lib, config, ... }: {
-  hardware.nvidia = lib.mkIf (config.networking.hostName == "nerv") {
-    modesetting.enable = true;
-    open = true;
-    package = config.boot.kernelPackages.nvidiaPackages.new_feature;
-  };
-}
diff --git a/modules/programs/default.nix b/modules/programs/default.nix
deleted file mode 100644
index fc26d3a..0000000
--- a/modules/programs/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, ... }: {
-  programs.niri.enable = true;
-  programs.steam.enable = true;
-  imports = [
-    ./zsh.nix
-    ./nixcord.nix
-  ];
-}
diff --git a/modules/programs/nixcord.nix b/modules/programs/nixcord.nix
deleted file mode 100644
index a0e74e3..0000000
--- a/modules/programs/nixcord.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  programs.nixcord = {
-    enable = true;
-    user = "lucy";
-    discord.enable = false;
-    vesktop.enable = true;
-    config.plugins = {
-      messageLogger.enable = true;
-      messageClickActions.enable = true;
-    };
-    config.enabledThemes = [ "tinted.css" ];
-  };
-}
diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
deleted file mode 100644
index d47f941..0000000
--- a/modules/programs/zsh.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    autosuggestions.enable = true;
-    syntaxHighlighting.enable = true;
-    ohMyZsh = {
-      enable = true;
-      theme = "gentoo";
-    };
-    shellInit = ''export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/rbw/ssh-agent-socket"'';
-  };
-  system.userActivationScripts.zshrc = "touch .zshrc";
-}
diff --git a/modules/services/default.nix b/modules/services/default.nix
deleted file mode 100644
index c420d4f..0000000
--- a/modules/services/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ config, pkgs, lib, ... }: {
-  imports = [
-    ./tlp.nix
-    ./easyroam.nix
-    ./syncthing.nix
-    ./pipewire.nix
-  ];
-  services = {
-    xserver.videoDrivers = lib.mkIf (config.networking.hostName == "nerv") [ "nvidia" ]; 
-    blueman.enable = true;
-    printing.enable = true;
-    emacs.enable = false;
-    xserver.xkb = {
-      layout = "eu";
-      variant = "";
-    };
-    upower.enable = true;
-    displayManager.gdm.enable = true;
-    udisks2.enable = true;
-    gvfs.enable = true;
-    gnome.gnome-keyring.enable = true;
-  };
-}
diff --git a/modules/services/easyroam.nix b/modules/services/easyroam.nix
deleted file mode 100644
index 1aa5782..0000000
--- a/modules/services/easyroam.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, ... }: {
-  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 24e9fb5..0000000
--- a/modules/services/pipewire.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-}
diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
deleted file mode 100644
index 8cda626..0000000
--- a/modules/services/syncthing.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  services.syncthing = {
-    user = "lucy";
-    dataDir = "/home/lucy/sync";
-    configDir = "/home/lucy/.config/syncthing";
-    enable = true;
-    openDefaultPorts = true;
-    settings = {
-      devices = {
-        "cyberia" = {
-          id = "OOJBAJU-AAIKLHO-BKMMHBU-2NXE75Z-HE64A6V-LET4ZXB-Q2FT2Y4-GZON3AD";
-        };
-      };
-    };
-  };
-}
diff --git a/modules/services/tlp.nix b/modules/services/tlp.nix
deleted file mode 100644
index b025c88..0000000
--- a/modules/services/tlp.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  services.tlp = {
-    enable = true;
-    pd.enable = true;
-  };
-}