diff --git a/flake.nix b/flake.nix
index fc945ff..b346dfb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,24 +5,37 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
     flake-utils.url = "github:numtide/flake-utils";
-    home-manager.url = "github:nix-community/home-manager";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, flake-utils, home-manager, ... }: {
+  outputs = { self, nixpkgs, flake-utils, home-manager, ... }: 
+    let
+      system = "x86_64-linux";
+      pkgs = import nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+      };
+    in
+    {
       nixosConfigurations = {
         laptop = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
+          inherit system;
           modules = [
             {
               nixpkgs.config.allowUnfree = true;
             }
             ./hosts/laptop/configuration.nix
-            ./modules/common.nix
-            ./modules/users/alisceon.nix
             home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.users.alisceon = import ./home/users/alisceon.nix;
+            }
           ];
         };
       };
-  };
+    };
 }
diff --git a/modules/users/alisceon.nix b/home/users/alisceon.nix
similarity index 64%
rename from modules/users/alisceon.nix
rename to home/users/alisceon.nix
index 4ca7423..6e93880 100644
--- a/modules/users/alisceon.nix
+++ b/home/users/alisceon.nix
@@ -1,9 +1,22 @@
-{ config, pkgs, ... }:
-
-{
-  home-manager.users.alisceon = {
+{ pkgs, ... }: {
+    home.username = "alisceon"
+    home.homeDirectory = "/home/alisceon"
     home.stateVersion = "24.05";
 
+  nixpkgs.config.allowUnfree = true;
+
+  security.rtkit.enable = true;
+
+  services.gnome.gnome-keyring.enable = true;
+
+  environment.variables.EDITOR = "nano";
+
+  nix.settings.auto-optimise-store = true;
+
+  systemd.extraConfig = ''
+    DefaultTimeoutStopSec=10s
+  '';
+
     programs.fish.enable = true;
     programs.git.enable = true;
 
@@ -34,5 +47,4 @@
     xdg.enable = true;
     xdg.userDirs.enable = true;
     xdg.mime.enable = true;
-  };
 }