From 30b6a57ee454f9c1f254114d07a74c458c5042f1 Mon Sep 17 00:00:00 2001 From: Imbus Date: Thu, 15 Dec 2022 21:41:24 +0100 Subject: [PATCH] vim is shitware --- init.lua | 15 +++++++---- lua/plugins.lua | 68 ++++++++++++++++++++++++++++++++++++------------ lua/settings.lua | 2 +- 3 files changed, 62 insertions(+), 23 deletions(-) diff --git a/init.lua b/init.lua index a12a51f..2e3b1f6 100644 --- a/init.lua +++ b/init.lua @@ -1,6 +1,7 @@ local packer = require("ensure-packer"); local plugins = require("plugins"); local settings = require("settings"); +--local telescope = require("telescope"); -- Theme Section vim.cmd("colorscheme onedark") @@ -13,9 +14,13 @@ require('lualine').setup { -- Comment require('Comment').setup() +-- Gitsigns +require('gitsigns').setup() +--require('telescope').setup() +--require('telescope').setup {} -- Mason -require("mason").setup() -require("mason-lspconfig").setup({ - ensure_installed = { "rust_analyzer", "pylsp" }, - automatic_installation = true, -}) +-- require("mason").setup() +-- require("mason-lspconfig").setup({ +-- ensure_installed = { "rust_analyzer", "pylsp" }, +-- automatic_installation = true, +-- }) diff --git a/lua/plugins.lua b/lua/plugins.lua index e9e4492..64ca75c 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -1,22 +1,56 @@ require('packer').startup(function(use) use 'wbthomason/packer.nvim' - 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' - use { 'nvim-lualine/lualine.nvim', requires = { 'kyazdani42/nvim-web-devicons', opt = true } } + use 'gpanders/editorconfig.nvim' + use 'navarasu/onedark.nvim' + use 'lewis6991/gitsigns.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 - -- Put this at the end after all plugins - if packer_bootstrap then - require('packer').sync() - end + -- -- Autocompletion + -- {'hrsh7th/nvim-cmp'}, + -- {'hrsh7th/cmp-buffer'}, + -- {'hrsh7th/cmp-path'}, + -- {'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) diff --git a/lua/settings.lua b/lua/settings.lua index 8eb9a79..677cdb7 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -28,7 +28,7 @@ o.tabstop = 4 o.shiftwidth = 0 o.softtabstop = -1 -- If negative, shiftwidth value is used 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' -- Makes neovim and host OS clipboard play nicely with each other