diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index 1d5545c7..dccce53a 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -5,6 +5,7 @@ let
     DOOMPROFILELOADFILE = "${DOOMLOCALDIR}/load.el";
   };
 in {
+  imports = [ ./formatters.nix ./lsp_servers.nix ];
   xdg.configFile = {
     emacs.source = doom-emacs;
     doom.source = ./doom;
@@ -53,41 +54,12 @@ in {
       gfortran
       rustup
       texlive.combined.scheme-medium
-      isort
       python3
       python3Packages.cython
       python3Packages.pyflakes
       python3Packages.nose
       python3Packages.pytest
       nodePackages.stylelint
-
-      # Formatters
-      nixfmt
-      beautysh
-      black
-      nodePackages.fixjson
-      fprettify
-      shellharden
-      shfmt
-      stylua
-      python3Packages.mdformat
-      html-tidy
-      nodePackages.js-beautify
-
-      # LSP servers
-      nixd
-      fortls
-      shellcheck
-      marksman
-      luajitPackages.lua-lsp
-      texlab
-      nodePackages.pyright
-      nodePackages.yaml-language-server
-      nodePackages.bash-language-server
-      nodePackages.vscode-html-languageserver-bin
-      nodePackages.vscode-css-languageserver-bin
-      nodePackages.vscode-json-languageserver-bin
-      nodePackages.dockerfile-language-server-nodejs
     ];
   };
 }
diff --git a/home/emacs/formatters.nix b/home/emacs/formatters.nix
new file mode 100644
index 00000000..7c5d38eb
--- /dev/null
+++ b/home/emacs/formatters.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    nixfmt
+    beautysh
+    black
+    isort
+    nodePackages.fixjson
+    fprettify
+    shellharden
+    shfmt
+    stylua
+    python3Packages.mdformat
+    html-tidy
+    nodePackages.js-beautify
+  ];
+}
diff --git a/home/emacs/lsp_servers.nix b/home/emacs/lsp_servers.nix
new file mode 100644
index 00000000..f0a51a5a
--- /dev/null
+++ b/home/emacs/lsp_servers.nix
@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    nixd
+    fortls
+    shellcheck
+    marksman
+    luajitPackages.lua-lsp
+    texlab
+    nodePackages.pyright
+    nodePackages.yaml-language-server
+    nodePackages.bash-language-server
+    nodePackages.vscode-html-languageserver-bin
+    nodePackages.vscode-css-languageserver-bin
+    nodePackages.vscode-json-languageserver-bin
+    nodePackages.dockerfile-language-server-nodejs
+  ];
+}