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 ``` diff --git a/flake.lock b/flake.lock index da56845eec3c6b1a191135d3b4b7ba40fa29afd6..1d293d1aa2c47ab3458f35fc8c585bc42c10495b 100644 --- a/flake.lock +++ b/flake.lock @@ -58,8 +58,7 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "nur": "nur", - "tailwind-ctp": "tailwind-ctp", - "tailwind-ctp-lsp": "tailwind-ctp-lsp" + "tailwind-ctp": "tailwind-ctp" } }, "systems": { @@ -95,26 +94,6 @@ }, "original": { "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" } } }, diff --git a/flake.nix b/flake.nix index 6be095d09382df6c046266144112e21b7cec1358..f5868ef2960373f2bdf8af264cdbbe16118b1636 100644 --- a/flake.nix +++ b/flake.nix @@ -10,10 +10,6 @@ tailwind-ctp = { 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 = { @@ -22,14 +18,12 @@ flake-utils, 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"; @@ -48,7 +42,7 @@ nativeBuildInputs = with pkgs; [ go nur.templ tailwind-ctp - tailwind-ctp-lsp + tailwindcss-language-server vscode-langservers-extracted ]; };