WIP: Switch to NixOS #5
7 changed files with 35 additions and 29 deletions
|
@ -1 +1 @@
|
|||
require("bufferline").setup{}
|
||||
require('bufferline').setup{}
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
require("catppuccin").setup({
|
||||
require('catppuccin').setup({
|
||||
transparent_background = false,
|
||||
term_colors = false,
|
||||
compile = {enabled = true, path = vim.fn.stdpath "cache" .. "/catppuccin"},
|
||||
compile = {enabled = true, path = vim.fn.stdpath 'cache' .. '/catppuccin'},
|
||||
styles = {
|
||||
comments = {"italic"},
|
||||
functions = {"italic"},
|
||||
keywords = {"italic"},
|
||||
comments = {'italic'},
|
||||
functions = {'italic'},
|
||||
keywords = {'italic'},
|
||||
strings = {},
|
||||
variables = {}
|
||||
},
|
||||
|
@ -14,16 +14,16 @@ require("catppuccin").setup({
|
|||
native_lsp = {
|
||||
enabled = true,
|
||||
virtual_text = {
|
||||
errors = {"italic"},
|
||||
hints = {"italic"},
|
||||
warnings = {"italic"},
|
||||
information = {"italic"}
|
||||
errors = {'italic'},
|
||||
hints = {'italic'},
|
||||
warnings = {'italic'},
|
||||
information = {'italic'}
|
||||
},
|
||||
underlines = {
|
||||
errors = {"underline"},
|
||||
hints = {"underline"},
|
||||
warnings = {"underline"},
|
||||
information = {"underline"}
|
||||
errors = {'underline'},
|
||||
hints = {'underline'},
|
||||
warnings = {'underline'},
|
||||
information = {'underline'}
|
||||
}
|
||||
},
|
||||
lsp_trouble = false,
|
||||
|
|
|
@ -54,4 +54,4 @@ cmp.setup {
|
|||
}
|
||||
|
||||
-- load friendly-snippets to luasnip
|
||||
require("luasnip/loaders/from_vscode").lazy_load()
|
||||
require('luasnip/loaders/from_vscode').lazy_load()
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
vim.opt.list = true
|
||||
|
||||
require("indent_blankline").setup {
|
||||
space_char_blankline = " ",
|
||||
require('indent_blankline').setup {
|
||||
space_char_blankline = ' ',
|
||||
show_current_context = true,
|
||||
show_current_context_start = true,
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
local lsp_installer = require("nvim-lsp-installer")
|
||||
local lsp_installer = require('nvim-lsp-installer')
|
||||
|
||||
local M = {}
|
||||
|
||||
|
@ -47,15 +47,18 @@ end
|
|||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||
capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
|
||||
|
||||
-- Setup LSP signature plugin
|
||||
require('lsp_signature').setup()
|
||||
|
||||
-- Register a handler that will be called for all installed servers.
|
||||
lsp_installer.on_server_ready(function(server)
|
||||
-- Don't setup jdtls here since it is done by nvim-jdtls
|
||||
if server.name == "jdtls" then return end
|
||||
if server.name == 'jdtls' then return end
|
||||
|
||||
local opts = {}
|
||||
|
||||
-- Lua specific settings
|
||||
if server.name == "sumneko_lua" then
|
||||
if server.name == 'sumneko_lua' then
|
||||
local runtime_path = vim.split(package.path, ';')
|
||||
opts.settings = {
|
||||
Lua = {
|
||||
|
@ -71,7 +74,7 @@ lsp_installer.on_server_ready(function(server)
|
|||
},
|
||||
workspace = {
|
||||
-- Make the server aware of Neovim runtime files
|
||||
library = vim.api.nvim_get_runtime_file("", true)
|
||||
library = vim.api.nvim_get_runtime_file('', true)
|
||||
},
|
||||
-- Do not send telemetry data containing a randomized but unique identifier
|
||||
telemetry = {enable = false}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
require'nvim-treesitter.configs'.setup {
|
||||
ensure_installed = {
|
||||
"bash", "c", "css", "dockerfile", "html", "http", "java", "json",
|
||||
"json5", "latex", "lua", "make", "markdown", "php", "python", "regex",
|
||||
"rst", "scss", "toml", "tsx", "typescript", "javascript", "yaml"
|
||||
'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json',
|
||||
'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python', 'regex',
|
||||
'rst', 'scss', 'toml', 'tsx', 'typescript', 'javascript', 'yaml'
|
||||
},
|
||||
highlight = {enable = true},
|
||||
indent = {enable = true},
|
||||
|
|
|
@ -20,7 +20,7 @@ require('packer').startup(function()
|
|||
use {'wbthomason/packer.nvim', opt = true}
|
||||
|
||||
-- Colorscheme
|
||||
use({"catppuccin/nvim", as = "catppuccin"})
|
||||
use({'catppuccin/nvim', as = 'catppuccin'})
|
||||
|
||||
-- Git in signcolumn
|
||||
use 'airblade/vim-gitgutter'
|
||||
|
@ -34,7 +34,7 @@ require('packer').startup(function()
|
|||
-- Tabline/bufferline
|
||||
use {
|
||||
'akinsho/nvim-bufferline.lua',
|
||||
tag = "*",
|
||||
tag = '*',
|
||||
requires = 'kyazdani42/nvim-web-devicons'
|
||||
}
|
||||
|
||||
|
@ -42,7 +42,7 @@ require('packer').startup(function()
|
|||
use 'tpope/vim-fugitive'
|
||||
|
||||
-- Indent characters
|
||||
use "lukas-reineke/indent-blankline.nvim"
|
||||
use 'lukas-reineke/indent-blankline.nvim'
|
||||
|
||||
-- Tree explorer
|
||||
use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'}
|
||||
|
@ -70,13 +70,16 @@ require('packer').startup(function()
|
|||
-- Additional LSP features for Java
|
||||
use 'mfussenegger/nvim-jdtls'
|
||||
|
||||
-- Display function signature
|
||||
use {'ray-x/lsp_signature.nvim'}
|
||||
|
||||
-- Completion
|
||||
use 'hrsh7th/nvim-cmp' -- Autocompletion plugin
|
||||
use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp
|
||||
use 'hrsh7th/cmp-path' -- Path source for nvim-cmp
|
||||
use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp
|
||||
use 'L3MON4D3/LuaSnip' -- Snippets plugin
|
||||
use "rafamadriz/friendly-snippets" -- Snippets collection
|
||||
use 'rafamadriz/friendly-snippets' -- Snippets collection
|
||||
|
||||
-- treesitter syntax highlight
|
||||
use {
|
||||
|
@ -118,7 +121,7 @@ require('packer').startup(function()
|
|||
use 'habamax/vim-asciidoctor'
|
||||
|
||||
-- Modern filetype.vim replacement
|
||||
use("nathom/filetype.nvim")
|
||||
use('nathom/filetype.nvim')
|
||||
|
||||
end)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue