Skip to content

Commit

Permalink
fix: move over to biome
Browse files Browse the repository at this point in the history
  • Loading branch information
sQVe committed Sep 27, 2024
1 parent 2c4a419 commit b341381
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 142 deletions.
12 changes: 6 additions & 6 deletions config/nvim/lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"cmp-git": { "branch": "main", "commit": "50d526dff0f6bc441b51fc269d9fdc99a50c76af" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"codecompanion.nvim": { "branch": "main", "commit": "15d0aee6f8a029cb6b6c2bd34894473d117998c9" },
"codecompanion.nvim": { "branch": "main", "commit": "00199ce1d87f1c5d3d04afe91d9a60c137927a34" },
"conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
Expand All @@ -21,7 +21,7 @@
"indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" },
"lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" },
"lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
"lspkind-nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
"lspkind-nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" },
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
"luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
Expand All @@ -31,7 +31,7 @@
"mini.diff": { "branch": "main", "commit": "24d46798be8a358d38d3adc92c7ebcbb2d6f67e0" },
"mini.files": { "branch": "main", "commit": "a3a9cce82115a69dba161ac45bda16f4e606f73b" },
"mini.hipatterns": { "branch": "main", "commit": "fdad87bf545aec5210ca9a2c49fddf6284d72d1e" },
"mini.icons": { "branch": "main", "commit": "2d89252993fec829b24720097a687412d10f6c85" },
"mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" },
"mini.pairs": { "branch": "main", "commit": "e543c760edc5e746e5b6cbd02c066c17ead3ef16" },
"mini.surround": { "branch": "main", "commit": "0e67c4bc147f2a15cee94e7c94dcc0e115b9f55e" },
"notebox.nvim": { "branch": "main", "commit": "7d6c5c9f97f075fe5ce7806b930ec55cee52b886" },
Expand All @@ -41,19 +41,19 @@
"nvim-lspconfig": { "branch": "master", "commit": "a9bc587e9ae0cbcb3e90a2e9342f86b3b78c4408" },
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" },
"nvim-treesitter": { "branch": "master", "commit": "6511cd984ab4b21e28f83af488f38dc89c3b0586" },
"nvim-treesitter": { "branch": "master", "commit": "f027762845fa35ff27fe0487c86537a74a480a0c" },
"nvim-treesitter-textsubjects": { "branch": "master", "commit": "a8d2844bba925d9450ef7ab215f3b054028288ca" },
"persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"render-markdown.nvim": { "branch": "main", "commit": "aad1a1220dc9da5757e3af3befbc7fc3869dd334" },
"render-markdown.nvim": { "branch": "main", "commit": "ffbe9f2395eacdce8a9fa967ac0fae75a6204f09" },
"schemastore.nvim": { "branch": "main", "commit": "274fe3391cd4bdea17df72abfbbc84404b7f7b8d" },
"smart-open.nvim": { "branch": "0.2.x", "commit": "87626ee8748b9bba22093adec7bb58c63e7214f0" },
"sort.nvim": { "branch": "main", "commit": "c789da6968337d2a61104a929880b5f144e02855" },
"sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" },
"statuscol.nvim": { "branch": "main", "commit": "1022f922b77b44c36f8057ac29adbfd89ce86958" },
"supermaven-nvim": { "branch": "main", "commit": "40bde487fe31723cdd180843b182f70c6a991226" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
"telescope.nvim": { "branch": "master", "commit": "6b08cdcc22a630d19172b9db55f7b8db5f81d761" },
"telescope.nvim": { "branch": "master", "commit": "cb3f98d935842836cc115e8c9e4b38c1380fbb6b" },
"ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" },
"vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
Expand Down
39 changes: 14 additions & 25 deletions config/nvim/lua/sQVe/plugins/conform/formatters.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,53 +5,42 @@
local M = {}

M.by_ft = {
css = { 'prettierd' },
graphql = { 'prettierd' },
css = { 'biome', 'prettierd' },
graphql = { 'biome', 'prettierd' },
html = { 'prettierd' },
javascript = { 'prettierd', 'eslint_d' },
javascriptreact = { 'prettierd', 'eslint_d' },
json = { 'prettierd' },
json5 = { 'prettierd' },
jsonc = { 'prettierd' },
javascript = { 'biome-check', 'prettierd' },
javascriptreact = { 'biome-check', 'prettierd' },
json = { 'biome', 'prettierd' },
jsonc = { 'biome', 'prettierd' },
lua = { 'stylua' },
markdown = { 'prettierd', 'injected' },
sh = { 'shfmt' },
typescript = { 'prettierd', 'eslint_d' },
typescriptreact = { 'prettierd', 'eslint_d' },
typescript = { 'biome-check', 'prettierd' },
typescriptreact = { 'biome-check', 'prettierd' },
yaml = { 'prettierd' },
['_'] = { 'trim_newlines', 'trim_whitespace' },
}

M.override_formatting_settings = function()
local util = require('conform.util')

local eslint_d_formatter = require('conform.formatters.eslint_d')
local prettierd_formatter = require('conform.formatters.prettierd')
local shfmt_formatter = require('conform.formatters.shfmt')
local stylua_formatter = require('conform.formatters.stylua')

stylua_formatter.require_cwd = true
prettierd_formatter.require_cwd = true
eslint_d_formatter.require_cwd = true

eslint_d_formatter.cwd = util.root_file({
'.eslintrc.cjs',
'.eslintrc.js',
'.eslintrc.json',
'.eslintrc.yaml',
'.eslintrc.yml',
})
stylua_formatter.require_cwd = true

prettierd_formatter.cwd = util.root_file({
'.prettierrc',
'.prettierrc.json',
'.prettierrc.yml',
'.prettierrc.yaml',
'.prettierrc.js',
'.prettierrc.cjs',
'.prettierrc.js',
'.prettierrc.json',
'.prettierrc.toml',
'prettier.config.js',
'.prettierrc.yaml',
'.prettierrc.yml',
'prettier.config.cjs',
'prettier.config.js',
})

shfmt_formatter.args =
Expand Down
3 changes: 0 additions & 3 deletions config/nvim/lua/sQVe/plugins/conform/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ M.opts = {

M.config = function(_, opts)
local conform = require('conform')
local util = require('conform.util')

local formatters = require('sQVe.plugins.conform.formatters')

formatters.override_formatting_settings()
conform.setup(opts)
Expand Down
3 changes: 2 additions & 1 deletion config/nvim/lua/sQVe/plugins/lspconfig/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ local M = {
-- yamlls
'yaml',

-- vtsls
-- biome and vtsls
'javascript',
'javascriptreact',
'typescript',
Expand Down Expand Up @@ -70,6 +70,7 @@ M.config = function()
-- Neovim plugin development (neodev)

bashls = server_setup,
biome = server_setup,
ccls = server_setup,
cssls = utils.create_server_setup({
on_attach = on_attach,
Expand Down
4 changes: 2 additions & 2 deletions config/nvim/lua/sQVe/plugins/lspconfig/utils.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ M.create_runtime_condition = function(config_names)
end

local config_path =
require('lspconfig').util.root_pattern(config_names)(params.bufname)
require('lspconfig').util.root_pattern(config_names)(params.bufname)

local has_config = config_path ~= nil
if has_config then
Expand Down Expand Up @@ -84,7 +84,7 @@ M.diagnostic_handler = function(_, result, ctx, ...)
if client then
if client.name == 'vtsls' then
ignored_diagnostics = {
{ code = 7016, severity = severity.ERROR },
{ code = 7016, severity = severity.ERROR },
{ code = 80001, severity = severity.HINT },
}
elseif client.name == 'yamlls' then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,9 @@
local autocmd = require('sQVe.utils.autocmd')
local timer = require('sQVe.utils.timer')

local linters = require('sQVe.plugins.nvim-lint.linters')
local utils = require('sQVe.plugins.nvim-lint.utils')

local M = {
'mfussenegger/nvim-lint',
ft = {
-- eslint_d.
'javascript',
'javascriptreact',
'typescript',
'typescriptreact',

-- shellcheck.
'sh',
},
Expand All @@ -28,10 +19,17 @@ M.init = function()
end

M.config = function()
linters.override_linting_settings()
local lint = require('lint')

lint.linters_by_ft = {
sh = { 'shellcheck' },
}

autocmd({ 'BufWritePost', 'BufReadPost', 'InsertLeave' }, {
group = 'Lint',
callback = timer.debounce(200, utils.try_lint),
callback = timer.debounce(200, function()
require('lint').try_lint()
end),
})
end

Expand Down
57 changes: 0 additions & 57 deletions config/nvim/lua/sQVe/plugins/nvim-lint/linters.lua

This file was deleted.

35 changes: 0 additions & 35 deletions config/nvim/lua/sQVe/plugins/nvim-lint/utils.lua

This file was deleted.

3 changes: 1 addition & 2 deletions local/share/nvm/default-packages
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
@ast-grep/cli
@biomejs/biome
@fsouza/prettierd
@vtsls/language-server
bash-language-server
colorally
corepack
css-variables-language-server
eslint_d
json-server
neovim
npm
pnpm
Expand Down

0 comments on commit b341381

Please sign in to comment.