diff --git a/flake.nix b/flake.nix
index 91d2383..bd86add 100644
--- a/flake.nix
+++ b/flake.nix
@@ -63,7 +63,7 @@
             ./hosts/microwave
             ./modules/basic-tools.nix
             ./modules/binary-caches.nix
-            ./modules/emacs.nix
+            ./modules/devtools.nix
             ./modules/gnupg.nix
             ./modules/graphical.nix
             ./modules/hw-accel-intel.nix
@@ -72,23 +72,6 @@
             ./modules/science.nix
             ./modules/tlp.nix
             ./modules/virtualization.nix
-            ({ pkgs, ... }: {
-              nixpkgs.overlays = [
-                fenix.overlay
-                self.overlays.default
-                emacs-overlay.overlay
-              ];
-              environment.systemPackages = with pkgs; [
-                (fenix.packages."x86_64-linux".stable.withComponents [
-                  "cargo"
-                  "clippy"
-                  "rust-src"
-                  "rustc"
-                  "rustfmt"
-                ])
-                rust-analyzer-nightly
-              ];
-            })
           ];
         };
         cirrus = nixpkgs.lib.nixosSystem {
diff --git a/modules/devtools.nix b/modules/devtools.nix
new file mode 100644
index 0000000..a21df41
--- /dev/null
+++ b/modules/devtools.nix
@@ -0,0 +1,20 @@
+{ pkgs, inputs, ... }: {
+
+  nixpkgs.overlays = [
+    inputs.fenix.overlay
+    inputs.emacs-overlay.overlay
+  ];
+  environment.systemPackages = with pkgs; [
+    # rust
+    (inputs.fenix.packages."x86_64-linux".stable.withComponents [
+      "cargo"
+      "clippy"
+      "rust-src"
+      "rustc"
+      "rustfmt"
+    ])
+    rust-analyzer-nightly
+    # nix
+    rnix-lsp
+  ];
+}