Tidy base module

.envrc

@@ -1,2 +1,2 @@
-watch_dir ./modules
+watch_dir ./base
 use flake

base/default.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  imports = [
+    ./base
+    ./helix
+    ./languages
+  ];
+}

base/helix/default.nix

@@ -40,11 +40,21 @@ in
       config.devshells.default =
         let
           tomlFormatter = pkgs.formats.toml { };
-          helixLanguages = {
+          helix = {
-            directory = ".helix";
+            languages = {
-            filename = "languages.toml";
+              name = "languages.toml";
               content = config.helix.languages;
-            file = tomlFormatter.generate "languages.toml" helixLanguages.content;
+              path = tomlFormatter.generate "languages.toml" helix.languages.content;
+            };
+            directory = {
+              name = ".helix";
+              path = pkgs.linkFarm helix.directory.name [
+                {
+                  name = helix.languages.name;
+                  path = helix.languages.path;
+                }
+              ];
+            };
           };
         in
         {
@@ -59,7 +69,8 @@ in
           packages = [ pkgs.helix ];
           devshell.startup.helix_config.text = ''
             mkdir -p .helix
-            ${pkgs.uutils-coreutils-noprefix}/bin/ln -fs ${helixLanguages.file} ./${helixLanguages.directory}/${helixLanguages.filename}
+            ${pkgs.uutils-coreutils-noprefix}/bin/rm -rf ./${helix.directory.name}
+            ${pkgs.uutils-coreutils-noprefix}/bin/ln -fsn ${helix.directory.path} ./${helix.directory.name}
           '';
         };
     }