diff --git a/home-manager/software/emacs/default.nix b/home-manager/software/emacs/default.nix
index 3b84661..6628909 100644
--- a/home-manager/software/emacs/default.nix
+++ b/home-manager/software/emacs/default.nix
@@ -15,9 +15,6 @@
             languagetool-server-command "${pkgs.languagetool}/share/languagetool-server.jar")
     '';
     extraPackages = epkgs: with pkgs;[
-      hunspell
-      hunspellDicts.en_GB-ise
-      hunspellDicts.de_CH
       mu
       languagetool
       rufo # formatter for Ruby
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 8f32dbd..5b459a4 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,6 +1,7 @@
 { inputs, custom, pkgs, ... }:
 {
   imports = [
+    "${inputs.self}/modules/hunspell"
     "${inputs.self}/modules/nix-alien"
     "${inputs.self}/modules/libimobiledevice"
   ];
diff --git a/modules/hunspell/default.nix b/modules/hunspell/default.nix
new file mode 100644
index 0000000..16ae3ee
--- /dev/null
+++ b/modules/hunspell/default.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    hunspell
+    hunspellDicts.en_GB-ise
+    hunspellDicts.de_CH
+  ];
+}