Merge pull request #39 from mTvare6/main

Added Vlang support and some other remain vim-like fixes
This commit is contained in:
siduck76 2021-05-06 22:46:56 +05:30 committed by GitHub
commit d8399c638f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 5 deletions

View file

@ -36,7 +36,7 @@ function on_attach(client)
end end
local lspconf = require "lspconfig" local lspconf = require "lspconfig"
local servers = {"html", "cssls", "tsserver", "pyright", "bashls"} local servers = {"html", "cssls", "tsserver", "pyright", "bashls", "vls"}
for k, lang in pairs(servers) do for k, lang in pairs(servers) do
lspconf[lang].setup { lspconf[lang].setup {
@ -44,6 +44,11 @@ for k, lang in pairs(servers) do
} }
end end
local vls_binary = '/usr/local/bin/vls'
require'lspconfig'.vls.setup {
cmd = {vls_binary},
}
-- lua lsp settings -- lua lsp settings
USER = "/home/" .. vim.fn.expand("$USER") USER = "/home/" .. vim.fn.expand("$USER")

View file

@ -9,6 +9,7 @@ return require("packer").startup(
-- color related stuff -- color related stuff
use "siduck76/nvim-base16.lua" use "siduck76/nvim-base16.lua"
use "norcalli/nvim-colorizer.lua" use "norcalli/nvim-colorizer.lua"
-- use "ollykel/v-vim" -- v syntax highlighter
-- lsp stuff -- lsp stuff
use "nvim-treesitter/nvim-treesitter" use "nvim-treesitter/nvim-treesitter"
@ -42,6 +43,10 @@ return require("packer").startup(
use "karb94/neoscroll.nvim" use "karb94/neoscroll.nvim"
use "kdav5758/TrueZen.nvim" use "kdav5758/TrueZen.nvim"
-- discord rich presence
--use "andweeb/presence.nvim"
use {"lukas-reineke/indent-blankline.nvim", branch = "lua"} use {"lukas-reineke/indent-blankline.nvim", branch = "lua"}
end end
) )

View file

@ -73,5 +73,5 @@ map("n", "<S-t>", [[<Cmd>tabnew<CR>]], opt)
map("n", "<S-x>", [[<Cmd>bdelete<CR>]], opt) map("n", "<S-x>", [[<Cmd>bdelete<CR>]], opt)
-- tabnew and tabprev -- tabnew and tabprev
map("n", "<S-l>", [[<Cmd>BufferLineCycleNext<CR>]], opt) map("n", "<S-,>", [[<Cmd>BufferLineCycleNext<CR>]], opt)
map("n", "<S-p>", [[<Cmd>BufferLineCyclePrev<CR>]], opt) map("n", "<S-.>", [[<Cmd>BufferLineCyclePrev<CR>]], opt)

View file

@ -9,8 +9,6 @@ ts_config.setup {
"lua", "lua",
"json", "json",
"python" "python"
-- "cpp",
-- "rust",
}, },
highlight = { highlight = {
enable = true, enable = true,