diff --git a/flake.nix b/flake.nix
index fcb0283..e1e33f8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,5 +25,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
-  outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);
+  outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } {
+    imports = [
+      inputs.home-manager.flakeModules.home-manager
+      (inputs.import-tree ./modules)
+    ];
+  };
 }
diff --git a/modules/#default.nix# b/modules/#default.nix#
new file mode 100644
index 0000000..85c0349
--- /dev/null
+++ b/modules/#default.nix#
@@ -0,0 +1,40 @@
+{
+  self,
+  inputs,
+  ...
+}:
+let
+  mods = with self.nixosModules; [
+    user
+    packages
+    agenix
+    boot
+    core
+    easyroam
+    myStylix
+    stylixTargets
+    /etc/nixos/hardware-configuration.nix
+  ];
+in
+{
+  flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem {
+    modules =
+      with self.nixosModules;
+      [
+        {
+          config.dualBoot = true;
+          config.networking.hostName = "nerv";
+        }
+      ]
+      ++ mods;
+  };
+  flake.nixosConfigurations.seele = inputs.nixpkgs.lib.nixosSystem {
+    modules = [
+      {
+        config.networking.hostName = "seele";
+      }
+    ]
+    ++ mods;
+  };
+
+}
diff --git a/modules/home/#home.nix# b/modules/home/#home.nix#
new file mode 100644
index 0000000..90ed547
--- /dev/null
+++ b/modules/home/#home.nix#
@@ -0,0 +1,3 @@
+{inputs, ...} : {
+ 
+}
\ No newline at end of file
diff --git a/modules/home/programs/emacs.nix b/modules/home/programs/emacs.nix
index 476844c..f8d6d78 100644
--- a/modules/home/programs/emacs.nix
+++ b/modules/home/programs/emacs.nix
@@ -3,7 +3,7 @@
   flake.homeModules.emacs = { pkgs, ... }: {
     programs.emacs = {
       enable = true;
-      packages = pkgs.emacs-pgtk;
+      package = pkgs.emacs-pgtk;
       extraConfig = ''
                           ;; -*- lexical-binding: t; -*-
         (setq make-backup-files nil)
diff --git a/modules/home/programs/fuzzel.nix b/modules/home/programs/fuzzel.nix
new file mode 100644
index 0000000..4b6eb2e
--- /dev/null
+++ b/modules/home/programs/fuzzel.nix
@@ -0,0 +1,12 @@
+{...}: {
+  flake.homeModules.fuzzel = {
+    programs.fuzzel = {
+      enable = true;
+      settings = {
+        main = {
+          dpi_aware = "no";
+        };
+      };
+    };
+  };
+}
diff --git a/modules/home/stylix/targets.nix b/modules/home/stylix/targets.nix
index 89761d1..4e89ec7 100644
--- a/modules/home/stylix/targets.nix
+++ b/modules/home/stylix/targets.nix
@@ -1,11 +1,10 @@
 {inputs, ...}: {
   flake.homeModules.homeStylix = {
-    imports = [ inputs.stylix.homeModules.stylix ];
     stylix.targets = {
       ghostty.enable = true;
       fuzzel.enable = true;
       gtk.enable = true;
-      niri.enable = true;
+      emacs.enable = true;
     };
   };
 }
diff --git a/modules/system/core/packages.nix b/modules/system/core/packages.nix
index 7fc0c36..d40f18c 100644
--- a/modules/system/core/packages.nix
+++ b/modules/system/core/packages.nix
@@ -6,22 +6,16 @@
       stow
       ufetch
       rbw
-      emacs-pgtk
-      tinty
       pinentry-gnome3
-      git
       nixd
       nixfmt
       xournalpp
       rnote
       btop
       chromium
-      fuzzel
       quickshell
       wl-clipboard
       adw-gtk3
-      papirus-icon-theme
-      apple-cursor
       polkit_gnome
       xwayland-satellite
       nemo
@@ -38,8 +32,6 @@
       jq
       nmgui
       kdePackages.qtdeclarative
-      ghostty
-      rnote
       gsettings-desktop-schemas
       glib
     ];
diff --git a/modules/system/core/user.nix b/modules/system/core/user.nix
index fcd59f2..c5a4cf3 100644
--- a/modules/system/core/user.nix
+++ b/modules/system/core/user.nix
@@ -14,12 +14,19 @@
     home-manager.useGlobalPkgs = true;
     home-manager.useUserPackages = true;
     home-manager.extraSpecialArgs = { inherit inputs; };
+    home-manager.users.lucy = {
+      home.username = "lucy";
+      home.homeDirectory = "/home/lucy";
+      home.stateVersion = "25.11";
+
+    };
     home-manager.sharedModules = with self.homeModules; [
       nixcord
       ghostty
       niri
       emacs
       homeStylix
+      fuzzel
     ];
   };
 }