mirror of
https://github.com/Ajetski/dotfiles.git
synced 2025-09-30 13:53:17 -09:00
merge
This commit is contained in:
parent
5d9ef47cab
commit
a318732150
@ -78,6 +78,7 @@ vim.call('plug#end')
|
|||||||
-- set colorscheme
|
-- set colorscheme
|
||||||
vim.cmd(':colorscheme dogrun')
|
vim.cmd(':colorscheme dogrun')
|
||||||
vim.cmd(':highlight LineNr ctermfg=grey')
|
vim.cmd(':highlight LineNr ctermfg=grey')
|
||||||
|
|
||||||
vim.cmd(':hi Twilight ctermfg=8')
|
vim.cmd(':hi Twilight ctermfg=8')
|
||||||
require("twilight").setup {
|
require("twilight").setup {
|
||||||
dimming = {
|
dimming = {
|
||||||
@ -151,7 +152,7 @@ vim.cmd("let g:svelte_preprocessors = ['ts']")
|
|||||||
|
|
||||||
-- setup TreeSitter
|
-- setup TreeSitter
|
||||||
require 'nvim-treesitter.configs'.setup {
|
require 'nvim-treesitter.configs'.setup {
|
||||||
ensure_installed = {"c", "lua", "rust", "javascript", "typescript", "graphql", "svelte"},
|
ensure_installed = { "c", "lua", "rust", "javascript", "typescript", "graphql", "svelte" },
|
||||||
sync_install = false,
|
sync_install = false,
|
||||||
context_commentstring = {
|
context_commentstring = {
|
||||||
enable = true
|
enable = true
|
||||||
@ -511,6 +512,10 @@ require("nvim-lsp-installer").setup {
|
|||||||
automatic_installation = false
|
automatic_installation = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
local extension_path = vim.env.HOME .. '/.vscode/extensions/vadimcn.vscode-lldb-1.8.1/'
|
||||||
|
local codelldb_path = extension_path .. 'adapter/codelldb'
|
||||||
|
local liblldb_path = extension_path .. 'lldb/lib/liblldb.dylib'
|
||||||
|
|
||||||
local lspconfig = require("lspconfig")
|
local lspconfig = require("lspconfig")
|
||||||
lspconfig.sumneko_lua.setup {
|
lspconfig.sumneko_lua.setup {
|
||||||
settings = {
|
settings = {
|
||||||
@ -579,12 +584,8 @@ require('rust-tools').setup {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
dap = {
|
dap = {
|
||||||
adapter = {
|
adapter = require('rust-tools.dap').get_codelldb_adapter(codelldb_path, liblldb_path)
|
||||||
type = "executable",
|
}
|
||||||
command = "lldb-vscode",
|
|
||||||
name = "rt_lldb",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
require('lspconfig')['svelte'].setup {
|
require('lspconfig')['svelte'].setup {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
@ -675,6 +676,7 @@ vim.cmd [[let g:ale_fixers = {
|
|||||||
\ 'typescript': ['prettier'],
|
\ 'typescript': ['prettier'],
|
||||||
\ 'css': ['prettier'],
|
\ 'css': ['prettier'],
|
||||||
\ 'svelte': ['prettier'],
|
\ 'svelte': ['prettier'],
|
||||||
|
\ 'rust': ['rustfmt'],
|
||||||
\}]]
|
\}]]
|
||||||
vim.cmd [[let g:ale_linters_explicit = 1]]
|
vim.cmd [[let g:ale_linters_explicit = 1]]
|
||||||
vim.cmd [[let g:ale_fix_on_save = 1]]
|
vim.cmd [[let g:ale_fix_on_save = 1]]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user