tsivinsky/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install neoformat and run it on config

Browse Source
This commit is contained in:
Dan Tsivinsky
2021-11-25 19:35:03 +03:00
parent 12305d3180
commit bf430c2ff6
3 changed files with 204 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

180
config/nvim/init.lua
View File

@@ -1,58 +1,68 @@
require("packer").startup(function(use) require("packer").startup(function(use)
use({ "wbthomason/packer.nvim" }) use({"wbthomason/packer.nvim"})
-- Colorscheme -- Colorscheme
use({ "EdenEast/nightfox.nvim" }) use({"EdenEast/nightfox.nvim"})
-- Treesitter -- Treesitter
use({ "nvim-treesitter/nvim-treesitter", run = ":TSUpdate", { use({
{ "p00f/nvim-ts-rainbow" }, "nvim-treesitter/nvim-treesitter",
{ "JoosepAlviste/nvim-ts-context-commentstring" }, run = ":TSUpdate",
{ "nvim-treesitter/playground" } {
}}) {"p00f/nvim-ts-rainbow"},
{"JoosepAlviste/nvim-ts-context-commentstring"},
{"nvim-treesitter/playground"}
}
})
-- Make commenting code great -- Make commenting code great
use({ "tpope/vim-commentary" }) use({"tpope/vim-commentary"})
-- File tree -- File tree
use({ "kyazdani42/nvim-tree.lua", requires = { "kyazdani42/nvim-web-devicons" } }) use({
"kyazdani42/nvim-tree.lua",
requires = {"kyazdani42/nvim-web-devicons"}
})
-- Automatically close brackets and quotes -- Automatically close brackets and quotes
use({ "windwp/nvim-autopairs" }) use({"windwp/nvim-autopairs"})
-- Telescope -- Telescope
use({ "nvim-telescope/telescope.nvim", requires = { "nvim-lua/plenary.nvim" } }) use({"nvim-telescope/telescope.nvim", requires = {"nvim-lua/plenary.nvim"}})
use({ "nvim-telescope/telescope-symbols.nvim" }) use({"nvim-telescope/telescope-symbols.nvim"})
-- Statusline -- Statusline
use({ "nvim-lualine/lualine.nvim", requires = { "kyazdani42/nvim-web-devicons" } }) use({
"nvim-lualine/lualine.nvim",
requires = {"kyazdani42/nvim-web-devicons"}
})
use({ "iamcco/markdown-preview.nvim", run = "cd app && yarn install" }) use({"iamcco/markdown-preview.nvim", run = "cd app && yarn install"})
-- Highlight colors in editor -- Highlight colors in editor
use({ "norcalli/nvim-colorizer.lua" }) use({"norcalli/nvim-colorizer.lua"})
-- LSP -- LSP
use({ "neovim/nvim-lspconfig" }) use({"neovim/nvim-lspconfig", "williamboman/nvim-lsp-installer"})
use({ "hrsh7th/nvim-cmp" }) use({"hrsh7th/nvim-cmp"})
use({ "L3MON4D3/LuaSnip" }) use({"L3MON4D3/LuaSnip"})
use({ use({
"hrsh7th/cmp-nvim-lsp", "hrsh7th/cmp-nvim-lsp", "hrsh7th/cmp-buffer", "hrsh7th/cmp-path",
"hrsh7th/cmp-buffer", "hrsh7th/cmp-cmdline", "hrsh7th/cmp-nvim-lua",
"hrsh7th/cmp-path", "saadparwaiz1/cmp_luasnip"
"hrsh7th/cmp-cmdline", })
"hrsh7th/cmp-nvim-lua", use({"ray-x/lsp_signature.nvim"})
"saadparwaiz1/cmp_luasnip" use({"dense-analysis/ale"})
})
use({ "ray-x/lsp_signature.nvim" })
use({ "dense-analysis/ale" })
-- Tabs -- Tabs
use({ "romgrk/barbar.nvim" }) use({"romgrk/barbar.nvim"})
-- Git -- Git
use({ "lewis6991/gitsigns.nvim", requires = { "nvim-lua/plenary.nvim" } }) use({"lewis6991/gitsigns.nvim", requires = {"nvim-lua/plenary.nvim"}})
use({ "tpope/vim-fugitive" }) use({"tpope/vim-fugitive"})
-- Formatter
use({"sbdchd/neoformat"})
end) end)
require("nightfox").load() require("nightfox").load()
@@ -64,7 +74,7 @@ vim.o.autoindent = true
vim.o.number = true vim.o.number = true
vim.o.relativenumber = true vim.o.relativenumber = true
vim.o.wrap = true vim.o.wrap = true
vim.o.swapfile = true vim.o.swapfile = false
vim.o.encoding = "utf-8" vim.o.encoding = "utf-8"
vim.o.hidden = true vim.o.hidden = true
vim.o.writebackup = false vim.o.writebackup = false
@@ -81,64 +91,64 @@ vim.o.signcolumn = "yes"
vim.g.mapleader = " " vim.g.mapleader = " "
vim.cmd([[autocmd BufWritePre * undojoin | Neoformat]])
require("lsp") require("lsp")
vim.cmd("let g:ale_fixers = {'javascript': ['prettier', 'eslint'], 'typescript': ['prettier', 'eslint'], 'python': ['autopep8', 'remove_trailing_lines', 'reorder-python-imports', 'trim_whitespace']}") vim.cmd(
"let g:ale_fixers = {'javascript': ['prettier', 'eslint'], 'typescript': ['prettier', 'eslint'], 'python': ['autopep8', 'remove_trailing_lines', 'reorder-python-imports', 'trim_whitespace']}")
vim.cmd("let g:ale_fix_on_save = 1") vim.cmd("let g:ale_fix_on_save = 1")
require("nvim-treesitter.configs").setup({ require("nvim-treesitter.configs").setup({
ensure_installed = "maintained", ensure_installed = "maintained",
highlight = { highlight = {enable = true},
enable = true incremental_selection = {
}, enable = true,
incremental_selection = { keymaps = {
enable = true, init_selection = "<CR>",
keymaps = { scope_incremental = "<CR>",
init_selection = "<CR>", node_incremental = "<TAB>",
scope_incremental = "<CR>", node_decremental = "<S-TAB>"
node_incremental = "<TAB>", }
node_decremental = "<S-TAB>" },
} rainbow = {enable = true, extended_mode = true, disable = {"html"}},
}, context_commentstring = {enable = true}
rainbow = {
enable = true,
extended_mode = true,
disable = { "html" }
},
context_commentstring = {
enable = true
}
}) })
require("nvim-tree").setup({ require("nvim-tree").setup({
open_on_setup = true, open_on_setup = true,
hijack_cursor = true, hijack_cursor = true,
auto_close = true, auto_close = true,
open_on_tab = true, open_on_tab = true,
update_cwd = true, update_cwd = true,
update_focused_file = { enable = true }, update_focused_file = {enable = true},
view = { width = 30, side = "left", auto_resize = true }, view = {width = 30, side = "left", auto_resize = true},
filters = { custom = { ".git" } } filters = {custom = {".git"}}
}) })
vim.g.nvim_tree_add_trailing = 1 vim.g.nvim_tree_add_trailing = 1
vim.g.nvim_tree_indent_markers = 1 vim.g.nvim_tree_indent_markers = 1
vim.g.nvim_tree_show_icons = { git = 0, folders = 0, files = 0, folder_arrows = 0 } vim.g.nvim_tree_show_icons = {
git = 0,
folders = 0,
files = 0,
folder_arrows = 0
}
require("telescope").setup({ require("telescope").setup({
defaults = { defaults = {
sorting_strategy = "ascending", sorting_strategy = "ascending",
file_ignore_patterns = { ".git", "node_modules" } file_ignore_patterns = {".git", "node_modules"}
} }
}) })
require("gitsigns").setup({ require("gitsigns").setup({
current_line_blame = true, current_line_blame = true,
keymaps = { keymaps = {
noremap = true, noremap = true,
["n <leader>gs"] = [[:lua require("gitsigns").stage_hunk()<CR>]], ["n <leader>gs"] = [[:lua require("gitsigns").stage_hunk()<CR>]],
["n <leader>gu"] = [[:lua require("gitsigns").undo_stage_hunk()<CR>]], ["n <leader>gu"] = [[:lua require("gitsigns").undo_stage_hunk()<CR>]],
["n <leader>gr"] = [[:lua require("gitsigns").reset_hunk()<CR>]], ["n <leader>gr"] = [[:lua require("gitsigns").reset_hunk()<CR>]]
} }
}) })
require("nvim-autopairs").setup() require("nvim-autopairs").setup()

245
config/nvim/lua/lsp.lua
View File

@@ -1,150 +1,115 @@
local nvim_lsp = require("lspconfig") local lsp_installer = require("nvim-lsp-installer")
local cmp = require("cmp") local cmp = require("cmp")
local kind_icons = { local kind_icons = {
Text = "", Text = "",
Method = "", Method = "",
Function = "", Function = "",
Constructor = "", Constructor = "",
Field = "", Field = "",
Variable = "", Variable = "",
Class = "ﴯ", Interface = "", Class = "ﴯ",
Module = "", Interface = "",
Property = "ﰠ", Module = "",
Unit = "", Property = "ﰠ",
Value = "", Unit = "",
Enum = "", Value = "",
Keyword = "", Enum = "",
Snippet = "", Keyword = "",
Color = "", Snippet = "",
File = "", Color = "",
Reference = "", File = "",
Folder = "", Reference = "",
EnumMember = "", Folder = "",
Constant = "", EnumMember = "",
Struct = "", Constant = "",
Event = "", Struct = "",
Operator = "", Event = "",
TypeParameter = "" Operator = "",
TypeParameter = ""
} }
cmp.setup({ cmp.setup({
snippet = { snippet = {
expand = function(args) expand = function(args) require("luasnip").lsp_expand(args.body) end
require("luasnip").lsp_expand(args.body) },
mapping = {
["<C-j>"] = cmp.mapping.select_next_item({
behavior = cmp.SelectBehavior.Select
}),
["<C-k>"] = cmp.mapping.select_prev_item({
behavior = cmp.SelectBehavior.Select
}),
["<C-space>"] = cmp.mapping.complete(),
["<CR>"] = cmp.mapping.confirm({
select = true,
behavior = cmp.SelectBehavior.Insert
}),
["<TAB>"] = cmp.mapping.confirm({
select = true,
behavior = cmp.SelectBehavior.Insert
})
},
sources = cmp.config.sources({
{name = "nvim_lsp"}, {name = "luasnip"}, {name = "nvim_lua"}
}, {{name = "path"}, {name = "buffer"}}),
completion = {completeopt = "menu,menuone,noselect,noinsert,preview"},
experimental = {ghost_text = true},
sorting = {
comparators = {
cmp.config.compare.exact, cmp.config.compare.score,
cmp.config.compare.recently_used, cmp.config.compare.kind,
cmp.config.compare.offset
}
},
documentation = {
border = {"╭", "─", "╮", "│", "╯", "─", "╰", "│"},
zindex = 999
},
formatting = {
format = function(entry, vim_item)
vim_item.kind = string.format('%s %s', kind_icons[vim_item.kind],
vim_item.kind)
vim_item.menu = ({
buffer = "[Buffer]",
nvim_lsp = "[LSP]",
luasnip = "[Snippet]",
nvim_lua = "[Lua]",
path = "[File]"
})[entry.source.name]
return vim_item
end
}
})
cmp.setup.cmdline("/", {sources = {{name = "buffer"}}})
cmp.setup.cmdline(":", {sources = {{name = "path"}, {name = "cmdline"}}})
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp
.protocol
.make_client_capabilities())
capabilities.textDocument.completion.completionItem.snippetSupport = true
lsp_installer.on_server_ready(function(server)
local opts = {}
if server.name == "sumneko_lua" then
local runtime_path = vim.split(package.path, ';')
table.insert(runtime_path, "lua/?.lua")
table.insert(runtime_path, "lua/?/init.lua")
opts.settings = {
Lua = {
runtime = {version = "LuaJIT", path = runtime_path},
diagnostics = {globals = {"vim"}},
workspace = {library = vim.api.nvim_get_runtime_file("", true)},
telemetry = {enable = false}
}
}
end end
},
mapping = {
["<C-j>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Select }),
["<C-k>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Select }),
["<C-space>"] = cmp.mapping.complete(),
["<CR>"] = cmp.mapping.confirm({ select = true, behavior = cmp.SelectBehavior.Insert }),
["<TAB>"] = cmp.mapping.confirm({ select = true, behavior = cmp.SelectBehavior.Insert })
},
sources = cmp.config.sources({
{ name = "nvim_lsp" },
{ name = "luasnip" },
{ name = "nvim_lua" }
}, {
{ name = "path" },
{ name = "buffer" }
}),
completion = {
completeopt = "menu,menuone,noselect,noinsert"
},
experimental = {
ghost_text = true
},
sorting = {
comparators = {
cmp.config.compare.exact,
cmp.config.compare.score,
cmp.config.compare.recently_used,
cmp.config.compare.kind,
cmp.config.compare.offset
}
},
documentation = {
border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" },
zindex = 999
},
formatting = {
format = function(entry, vim_item)
vim_item.kind = string.format('%s %s', kind_icons[vim_item.kind], vim_item.kind)
vim_item.menu = ({ buffer = "[Buffer]", nvim_lsp = "[LSP]", luasnip = "[Snippet]", nvim_lua = "[Lua]", path = "[File]" })[entry.source.name]
return vim_item
end
}
})
cmp.setup.cmdline("/", { server:setup(opts)
sources = { end)
{ name = "buffer" }
}
})
cmp.setup.cmdline(":", {
sources = {
{ name = "path" },
{ name = "cmdline" }
}
})
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
local on_attach = function(_, bufnr)
require("lsp_signature").on_attach({}, bufnr)
end
local servers = { "tsserver", "pyright" }
for _, server in ipairs(servers) do
nvim_lsp[server].setup({
capabilities = capabilities,
on_attach = on_attach,
flags = {
debounce_text_changes = 150
}
})
end
nvim_lsp.gopls.setup({
capabilities = capabilities,
on_attach = on_attach,
settings = {
gopls = {
}
}
})
local runtime_path = vim.split(package.path, ';')
table.insert(runtime_path, "lua/?.lua")
table.insert(runtime_path, "lua/?/init.lua")
nvim_lsp.sumneko_lua.setup({
capabilities = capabilities,
on_attach = on_attach,
cmd = { "/sbin/lua-language-server", "-E", "/usr/lib/lua-language-server/main.lua" },
settings = {
Lua = {
runtime = {
version = "LuaJIT",
path = runtime_path
},
diagnostics = {
globals = { "vim" }
},
workspace = {
library = vim.api.nvim_get_runtime_file("", true)
},
telemetry = {
enable = false
}
}
}
})
require("luasnip/loaders/from_vscode").lazy_load() require("luasnip/loaders/from_vscode").lazy_load()
-- Auto formatting
vim.cmd([[autocmd BufWritePre * lua vim.lsp.buf.formatting_sync(nil, 1000)]])
vim.cmd([[autocmd BufWritePre *.ts,*.js,*.jsx,*.tsx,*.py ALEFix]])

11
config/nvim/lua/remaps.lua
View File

@@ -1,14 +1,11 @@
local function map(mode, shortcut, command) local function map(mode, shortcut, command)
vim.api.nvim_set_keymap(mode, shortcut, command, { noremap = true, silent = true }) vim.api.nvim_set_keymap(mode, shortcut, command,
{noremap = true, silent = true})
end end
local function nmap(shortcut, command) local function nmap(shortcut, command) map("n", shortcut, command) end
map("n", shortcut, command)
end
local function vmap(shortcut, command) local function vmap(shortcut, command) map("v", shortcut, command) end
map("v", shortcut, command)
end
-- Quickly save/quit vim -- Quickly save/quit vim
nmap("<leader>w", ":w<CR>") nmap("<leader>w", ":w<CR>")