diff --git a/lazy-lock.json b/lazy-lock.json index d86ea32..909a7e7 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -23,14 +23,11 @@ "lsp-progress.nvim": { "branch": "main", "commit": "55a04895ea20c365b670051a3128265d43bdfa3d" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" }, - "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "4ba55f9755ebe8297d92c419b90a946123292ae6" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mini.indentscope": { "branch": "main", "commit": "56d42be090e8fcc68eda69cfe55af8c5e562300e" }, "neoscroll.nvim": { "branch": "master", "commit": "a731f66f1d39ec6175fd201c5bf849e54abda99c" }, "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" }, - "none-ls-extras.nvim": { "branch": "main", "commit": "336e84b9e43c0effb735b08798ffac382920053b" }, - "none-ls.nvim": { "branch": "main", "commit": "0d1b3fa2ad0b371b94cb4b9a27ba6e5a1a915c91" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, @@ -40,13 +37,13 @@ "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" }, "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, - "nvim-material-icon": { "branch": "main", "commit": "d8b1564a95330a5bfe5ef38defe99b9c440efe7d" }, + "nvim-material-icon": { "branch": "main", "commit": "01d95380c6c643d663f8d3cf8a7b274ece6da389" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "06563ae0c9928a2df42aefe66f2aed2f2943e32e" }, "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" }, - "nvim-treesitter": { "branch": "master", "commit": "f0e3b5c5fe38d0012c63368db90017fef87c85a2" }, + "nvim-treesitter": { "branch": "master", "commit": "7ff0b8d3d21b15eb7231fcbd2acfded8987f5efd" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, @@ -61,7 +58,7 @@ "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, - "vim-visual-multi": { "branch": "master", "commit": "b84a6d42c1c10678928b0bf8327f378c8bc8af5a" }, + "vim-visual-multi": { "branch": "master", "commit": "525521677deb8401b62054bbbbc9b17f8486de3d" }, "virt-column.nvim": { "branch": "master", "commit": "b62b4ef0774d19452d4ed18e473e824c7a756f2f" }, "which-key.nvim": { "branch": "main", "commit": "0539da005b98b02cf730c1d9da82b8e8edb1c2d2" }, "yanky.nvim": { "branch": "main", "commit": "9268018e92d02650a94e39dd5f5903c542f7ea11" } diff --git a/lua/custom/default.lua b/lua/custom/default.lua index c651e0e..cc2c57d 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -45,7 +45,7 @@ pcode.format_timeout_ms = 5000 -- https://github.com/mfussenegger/nvim-lint -- https://github.com/stevearc/conform.nvim -- use conform and nvim-lint if set true -pcode.disable_null_ls = false +pcode.disable_null_ls = true pcode.treesitter_ensure_installed = {} pcode.tscontext = false @@ -167,6 +167,7 @@ pcode.active_javascript_config = { jest_command = "npm test -- ", jest_config = "jest.config.mjs", } +pcode.active_prisma_config = true pcode.active_php_config = false pcode.active_golang_config = false pcode.active_python_config = false diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index 74e4cb0..765f5b0 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -71,7 +71,7 @@ if disable then } end - local listtest = {} + -- local listtest = {} -- finally add the formatter to it's compatible filetype(s) for _, ft in pairs(pkg.spec.languages) do local ftl = string.lower(ft) @@ -85,9 +85,9 @@ if disable then pkg.spec.name = name_map[pkg.spec.name] end - if substring(pkg.spec.name, "ktfmt") then - table.insert(listtest, ftl) - end + -- if substring(pkg.spec.name, "ktfmt") then + -- table.insert(listtest, ftl) + -- end -- add new mapping language for key, value in pairs(addnew) do @@ -103,7 +103,7 @@ if disable then end end end - print(table.concat(listtest, ",")) + -- print(table.concat(listtest, ",")) end end end diff --git a/lua/plugins/prisma.lua b/lua/plugins/prisma.lua new file mode 100644 index 0000000..67dbb24 --- /dev/null +++ b/lua/plugins/prisma.lua @@ -0,0 +1,23 @@ +local M = {} +if pcode.active_prisma_config then + M = { + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "prisma" }) + end, + }, + { + "williamboman/mason-lspconfig.nvim", + opts = function(_, opts) + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "prismals" }) + vim.cmd([[ + autocmd BufWritePost *.prisma silent! execute "!npx prisma format" + ]]) + end, + }, + } +end +return M diff --git a/lua/user/utils/cfgstatus.lua b/lua/user/utils/cfgstatus.lua index d3f1bbe..bcb05b0 100644 --- a/lua/user/utils/cfgstatus.lua +++ b/lua/user/utils/cfgstatus.lua @@ -20,6 +20,8 @@ M.cheack = function() sts = true elseif pcode.active_kotlin_config or false then sts = true + elseif pcode.active_prisma_config or false then + sts = true end return sts end