diff --git a/hosts/thinkpad-e595/default.nix b/hosts/thinkpad-e595/default.nix
index 6d54868a..6752937b 100644
--- a/hosts/thinkpad-e595/default.nix
+++ b/hosts/thinkpad-e595/default.nix
@@ -14,10 +14,9 @@
     services.ssh.enable = true;
 
     develop = {
-      cc.enable = true;
+      c.enable = true;
       python.enable = true;
       rust.enable = true;
-      haskell.enable = true;
       scientific.typst.enable = true;
     };
 
diff --git a/modules/develop/c.nix b/modules/develop/c.nix
new file mode 100644
index 00000000..a45f0800
--- /dev/null
+++ b/modules/develop/c.nix
@@ -0,0 +1,20 @@
+{ options, config, lib, pkgs, ... }:
+
+let
+  inherit (lib.attrsets) attrValues;
+  inherit (lib.modules) mkIf mkMerge;
+in {
+  options.modules.develop.c = let inherit (lib.options) mkEnableOption;
+  in { enable = mkEnableOption "C development"; };
+
+  config = mkIf config.modules.develop.c.enable (mkMerge [
+    {
+      user.packages =
+        attrValues { inherit (pkgs) gcc gnumake gdb ninja clang-tools; };
+    }
+
+    (mkIf config.modules.develop.xdg.enable {
+      # TODO:
+    })
+  ]);
+}
diff --git a/modules/develop/cc.nix b/modules/develop/cc.nix
deleted file mode 100644
index 58094019..00000000
--- a/modules/develop/cc.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ options, config, lib, pkgs, ... }:
-
-let
-  inherit (lib.attrsets) attrValues;
-  inherit (lib.modules) mkIf mkMerge;
-in {
-  options.modules.develop.cc = let inherit (lib.options) mkEnableOption;
-  in { enable = mkEnableOption "C/C++ development"; };
-
-  config = mkIf config.modules.develop.cc.enable (mkMerge [
-    {
-      user.packages =
-        attrValues { inherit (pkgs) clang cmake ccls clang-tools; };
-
-      hm.programs.vscode.extensions =
-        attrValues { inherit (pkgs.vscode-extensions.ms-vscode) cpptools; };
-    }
-
-    (mkIf config.modules.develop.xdg.enable {
-      # TODO:
-    })
-  ]);
-}