Skip to content

changes #1045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 22 commits into from
Closed

changes #1045

Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
changes
  • Loading branch information
ZaneFerns360 committed Apr 27, 2024
commit c98c45d26e53d1f6d260b193a31c6fc241cd00d1
54 changes: 41 additions & 13 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -579,15 +579,24 @@ require('lazy').setup({
--
cssls = {
settings = {
css = { validate = true, lint = {
unknownAtRules = 'ignore',
} },
scss = { validate = true, lint = {
unknownAtRules = 'ignore',
} },
less = { validate = true, lint = {
unknownAtRules = 'ignore',
} },
css = {
validate = true,
lint = {
unknownAtRules = 'ignore',
},
},
scss = {
validate = true,
lint = {
unknownAtRules = 'ignore',
},
},
less = {
validate = true,
lint = {
unknownAtRules = 'ignore',
},
},
},
},

Expand Down Expand Up @@ -619,7 +628,17 @@ require('lazy').setup({
-- for you, so that they are available from within Neovim.
local ensure_installed = vim.tbl_keys(servers or {})
vim.list_extend(ensure_installed, {
'stylua', -- Used to format Lua code
'lua-language-server',
'stylua',
'prettierd',
'clangd',
'clang-format',
'ruff',
'pyright',
'rust-analyzer',
'yaml-language-server',
'cspell',
'sql-formatter',
})
require('mason-tool-installer').setup { ensure_installed = ensure_installed }

Expand Down Expand Up @@ -657,10 +676,10 @@ require('lazy').setup({
-- Disable "format_on_save lsp_fallback" for languages that don't
-- have a well standardized coding style. You can add additional
-- languages here or re-enable it for the disabled ones.
local disable_filetypes = { c = true, cpp = true }
-- local disable_filetypes = { c = true, cpp = true }
return {
timeout_ms = 500,
lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype],
-- lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype],
}
end,
formatters_by_ft = {
Expand All @@ -670,7 +689,16 @@ require('lazy').setup({
--
-- You can use a sub-list to tell conform to run *until* a formatter
-- is found.
-- javascript = { { "prettierd", "prettier" } },
javascript = { { 'prettierd', 'prettier' } },
typescript = { { 'prettierd', 'prettier' } },
javascriptreact = { { 'prettierd', 'prettier' } },
typescriptreact = { { 'prettierd', 'prettier' } },
css = { { 'prettierd', 'prettier' } },
scc = { { 'prettierd', 'prettier' } },
html = { { 'prettierd', 'prettier' } },
python = { { 'ruff' } },
c = { { 'clang_format' } },
cpp = { { 'clang_format' } },
},
},
},
Expand Down
24 changes: 24 additions & 0 deletions lua/custom/plugins/lazygit.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
local lg = {
-- nvim v0.8.0
{
'kdheepak/lazygit.nvim',
cmd = {
'LazyGit',
'LazyGitConfig',
'LazyGitCurrentFile',
'LazyGitFilter',
'LazyGitFilterCurrentFile',
},
-- optional for floating window border decoration
dependencies = {
'nvim-lua/plenary.nvim',
},
-- setting the keybinding for LazyGit with 'keys' is recommended in
-- order to load the plugin when the command is run for the first time
keys = {
{ '<leader>gg', '<cmd>LazyGit<cr>', desc = 'LazyGit' },
},
},
}

return lg