diff --git a/baldur/hm.nix b/baldur/hm.nix
index 758735c..8ea4d86 100644
--- a/baldur/hm.nix
+++ b/baldur/hm.nix
@@ -12,6 +12,15 @@
   imports = [
     ../hm_modules/__basic.nix
 
+    # ../hm_modules/cpp.nix
+    # ../hm_modules/data_analysis.nix
+    # ../hm_modules/go.nix
+    # ../hm_modules/java.nix
+    # ../hm_modules/javascript.nix
+    # ../hm_modules/latex.nix
+    # ../hm_modules/python.nix
+    # ../hm_modules/rust.nix
+
     # ../hm_modules/fonts.nix
     ../hm_modules/helix.nix
     # ../hm_modules/kitty.nix
diff --git a/hm_modules/data_analysis.nix b/hm_modules/data_analysis.nix
new file mode 100644
index 0000000..abf4ca9
--- /dev/null
+++ b/hm_modules/data_analysis.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    nodePackages.vscode-langservers-extracted
+    yaml-language-server
+  ];
+}
diff --git a/hm_modules/helix.nix b/hm_modules/helix.nix
index a709080..d5b1932 100644
--- a/hm_modules/helix.nix
+++ b/hm_modules/helix.nix
@@ -1,41 +1,39 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+let
+  desktopItem = pkgs.makeDesktopItem {
+    name = "Helix";
+    exec = "hx %F";
+    icon = "helix";
+    desktopName = "Helix";
+    comment = "Helix text editor";
+    terminal = true;
+    categories = [ "Development" ];
+    mimeTypes = [
+      "text/english"
+      "text/plain"
+      "text/x-makefile"
+      "text/x-c++hdr"
+      "text/x-c++src"
+      "text/x-chdr"
+      "text/x-csrc"
+      "text/x-java"
+      "text/x-moc"
+      "text/x-pascal"
+      "text/x-tcl"
+      "text/x-tex"
+      "application/x-shellscript"
+      "text/x-c"
+      "text/x-c++"
+    ];
+  };
+in
+{
   programs.bash.shellAliases = { x = "hx"; };
   programs.zsh.shellAliases = { x = "hx"; };
-  home.sessionVariables = {
-    EDITOR = "hx";
-    VISUAL = "hx";
-  };
+  home.sessionVariables = { EDITOR = "hx"; VISUAL = "hx"; };
   home.packages = with pkgs; [
-    nodePackages.vscode-langservers-extracted
-    rnix-lsp
-    yaml-language-server
-
-    (pkgs.makeDesktopItem {
-      name = "Helix";
-      exec = "hx %F";
-      icon = "helix";
-      desktopName = "Helix";
-      comment = "Helix text editor";
-      terminal = true;
-      categories = [ "Development" ];
-      mimeTypes = [
-        "text/english"
-        "text/plain"
-        "text/x-makefile"
-        "text/x-c++hdr"
-        "text/x-c++src"
-        "text/x-chdr"
-        "text/x-csrc"
-        "text/x-java"
-        "text/x-moc"
-        "text/x-pascal"
-        "text/x-tcl"
-        "text/x-tex"
-        "application/x-shellscript"
-        "text/x-c"
-        "text/x-c++"
-      ];
-    })
+    nil # Nix language server
+    desktopItem
   ];
   programs.helix = {
     enable = true;
diff --git a/loki/hm.nix b/loki/hm.nix
index 6b01632..a2264e7 100644
--- a/loki/hm.nix
+++ b/loki/hm.nix
@@ -38,7 +38,15 @@
   imports = [
     ../hm_modules/__basic.nix
 
-    ../hm_modules/configurations.nix
+    # ../hm_modules/cpp.nix
+    ../hm_modules/data_analysis.nix
+    # ../hm_modules/go.nix
+    # ../hm_modules/java.nix
+    # ../hm_modules/javascript.nix
+    # ../hm_modules/latex.nix
+    # ../hm_modules/python.nix
+    # ../hm_modules/rust.nix
+
     ../hm_modules/fonts.nix
     ../hm_modules/bash.nix
     ../hm_modules/bat.nix
diff --git a/odin/hm.nix b/odin/hm.nix
index ede427d..9649cfb 100644
--- a/odin/hm.nix
+++ b/odin/hm.nix
@@ -92,6 +92,7 @@
     ../hm_modules/__basic.nix
 
     ../hm_modules/cpp.nix
+    ../hm_modules/data_analysis.nix
     # ../hm_modules/go.nix
     # ../hm_modules/java.nix
     ../hm_modules/javascript.nix
diff --git a/thor/hm.nix b/thor/hm.nix
index ad132a9..c49b14e 100644
--- a/thor/hm.nix
+++ b/thor/hm.nix
@@ -83,6 +83,7 @@
     ../hm_modules/__basic.nix
 
     ../hm_modules/cpp.nix
+    ../hm_modules/data_analysis.nix
     # ../hm_modules/go.nix
     # ../hm_modules/java.nix
     ../hm_modules/javascript.nix