Compare commits

..

No commits in common. "d465dd1e91496fe44344fc779c06c9aee7e739b9" and "ed63791365a13163ef57104f5922881b1250b1f6" have entirely different histories.

5 changed files with 47 additions and 107 deletions

View File

@ -1,16 +0,0 @@
require("lsp-format").setup {}
local on_attach = function(client)
require("lsp-format").on_attach(client)
-- ... custom code ...
end
require("lspconfig").bashls.setup { on_attach = on_attach }
require("lspconfig").clangd.setup { on_attach = on_attach }
require("lspconfig").julials.setup { on_attach = on_attach }
require("lspconfig").lua_ls.setup { on_attach = on_attach }
require("lspconfig").ltex.setup { on_attach = on_attach }
require("lspconfig").pylsp.setup { on_attach = on_attach }
require("lspconfig").texlab.setup { on_attach = on_attach }
require("lspconfig").zls.setup { on_attach = on_attach }

View File

@ -1,6 +1,6 @@
function ColorMyPencils(color) function ColorMyPencils(color)
color = color or "tokyonight-night" color = color or "rose-pine"
vim.cmd.colorscheme(color) vim.cmd.colorscheme(color)
--vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) --vim.api.nvim_set_hl(0, "Normal", { bg = "none" })

View File

@ -1,39 +1,25 @@
local lsp = require('lsp-zero').preset({}) local lsp = require('lsp-zero').preset({})
lsp.on_attach(function(client, bufnr) lsp.on_attach(function(client, bufnr)
lsp.default_keymaps({ buffer = bufnr }) lsp.default_keymaps({buffer = bufnr})
end) end)
-- Language servers -- Language servers
if (MY_OS == 'Linux') lsp.ensure_installed({
then -- Replace these with whatever servers you want to install
lsp.ensure_installed({ 'bashls',
-- Replace these with whatever servers you want to install --'clangd',
'bashls', 'julials',
'clangd', --'lua_ls',
'julials', --'ltex',
'lua_ls', 'pylsp',
'ltex', --'texlab',
'pylsp', --'zls'
'texlab', })
--'zls'
})
elseif (MY_OS == 'FreeBSD')
then
lsp.ensure_installed({
-- Replace these with whatever servers you want to install
'bashls',
'julials',
'pylsp',
})
else
print('Should never be here')
end
--[[ --[[
START LANGUAGE SERVERS CONFIG HERE!!! START LANGUAGE SERVERS CONFIG HERE!!!
]] ]]--
--
-- (Optional) Configure lua language server for neovim -- (Optional) Configure lua language server for neovim
@ -41,61 +27,44 @@ require('lspconfig').bashls.setup({})
require('lspconfig').clangd.setup({}) require('lspconfig').clangd.setup({})
--require('lspconfig').gopls.setup({}) --require('lspconfig').gopls.setup({
-- on_attach = on_attach,
--})
require('lspconfig').julials.setup({}) require('lspconfig').julials.setup({
--on_attach = on_attach,
require('lspconfig').lua_ls.setup({ symbol_cache_download = true,
settings = { --symbol_server = "https://symbol-server",
Lua = { on_new_config = function(new_config, _)
runtime = { local julia = vim.fn.expand("/usr/local/share/julia/bin/julia")
-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) if require'lspconfig'.util.path.is_file(julia) then
version = 'LuaJIT', vim.notify("Hello!")
}, new_config.cmd[1] = julia
diagnostics = { end
-- Get the language server to recognize the `vim` global end
globals = { 'vim' },
neededFileStatus = {
["codestyle-check"] = "Any",
},
},
workspace = {
-- Make the server aware of Neovim runtime files
library = vim.api.nvim_get_runtime_file("", true),
},
-- Do not send telemetry data containing a randomized but unique identifier
telemetry = {
enable = false,
},
format = {
enable = true,
-- Put format options here
-- NOTE: the value should be STRING!!
defaultConfig = {
indent_style = "space",
indent_size = "4",
}
},
},
},
}) })
require('lspconfig').lua_ls.setup(lsp.nvim_lua_ls())
require('lspconfig').texlab.setup({})
local path = vim.fn.stdpath("config") .. "/after/plugin/dictionary-gb.txt" local path = vim.fn.stdpath("config") .. "/after/plugin/dictionary-gb.txt"
local words = {} local words = {}
for word in io.open(path, "r"):lines() do for word in io.open(path, "r"):lines() do
table.insert(words, word) table.insert(words, word)
end end
require('lspconfig').ltex.setup({ require('lspconfig').ltex.setup({
settings = { settings = {
ltex = { ltex = {
language = "en-GB", language = "en-GB",
dictionary = { dictionary = {
["en-GB"] = words, ["en-GB"] = words,
}, },
}, },
}, },
}) })
-- source: https://rust-analyzer.github.io/manual.html#nvim-lsp -- source: https://rust-analyzer.github.io/manual.html#nvim-lsp
@ -116,7 +85,6 @@ require('lspconfig').zls.setup({})
--[[ --[[
END LANGUAGE SERVERS CONFIG HERE!!! END LANGUAGE SERVERS CONFIG HERE!!!
]] ]]--
--
lsp.setup() lsp.setup()

View File

@ -1,8 +1 @@
require("eddie") require("eddie")
local f = io.popen("uname -s")
if (f ~= nil) then
MY_OS = f:read("*a")
MY_OS = string.gsub(MY_OS, "%s+", "")
f:close()
end

View File

@ -15,15 +15,13 @@ return require('packer').startup(function(use)
} }
-- Colorscheme -- Colorscheme
--use({ use({
-- 'rose-pine/neovim', 'rose-pine/neovim',
-- as = 'rose-pine', as = 'rose-pine',
-- config = function() config = function()
-- vim.cmd('colorscheme rose-pine') vim.cmd('colorscheme rose-pine')
-- end end
--}) })
use { "folke/tokyonight.nvim" }
-- Color Coloring -- Color Coloring
use({ 'nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' } }) use({ 'nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' } })
@ -61,9 +59,6 @@ return require('packer').startup(function(use)
} }
} }
-- Code formatting
use "lukas-reineke/lsp-format.nvim"
-- Latex on NVIM -- Latex on NVIM
use 'lervag/vimtex' use 'lervag/vimtex'