From 06a7949edb038a29e61aad14a6ffd12b7ffa844d Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Fri, 15 Mar 2024 01:33:17 -0500
Subject: [PATCH] Some template changes for deno work

---
 modules/home-manager/helix.nix      | 30 -----------------------------
 modules/nixos/development-tools.nix |  2 ++
 templates/deno/.gitignore           |  5 ++++-
 templates/deno/deno.json            | 10 ++++++++++
 templates/deno/deno.jsonc           | 10 ----------
 templates/deno/flake.nix            |  1 +
 templates/deno/{src => }/mod.ts     |  0
 7 files changed, 17 insertions(+), 41 deletions(-)
 create mode 100644 templates/deno/deno.json
 delete mode 100644 templates/deno/deno.jsonc
 rename templates/deno/{src => }/mod.ts (100%)

diff --git a/modules/home-manager/helix.nix b/modules/home-manager/helix.nix
index f3af879..b55fe0c 100644
--- a/modules/home-manager/helix.nix
+++ b/modules/home-manager/helix.nix
@@ -77,36 +77,6 @@ in {
             unit = "\t";
           };
         }
-        {
-          name = "javascript";
-          file-types = ["js" "mjs"];
-          scope = "source.js";
-          auto-format = true;
-        }
-        {
-          name = "typescript";
-          file-types = ["ts" "mts"];
-          scope = "source.ts";
-          auto-format = true;
-        }
-        {
-          name = "jsx";
-          file-types = ["jsx"];
-          scope = "source.jsx";
-          auto-format = true;
-        }
-        {
-          name = "tsx";
-          file-types = ["tsx"];
-          scope = "source.tsx";
-          auto-format = true;
-        }
-        {
-          name = "jsonc";
-          file-types = ["jsonc"];
-          scope = "source.jsonc";
-          auto-format = true;
-        }
 
         # {
         #   name = "javascript";
diff --git a/modules/nixos/development-tools.nix b/modules/nixos/development-tools.nix
index 6545278..2cedfc3 100644
--- a/modules/nixos/development-tools.nix
+++ b/modules/nixos/development-tools.nix
@@ -1,5 +1,6 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
+    taplo # toml language server for editing helix configs per repo
     watchexec
     android-tools
     libresprite
@@ -7,6 +8,7 @@
     wol
     shellcheck
     shfmt
+    vscode-langservers-extracted
     nodePackages.bash-language-server
     xh
     jq
diff --git a/templates/deno/.gitignore b/templates/deno/.gitignore
index 6abfe1b..1a1b0be 100644
--- a/templates/deno/.gitignore
+++ b/templates/deno/.gitignore
@@ -1,2 +1,5 @@
-/target
+# nix build results
+/result
+
+# direnv cache
 /.direnv
diff --git a/templates/deno/deno.json b/templates/deno/deno.json
new file mode 100644
index 0000000..b5051e1
--- /dev/null
+++ b/templates/deno/deno.json
@@ -0,0 +1,10 @@
+{
+  "tasks": {
+    "dev": "deno run -A --watch=src,mod.ts mod.ts"
+  },
+  "fmt": {
+    "useTabs": true,
+    "semiColons": false,
+    "singleQuote": true
+  }
+}
\ No newline at end of file
diff --git a/templates/deno/deno.jsonc b/templates/deno/deno.jsonc
deleted file mode 100644
index 8d93ce9..0000000
--- a/templates/deno/deno.jsonc
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "tasks": {
-    "dev": "deno run -A --watch=src src/mod.ts",
-  },
-  "fmt": {
-    "useTabs": true,
-    "semiColons": false,
-    "singleQuote": true,
-  },
-}
diff --git a/templates/deno/flake.nix b/templates/deno/flake.nix
index b89370f..1e120b9 100644
--- a/templates/deno/flake.nix
+++ b/templates/deno/flake.nix
@@ -14,6 +14,7 @@
     in {
       deno-dev = pkgs.mkShell {
         buildInputs = with pkgs; [
+          vscode-langservers-extracted
           deno
           curl
           xh
diff --git a/templates/deno/src/mod.ts b/templates/deno/mod.ts
similarity index 100%
rename from templates/deno/src/mod.ts
rename to templates/deno/mod.ts