diff --git a/common/home-manager.nix b/common/home-manager.nix
index e4d7106..171a382 100644
--- a/common/home-manager.nix
+++ b/common/home-manager.nix
@@ -1,13 +1,9 @@
 { config, lib, pkgs, ... }:
 
 {
-  home-manager.users = {
-    qenya = { config, lib, pkgs, osConfig, ... }: {
-      home.homeDirectory = osConfig.users.users.qenya.home;
-
-      imports = [
-        ../home/qenya
-      ];
-    };
+  home-manager = {
+    useUserPackages = true;
+    useGlobalPkgs = true;
+    backupFileExtension = "backup";
   };
 }
diff --git a/common/users/qenya.nix b/common/users/qenya.nix
index e9d11ad..19dc8ed 100644
--- a/common/users/qenya.nix
+++ b/common/users/qenya.nix
@@ -11,4 +11,9 @@ in {
   };
 
   programs.zsh.enable = true;
+
+  home-manager.users.qenya = { config, lib, pkgs, osConfig, ... }: {
+    home.homeDirectory = osConfig.users.users.qenya.home;
+    imports = [ ../../home/qenya ];
+  };
 }
diff --git a/flake.nix b/flake.nix
index 9746dec..232dbf7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,17 +43,11 @@
         nixpkgs.config.allowUnfree = true;
 
         nixpkgs.config.packageOverrides = pkgs: {
-          agenix = inputs.agenix.packages.${config.nixpkgs.hostPlatform.system}.default;
-          rc2nix = inputs.plasma-manager.packages.${config.nixpkgs.hostPlatform.system}.rc2nix;
-        };
-        nixpkgs.overlays = [ inputs.nur.overlay ];
-
-        home-manager = {
-          useUserPackages = true;
-          useGlobalPkgs = true;
-          backupFileExtension = "backup";
-          sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
+          agenix = agenix.packages.${config.nixpkgs.hostPlatform.system}.default;
+          rc2nix = plasma-manager.packages.${config.nixpkgs.hostPlatform.system}.rc2nix;
         };
+        nixpkgs.overlays = [ nur.overlay ];
+        home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
 
         imports = [
           home-manager.nixosModules.home-manager