vim is shitware
This commit is contained in:
parent
66eab26125
commit
30b6a57ee4
3 changed files with 62 additions and 23 deletions
15
init.lua
15
init.lua
|
@ -1,6 +1,7 @@
|
||||||
local packer = require("ensure-packer");
|
local packer = require("ensure-packer");
|
||||||
local plugins = require("plugins");
|
local plugins = require("plugins");
|
||||||
local settings = require("settings");
|
local settings = require("settings");
|
||||||
|
--local telescope = require("telescope");
|
||||||
|
|
||||||
-- Theme Section
|
-- Theme Section
|
||||||
vim.cmd("colorscheme onedark")
|
vim.cmd("colorscheme onedark")
|
||||||
|
@ -13,9 +14,13 @@ require('lualine').setup {
|
||||||
-- Comment
|
-- Comment
|
||||||
require('Comment').setup()
|
require('Comment').setup()
|
||||||
|
|
||||||
|
-- Gitsigns
|
||||||
|
require('gitsigns').setup()
|
||||||
|
--require('telescope').setup()
|
||||||
|
--require('telescope').setup {}
|
||||||
-- Mason
|
-- Mason
|
||||||
require("mason").setup()
|
-- require("mason").setup()
|
||||||
require("mason-lspconfig").setup({
|
-- require("mason-lspconfig").setup({
|
||||||
ensure_installed = { "rust_analyzer", "pylsp" },
|
-- ensure_installed = { "rust_analyzer", "pylsp" },
|
||||||
automatic_installation = true,
|
-- automatic_installation = true,
|
||||||
})
|
-- })
|
||||||
|
|
|
@ -1,22 +1,56 @@
|
||||||
require('packer').startup(function(use)
|
require('packer').startup(function(use)
|
||||||
use 'wbthomason/packer.nvim'
|
use 'wbthomason/packer.nvim'
|
||||||
use 'neovim/lsp'
|
use 'gpanders/editorconfig.nvim'
|
||||||
use 'neovim/nvim-lspconfig'
|
use 'navarasu/onedark.nvim'
|
||||||
use { 'nvim-treesitter/nvim-treesitter', run = function()
|
use 'lewis6991/gitsigns.nvim'
|
||||||
local ts_update = require('nvim-treesitter.install').update({ with_sync = true })
|
|
||||||
ts_update()
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
use 'williamboman/mason.nvim'
|
|
||||||
use 'williamboman/mason-lspconfig.nvim'
|
|
||||||
use 'hrsh7th/nvim-cmp'
|
|
||||||
use 'hrsh7th/cmp-nvim-lsp'
|
|
||||||
use { 'nvim-lualine/lualine.nvim', requires = { 'kyazdani42/nvim-web-devicons', opt = true } }
|
|
||||||
use 'numToStr/Comment.nvim'
|
use 'numToStr/Comment.nvim'
|
||||||
|
use {
|
||||||
|
'nvim-lualine/lualine.nvim',
|
||||||
|
requires = {
|
||||||
|
'kyazdani42/nvim-web-devicons',
|
||||||
|
opt = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-- use {
|
||||||
|
-- 'VonHeikemen/lsp-zero.nvim',
|
||||||
|
-- requires = {
|
||||||
|
-- -- LSP Support
|
||||||
|
-- {'neovim/nvim-lspconfig'},
|
||||||
|
-- {'williamboman/mason.nvim'},
|
||||||
|
-- {'williamboman/mason-lspconfig.nvim'},
|
||||||
|
|
||||||
-- Automatically set up your configuration after cloning packer.nvim
|
-- -- Autocompletion
|
||||||
-- Put this at the end after all plugins
|
-- {'hrsh7th/nvim-cmp'},
|
||||||
if packer_bootstrap then
|
-- {'hrsh7th/cmp-buffer'},
|
||||||
require('packer').sync()
|
-- {'hrsh7th/cmp-path'},
|
||||||
end
|
-- {'saadparwaiz1/cmp_luasnip'},
|
||||||
|
-- {'hrsh7th/cmp-nvim-lsp'},
|
||||||
|
-- {'hrsh7th/cmp-nvim-lua'},
|
||||||
|
|
||||||
|
-- -- Snippets
|
||||||
|
-- {'L3MON4D3/LuaSnip'},
|
||||||
|
-- {'rafamadriz/friendly-snippets'},
|
||||||
|
-- }
|
||||||
|
-- }
|
||||||
|
-- use 'neovim/lsp'
|
||||||
|
-- use 'neovim/nvim-lspconfig'
|
||||||
|
-- use {
|
||||||
|
-- 'nvim-treesitter/nvim-treesitter',
|
||||||
|
-- run = function()
|
||||||
|
-- local ts_update = require('nvim-treesitter.install').update({
|
||||||
|
-- with_sync = true
|
||||||
|
-- })
|
||||||
|
-- ts_update()
|
||||||
|
-- end
|
||||||
|
-- }
|
||||||
|
-- use 'williamboman/mason.nvim'
|
||||||
|
-- use 'williamboman/mason-lspconfig.nvim'
|
||||||
|
-- use 'hrsh7th/nvim-cmp'
|
||||||
|
-- use 'hrsh7th/cmp-nvim-lsp'
|
||||||
|
|
||||||
|
-- Automatically set up your configuration after cloning packer.nvim
|
||||||
|
-- Put this at the end after all plugins
|
||||||
|
if packer_bootstrap then
|
||||||
|
require('packer').sync()
|
||||||
|
end
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -28,7 +28,7 @@ o.tabstop = 4
|
||||||
o.shiftwidth = 0
|
o.shiftwidth = 0
|
||||||
o.softtabstop = -1 -- If negative, shiftwidth value is used
|
o.softtabstop = -1 -- If negative, shiftwidth value is used
|
||||||
o.list = true
|
o.list = true
|
||||||
o.listchars = 'eol:¬,space:·,lead: ,trail:·,nbsp:◇,tab:→-,extends:▸,precedes:◂,multispace:···⬝,leadmultispace:│ ,'
|
-- o.listchars = 'eol:¬,space:·,lead: ,trail:·,nbsp:◇,tab:→-,extends:▸,precedes:◂,multispace:···⬝,leadmultispace:│ ,'
|
||||||
-- o.formatoptions = 'qrn1'
|
-- o.formatoptions = 'qrn1'
|
||||||
|
|
||||||
-- Makes neovim and host OS clipboard play nicely with each other
|
-- Makes neovim and host OS clipboard play nicely with each other
|
||||||
|
|
Loading…
Reference in a new issue