diff --git a/home-manager/modules/default.nix b/home-manager/modules/default.nix
index 7dc030c..f83e9e1 100644
--- a/home-manager/modules/default.nix
+++ b/home-manager/modules/default.nix
@@ -9,6 +9,7 @@
     ./programs/email
     ./programs/evince
     ./programs/git
+    ./programs/hunspell
     ./programs/keeweb
     ./programs/mpv
     ./programs/open-port
diff --git a/modules/programs/hunspell/default.nix b/home-manager/modules/programs/hunspell/default.nix
similarity index 86%
rename from modules/programs/hunspell/default.nix
rename to home-manager/modules/programs/hunspell/default.nix
index 2426553..ee6fcf1 100644
--- a/modules/programs/hunspell/default.nix
+++ b/home-manager/modules/programs/hunspell/default.nix
@@ -8,7 +8,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
+    home.packages = with pkgs; [
       hunspell
       hunspellDicts.en_GB-ise
       hunspellDicts.de_CH
diff --git a/home-manager/modules/services/desktop-base/default.nix b/home-manager/modules/services/desktop-base/default.nix
index b99daf7..b402372 100644
--- a/home-manager/modules/services/desktop-base/default.nix
+++ b/home-manager/modules/services/desktop-base/default.nix
@@ -14,6 +14,7 @@ in
       az-emacs.enable = true;
       az-email.enable = true;
       az-evince.enable = true;
+      az-hunspell.enable = true;
       az-keeweb.enable = true;
       az-mpv.enable = true;
       az-open-port.enable = true;
diff --git a/home-manager/profiles/management.nix b/home-manager/profiles/management.nix
index 36fe778..52977ee 100644
--- a/home-manager/profiles/management.nix
+++ b/home-manager/profiles/management.nix
@@ -13,6 +13,7 @@
 
   programs = {
     az-emacs.enable = true;
+    az-hunspell.enable = true;
     az-open-port.enable = true;
     az-ssh.enable = true;
     az-tmux.enable = true;
diff --git a/home-manager/profiles/work-wsl.nix b/home-manager/profiles/work-wsl.nix
index 0d22372..38e1a56 100644
--- a/home-manager/profiles/work-wsl.nix
+++ b/home-manager/profiles/work-wsl.nix
@@ -49,6 +49,7 @@
     az-git = {
       userEmail = "zweili@contria.com";
     };
+    az-hunspell.enable = true;
     az-tmux.enable = true;
     az-vagrant-wsl.enable = true;
     bash = {
diff --git a/modules/default.nix b/modules/default.nix
index 8dc8f50..82ed62e 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -10,7 +10,6 @@
     ./profiles/desktop
     ./programs/distrobox
     ./programs/eog
-    ./programs/hunspell
     ./programs/libimobiledevice
     ./programs/lockscreen
     ./programs/makemkv
diff --git a/modules/profiles/desktop/default.nix b/modules/profiles/desktop/default.nix
index a2e913b..063a8b1 100644
--- a/modules/profiles/desktop/default.nix
+++ b/modules/profiles/desktop/default.nix
@@ -73,7 +73,6 @@ in
 
     programs = {
       az-eog.enable = true; # Gnome Image Viewer
-      az-hunspell.enable = true; # Enable dictionaries
       az-idevices.enable = true;
       az-nautilus.enable = true;
       az-nix-direnv.enable = true;
diff --git a/systems/management/default.nix b/systems/management/default.nix
index 860fd8a..8e05655 100644
--- a/systems/management/default.nix
+++ b/systems/management/default.nix
@@ -21,7 +21,6 @@
   };
   # Enable dictionaries
   programs = {
-    az-hunspell.enable = true;
     az-nix-direnv.enable = true;
     az-restic-management.enable = true;
   };