From b3102f091f89fd68daf5fb0ac4cf96611b86ef5c Mon Sep 17 00:00:00 2001 From: Fabio Lenherr Date: Thu, 23 Feb 2023 10:42:09 +0100 Subject: [PATCH] feat: add tailwindcss --- environment.d/envvars.conf | 2 ++ nvim/lazy-lock.json | 13 ++++++----- nvim/lua/plugins/cmp.lua | 14 ++++++++++++ nvim/lua/plugins/lsp.lua | 43 ++++++++++++++++++++++++++++++++++++ nvim/lua/plugins/plugins.lua | 4 +++- 5 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 nvim/lua/plugins/cmp.lua diff --git a/environment.d/envvars.conf b/environment.d/envvars.conf index 99e76f2..5be8099 100644 --- a/environment.d/envvars.conf +++ b/environment.d/envvars.conf @@ -11,3 +11,5 @@ XDG_CURRENT_DESKTOP=wlr GPG_TTY=$(tty) PATH=$PATH:$HOME/.local/bin TEXMFHOME=$HOME/.texmf +JAVA_HOME="/usr/lib/jvm/java-17-openjdk/bin/" +PATH=$JAVA_HOME/bin:$PATH diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 56ca958..da1cac4 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -13,7 +13,7 @@ "flit.nvim": { "branch": "main", "commit": "980e80e8fe44caaeb9de501c8e97a559b17db2f4" }, "friendly-snippets": { "branch": "main", "commit": "6fa50a94ba5378bb73013a6e163376d8e69bd8a5" }, "gitsigns.nvim": { "branch": "main", "commit": "f388995990aba04cfdc7c3ab870c33e280601109" }, - "harpoon": { "branch": "master", "commit": "fa3d8f725ab658dd2a9d4ab66f245c874431662c" }, + "harpoon": { "branch": "master", "commit": "f7040fd0c44e7a4010369136547de5604b9c22a1" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, "lazy.nvim": { "branch": "main", "commit": "8077428e63feb0f3bf795d53b23ba1695b28ab0e" }, "leap.nvim": { "branch": "main", "commit": "9a69febb2e5a4f5f5a55dd2d7173098fde917bc5" }, @@ -22,7 +22,7 @@ "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "93e58e100f37ef4fb0f897deeed20599dae9d128" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "6b5b5fc42176e0ca1d3634a516cc9b4e5fcc8117" }, - "mason.nvim": { "branch": "main", "commit": "5b9fd3822d686092c7ee08adfcbd2c764def22c5" }, + "mason.nvim": { "branch": "main", "commit": "11e34da70dc531e5d917fd4303db2d81258f6ada" }, "mini.ai": { "branch": "main", "commit": "d50b4d87e38d21ca2c5facee9f8a205ddb768358" }, "mini.bufremove": { "branch": "main", "commit": "351d18d596f7eac4589b67b4b87ed1708c545dd3" }, "mini.comment": { "branch": "main", "commit": "9fc3fe43129e8c2611bd21b8f50af8c0d0742533" }, @@ -30,12 +30,12 @@ "mini.pairs": { "branch": "main", "commit": "4ebc1ff8d77fe75e8f219432302800ca29e17614" }, "mini.surround": { "branch": "main", "commit": "6a4f31e2a380439315729f561d7e7898bde1fd52" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "74040b34278910d9b467fd914862e2a9a1ebacaa" }, - "neoconf.nvim": { "branch": "main", "commit": "e29ccd3064837e4b20e318c25d8f3c146663ffbc" }, - "neodev.nvim": { "branch": "main", "commit": "6d362921d772963e5a5e5ed0fcf82153defaf206" }, + "neoconf.nvim": { "branch": "main", "commit": "ddc2abacded92e697bfeff57db2194b1c8afdb3d" }, + "neodev.nvim": { "branch": "main", "commit": "3c6e485bb3ff819c33e8f24847ba7d421d658569" }, "noice.nvim": { "branch": "main", "commit": "d8a1f3056ad713b5d471048f8d029264828e22c0" }, "nui.nvim": { "branch": "main", "commit": "d147222a1300901656f3ebd5b95f91732785a329" }, "null-ls.nvim": { "branch": "main", "commit": "689cdd78f70af20a37b5309ebc287ac645ae4f76" }, - "nvim-cmp": { "branch": "main", "commit": "ba7a53478d0726683d1597ad1e814695033dcb4b" }, + "nvim-cmp": { "branch": "main", "commit": "7cd39409e7378fa711624687d3b430b8a56c3af9" }, "nvim-dap": { "branch": "master", "commit": "fd291e970aa7c46ba2c49448f7d2c94cc7828f4e" }, "nvim-dap-ui": { "branch": "master", "commit": "bf9f0c4768ce8cb99ac0b99cf06ae6f91c906a1a" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "8db23ea51203b5f00ad107a0cef7e0b2d7a0476c" }, @@ -44,12 +44,13 @@ "nvim-navic": { "branch": "master", "commit": "7e9d2b2b601149fecdccd11b516acb721e571fe6" }, "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, "nvim-spectre": { "branch": "master", "commit": "ce73d505fdc45f16c1a04f6a98c1c1e114841708" }, - "nvim-treesitter": { "branch": "master", "commit": "ba35d094c1dfffa652e9c20971c51bd5271c1d25" }, + "nvim-treesitter": { "branch": "master", "commit": "454876fc6d25a699178cb66aeda4014dedb765f3" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "2f3583001e2bf793480f38cf0d055571787b0259" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "a0f89563ba36b3bacd62cf967b46beb4c2c29e52" }, "nvim-web-devicons": { "branch": "master", "commit": "4709a504d2cd2680fb511675e64ef2790d491d36" }, "persistence.nvim": { "branch": "main", "commit": "d8a3eda0e19b4d5f3180fc832c25baab1709f2a1" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, + "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "51cf26134b12d107435d2529ccf2dafd5309abcb" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "6eb6bb45b7a9bed94a464a3e1dadfe870459628c" }, "telescope-project.nvim": { "branch": "master", "commit": "8e8ee37b7210761502cdf2c3a82b5ba8fb5b2972" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua new file mode 100644 index 0000000..2be286c --- /dev/null +++ b/nvim/lua/plugins/cmp.lua @@ -0,0 +1,14 @@ +return { + "hrsh7th/nvim-cmp", + lazy = true, + dependencies = { + { "roobert/tailwindcss-colorizer-cmp.nvim", config = true }, + }, + opts = function(_, opts) + local format_kinds = opts.formatting.format + opts.formatting.format = function(entry, item) + format_kinds(entry, item) + return require("tailwindcss-colorizer-cmp").formatter(entry, item) + end + end, +} diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index 1c2b934..9eeb7a7 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -38,6 +38,49 @@ return { ---@type lspconfig.options servers = { jsonls = {}, + tailwindcss = {}, + cssls = {}, + html = {}, + clangd = {}, + pyright = {}, + cmake = {}, + bashls = {}, + ansiblels = {}, + marksman = {}, + asm_lsp = {}, + tsserver = { + settings = { + typescript = { + inlayHints = { + includeInlayParameterNameHints = "all", + includeInlayParameterNameHintsWhenArgumentMatchesName = true, + includeInlayFunctionParameterTypeHints = true, + includeInlayVariableTypeHints = true, + includeInlayPropertyDeclarationTypeHints = true, + includeInlayFunctionLikeReturnTypeHints = true, + includeInlayEnumMemberValueHints = true, + }, + }, + javascript = { + inlayHints = { + includeInlayParameterNameHints = "all", + includeInlayParameterNameHintsWhenArgumentMatchesName = true, + includeInlayFunctionParameterTypeHints = true, + includeInlayVariableTypeHints = true, + includeInlayPropertyDeclarationTypeHints = true, + includeInlayFunctionLikeReturnTypeHints = true, + includeInlayEnumMemberValueHints = true, + }, + }, + }, + }, + ltex = {}, + jdtls = {}, + gopls = {}, + sqls = {}, + taplo = {}, + lemminx = {}, + yamlls = {}, lua_ls = { -- mason = false, -- set to false if you don't want this server to be installed with mason settings = { diff --git a/nvim/lua/plugins/plugins.lua b/nvim/lua/plugins/plugins.lua index 5eae06e..3b6e30c 100644 --- a/nvim/lua/plugins/plugins.lua +++ b/nvim/lua/plugins/plugins.lua @@ -14,7 +14,9 @@ return { lazy = true, event = { "BufReadPre", "BufNewFile" }, config = function(_, _) - require("nvim-highlight-colors").setup() + require("nvim-highlight-colors").setup({ + enable_tailwind = true, + }) vim.cmd(":hi clear CursorLine") vim.cmd(":hi clear CursorLineFold") vim.cmd(":hi clear CursorLineSign")