git and colorscheme
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
vim.cmd [[
|
vim.cmd [[
|
||||||
try
|
try
|
||||||
colorscheme gruvbox-material
|
colorscheme oxocarbon
|
||||||
catch /^Vim\%((\a\+)\)\=:E185/
|
catch /^Vim\%((\a\+)\)\=:E185/
|
||||||
colorscheme default
|
colorscheme default
|
||||||
set background=dark
|
set background=dark
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ end
|
|||||||
|
|
||||||
local lspconfig = require("lspconfig")
|
local lspconfig = require("lspconfig")
|
||||||
|
|
||||||
local servers = { "jsonls", "sumneko_lua" }
|
local servers = { "jsonls", "sumneko_lua" , "pyright"}
|
||||||
|
|
||||||
lsp_installer.setup({
|
lsp_installer.setup({
|
||||||
ensure_installed = servers,
|
ensure_installed = servers,
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ null_ls.setup({
|
|||||||
formatting.prettier.with({ extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote" } }),
|
formatting.prettier.with({ extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote" } }),
|
||||||
formatting.black.with({ extra_args = { "--fast" } }),
|
formatting.black.with({ extra_args = { "--fast" } }),
|
||||||
formatting.stylua,
|
formatting.stylua,
|
||||||
diagnostics.flake8,
|
--diagnostics.flake8,
|
||||||
diagnostics.cppcheck,
|
diagnostics.cppcheck,
|
||||||
code_actions.refactoring
|
code_actions.refactoring
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -19,12 +19,12 @@ local options = {
|
|||||||
updatetime = 300, -- faster completion (4000ms default)
|
updatetime = 300, -- faster completion (4000ms default)
|
||||||
writebackup = false, -- if a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited
|
writebackup = false, -- if a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited
|
||||||
expandtab = true, -- convert tabs to spaces
|
expandtab = true, -- convert tabs to spaces
|
||||||
shiftwidth = 2, -- the number of spaces inserted for each indentation
|
shiftwidth = 4, -- the number of spaces inserted for each indentation
|
||||||
tabstop = 4, -- insert 2 spaces for a tab
|
tabstop = 4, -- insert 2 spaces for a tab
|
||||||
number = true, -- set numbered lines
|
number = true, -- set numbered lines
|
||||||
relativenumber = true, -- set relative numbered lines
|
relativenumber = true, -- set relative numbered lines
|
||||||
numberwidth = 4, -- set number column width to 2 {default 4}
|
numberwidth = 4, -- set number column width to 2 {default 4}
|
||||||
wrap = false, -- display lines as one long line
|
wrap = true, -- display lines as one long line
|
||||||
scrolloff = 12, -- is one of my fav
|
scrolloff = 12, -- is one of my fav
|
||||||
sidescrolloff = 8,
|
sidescrolloff = 8,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,9 +37,9 @@ return packer.startup(function(use)
|
|||||||
use "wbthomason/packer.nvim" -- Have packer manage itself
|
use "wbthomason/packer.nvim" -- Have packer manage itself
|
||||||
use "nvim-lua/popup.nvim" -- Popup API of vim in Neovim
|
use "nvim-lua/popup.nvim" -- Popup API of vim in Neovim
|
||||||
use "nvim-lua/plenary.nvim" -- Lua lib required by other plugins
|
use "nvim-lua/plenary.nvim" -- Lua lib required by other plugins
|
||||||
|
|
||||||
-- Colorschemes
|
-- Colorschemes
|
||||||
use "sainnhe/gruvbox-material"
|
use "sainnhe/gruvbox-material"
|
||||||
|
use {'shaunsingh/oxocarbon.nvim', run = './install.sh'}
|
||||||
|
|
||||||
--cmp plugins
|
--cmp plugins
|
||||||
use "hrsh7th/nvim-cmp" -- The completion plugin
|
use "hrsh7th/nvim-cmp" -- The completion plugin
|
||||||
@@ -66,8 +66,8 @@ return packer.startup(function(use)
|
|||||||
|
|
||||||
-- Git Stuff
|
-- Git Stuff
|
||||||
use "lewis6991/gitsigns.nvim"
|
use "lewis6991/gitsigns.nvim"
|
||||||
|
use "f-person/git-blame.nvim"
|
||||||
|
use "tpope/vim-fugitive"
|
||||||
-- nvim-tree
|
-- nvim-tree
|
||||||
use "kyazdani42/nvim-tree.lua"
|
use "kyazdani42/nvim-tree.lua"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user