diff --git a/flake.nix b/flake.nix
index 75f8b63..9090010 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,21 +61,13 @@
       formatter."${system}" = pkgs.nixfmt-rfc-style;
 
       homeManagerModules = {
-        common = import ./modules/home-manager/common.nix;
-        default = import ./modules/home-manager;
-        emacsConfig = import ./modules/home-manager/programs/emacs;
+        emacs = import ./modules/home-manager/programs/emacs;
         hyprlandConfig = import ./modules/home-manager/programs/hyprland;
         neovim = import ./modules/home-manager/programs/neovim;
-        theming = import ./modules/home-manager/theming.nix;
       };
 
       nixosModules = {
-        common = import ./modules/nixos/common.nix;
         default = import ./modules/nixos;
-        desktop = import ./modules/nixos/desktop.nix;
-        hardware = import ./modules/nixos/hardware.nix;
-        sound = import ./modules/nixos/sound.nix;
-        system = import ./modules/nixos/system.nix;
       };
     };
 }
diff --git a/modules/home-manager/common.nix b/modules/home-manager/common.nix
index 13f8dfe..10049bd 100644
--- a/modules/home-manager/common.nix
+++ b/modules/home-manager/common.nix
@@ -1,13 +1,6 @@
 { pkgs, ... }:
 
 {
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
   home.sessionVariables = {
     NIXOS_OZONE_WL = "1";
     QT_QPA_PLATFORM = "wayland";
diff --git a/modules/home-manager/packages.nix b/modules/home-manager/packages.nix
index e00283e..7b704b1 100644
--- a/modules/home-manager/packages.nix
+++ b/modules/home-manager/packages.nix
@@ -5,6 +5,12 @@
     ./programs
   ];
 
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
   # The home.packages option allows you to install Nix packages into your
   # environment.
   home.packages = with pkgs; [