Home

jolheiser.com @main - refs - log -
-
https://git.jolheiser.com/jolheiser.com.git
my website
tree log patch
feat: add helix LSP configs Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signature
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmVKwmMACgkQuFOtpdp7 v3rSuA/+KU5r1azKtASr+PEq5KsWjvZVehf24yKpGzllRUjXN8QaNFmmeetrHOuQ 19U3554d5lvJMJ0K+IADw275XZMXhPRfjnx/KFMk7W4zdx4my1d1OxVrH5tydmQY 2FZ9OiQpMjOdmCzfE45CpPe53Ci8FCfNJw3kIH/tZruml/XCTuxkl+bIn3TaB36R gt4ao1urIbSOH91MiaE4POKHU9vjAobjB+ZDPwqSzCJUFHilcf4gTO7qZ22OJWLx h+SwFiOl6MYc8Q4r6IXugFe4q409HOyJwgB2VxDg1h01W3DXA+ZENa/N02OQySUk mGnMhjbDVAR2fjj7/CqlAGYbflhXiUMvX0fabDQD09BI6s20sngWTVPXM4T5RCeJ SL4048eBkHGokYMZMB7WvvjePpu/OkORJvkpmYG8O3AcLuKvxmL29KZjiH1kD/ih ICgStBhiUJrTJF8a2wE13DVrUsJ2BEJ15hMFkwUn+/4MwTyDfxOLfI8VZk9SMpvd ZXIRJiK2QjHBBeNRhuOpInAojjh2Zlq2Lljssw9Hf2jAxqHC+HMqqAaAI9zi7Ml7 YnyO+lZahjp8e9EUE4B1Pk6nRnV0pNOdHPl049KE7HhG7kpEH/lspYdRVZtX5U8p Xuqp1AqYvmoIEWfjr4flt/qz3m/XQDcWqrCMDYdJ/OBEU7cRKbg= =Ne7s -----END PGP SIGNATURE-----
jolheiser <john.olheiser@gmail.com>
2 years ago
5 changed files, 17 additions(+), 24 deletions(-)
.helix/languages.tomlREADME.mdflake.lockflake.nixtailwind.config.js
I .helix/languages.toml
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
diff --git a/.helix/languages.toml b/.helix/languages.toml
new file mode 100644
index 0000000000000000000000000000000000000000..adcc7b20b55bb9bddc08aa35dd35060044280875
--- /dev/null
+++ b/.helix/languages.toml
@@ -0,0 +1,5 @@
+[[language]]
+name = "templ"
+language-id = "html"
+language-servers = ["templ", "vscode-html-language-server", "tailwindcss-ls"]
+
M README.mdREADME.md
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
diff --git a/README.md b/README.md
index ce91590e95d856f01ae1120e514662b8b33ca443..d93239586279bea9bac02dcc6cb1387ce52ce6d5 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,9 @@ Links are sourced from [links.yaml](links.yaml).
 
 ## Dev
 
+NOTE: Currently the tailwind LSP assumes this is a JS project with node_modules, so the standalone CLI setup used with the bundled Catppuccin theme breaks the LSP when it ingests the config.
+To get tailwind's LSP to work, the plugin needs to be temporarily commented out. 
+
 ### Tools
 
 ```
M flake.lockflake.lock
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
diff --git a/flake.lock b/flake.lock
index db90c1230073521c957cb66bf74779e4c02bd978..1d293d1aa2c47ab3458f35fc8c585bc42c10495b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@       "inputs": {
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1692044854,
-        "narHash": "sha256-0FcjKrLH9YP/G+oEx7LQO4he/F3BxkAKsgU12q5jopw=",
+        "lastModified": 1699393291,
+        "narHash": "sha256-M+cAaIqvk1zh1tZ2lk2ZcjEPMs1Akuy7s2JZjwO43sc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fd91dcf3107361981d703f09e95fe02299b57ba3",
+        "rev": "e7704a1b645c94d51fdfdb2875638d3ffae0f15b",
         "type": "github"
       },
       "original": {
M flake.nixflake.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
diff --git a/flake.nix b/flake.nix
index 2e109ad8a0afb7eb6ae592673c7db363bdd62281..f5868ef2960373f2bdf8af264cdbbe16118b1636 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,25 +37,13 @@             go generate
             mv dist $out
           '';
         };
-        packages.default1 = pkgs.stdenv.mkDerivation {
-          pname = "jolheiser.com";
-          version = "site";
-          src = ./.;
-          nativeBuildInputs = with pkgs; [go nur.templ tailwind-ctp];
-          buildPhase = ''
-            runHook preBuild
-
-            go generate
-            mv dist $out
-
-            runHook postBuild
-          '';
-        };
         devShells.default = pkgs.mkShell {
           nativeBuildInputs = with pkgs; [
             go
             nur.templ
             tailwind-ctp
+            tailwindcss-language-server
+            vscode-langservers-extracted
           ];
         };
       }
M tailwind.config.jstailwind.config.js
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
diff --git a/tailwind.config.js b/tailwind.config.js
index c99ee74ccbc1f211c67d5ef2a7410624cdd8f4e4..0b0b81e40a88fd4b0e9ebfa00a59dcae0404a955 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,9 +1,6 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  content: ["./dist/*.html"],
-  theme: {
-    extend: {},
-  },
+  content: ["./dist/*.html", "*.templ"],
   plugins: [require("@catppuccin/tailwindcss")],
 }