From 4b9c0c2702064e9b4cbe0bb25154d0f90e7b4b44 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Tue, 7 Nov 2023 18:32:31 -0600 Subject: [PATCH] feat: tailwind-ctp-lsp Signed-off-by: jolheiser --- README.md | 3 --- flake.lock | 23 ++++++++++++++++++++++- flake.nix | 8 +++++++- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d932395..ce91590 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,6 @@ 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 ``` diff --git a/flake.lock b/flake.lock index 1d293d1..da56845 100644 --- a/flake.lock +++ b/flake.lock @@ -58,7 +58,8 @@ "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "nur": "nur", - "tailwind-ctp": "tailwind-ctp" + "tailwind-ctp": "tailwind-ctp", + "tailwind-ctp-lsp": "tailwind-ctp-lsp" } }, "systems": { @@ -95,6 +96,26 @@ "type": "git", "url": "https://git.jojodev.com/jolheiser/tailwind-ctp" } + }, + "tailwind-ctp-lsp": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1699401590, + "narHash": "sha256-nx8ExuBRUux9eXSUgkWp1LJMvA3dmA76+2xggZjHTU0=", + "ref": "refs/heads/master", + "rev": "b321333ad08bf21db242f246b10ad4a50b8fc8a0", + "revCount": 848, + "type": "git", + "url": "https://git.jojodev.com/jolheiser/tailwind-ctp-intellisense" + }, + "original": { + "type": "git", + "url": "https://git.jojodev.com/jolheiser/tailwind-ctp-intellisense" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f5868ef..6be095d 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,10 @@ url = "git+https://git.jojodev.com/jolheiser/tailwind-ctp"; inputs.nixpkgs.follows = "nixpkgs"; }; + tailwind-ctp-lsp = { + url = "git+https://git.jojodev.com/jolheiser/tailwind-ctp-intellisense"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { @@ -18,12 +22,14 @@ nixpkgs, nur, tailwind-ctp, + tailwind-ctp-lsp, } @ inputs: flake-utils.lib.eachDefaultSystem ( system: let pkgs = nixpkgs.legacyPackages.${system}; nur = inputs.nur.packages.${system}; tailwind-ctp = inputs.tailwind-ctp.packages.${system}.default; + tailwind-ctp-lsp = inputs.tailwind-ctp-lsp.packages.${system}.default; in { packages.default = pkgs.buildGoModule { pname = "jolheiser.com"; @@ -42,7 +48,7 @@ go nur.templ tailwind-ctp - tailwindcss-language-server + tailwind-ctp-lsp vscode-langservers-extracted ]; };