Merge pull request 'more ide stuff and formatting' (#7) from more-ide-stuff into master
Reviewed-on: #7
This commit is contained in:
commit
d298ebe40a
|
@ -0,0 +1,9 @@
|
||||||
|
vim.opt.list = true
|
||||||
|
vim.opt.listchars:append "space:⋅"
|
||||||
|
vim.opt.listchars:append "eol:↴"
|
||||||
|
|
||||||
|
require("indent_blankline").setup {
|
||||||
|
space_char_blankline = " ",
|
||||||
|
show_current_context = true,
|
||||||
|
show_current_context_start = true,
|
||||||
|
}
|
|
@ -0,0 +1,8 @@
|
||||||
|
local null_ls = require('null-ls')
|
||||||
|
|
||||||
|
require('null-ls').setup({
|
||||||
|
sources = {
|
||||||
|
null_ls.builtins.diagnostics.selene, -- i forgot what this is, can i delete it?
|
||||||
|
null_ls.builtins.formatting.black,
|
||||||
|
}
|
||||||
|
})
|
|
@ -1,5 +1,5 @@
|
||||||
-- general theme
|
-- general theme
|
||||||
vim.cmd("colorscheme ayu")
|
vim.cmd("colorscheme gruvbox")
|
||||||
|
|
||||||
-- ignore background color for transparency
|
-- ignore background color for transparency
|
||||||
-- vim.cmd("highlight Normal guibg=none")
|
-- vim.cmd("highlight Normal guibg=none")
|
||||||
|
|
|
@ -1,17 +1,20 @@
|
||||||
local cmp = require'cmp'
|
local cmp = require'cmp'
|
||||||
-- local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||||
|
|
||||||
local on_attach = function()
|
local on_attach = function()
|
||||||
vim.keymap.set("n", "K", vim.lsp.buf.hover, {buffer=0})
|
vim.keymap.set("n", "K", vim.lsp.buf.hover, {buffer=0})
|
||||||
vim.keymap.set("n", "gd", vim.lsp.buf.definition, {buffer=0})
|
vim.keymap.set("n", "gd", vim.lsp.buf.definition, {buffer=0})
|
||||||
vim.keymap.set("n", "<Leader>r", vim.lsp.buf.rename, {buffer=0})
|
vim.keymap.set("n", "<Leader>r", vim.lsp.buf.rename, {buffer=0})
|
||||||
|
vim.keymap.set("n", "<Leader>fo", vim.lsp.buf.format, {buffer=0})
|
||||||
end
|
end
|
||||||
|
|
||||||
require'lspconfig'.jedi_language_server.setup{
|
require'lspconfig'.pyright.setup{
|
||||||
|
capabilities = capabilities,
|
||||||
on_attach = on_attach
|
on_attach = on_attach
|
||||||
}
|
}
|
||||||
|
|
||||||
require'lspconfig'.sumneko_lua.setup{
|
require'lspconfig'.sumneko_lua.setup{
|
||||||
|
capabilities = capabilities,
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
settings = {
|
settings = {
|
||||||
Lua = {
|
Lua = {
|
||||||
|
@ -22,7 +25,7 @@ require'lspconfig'.sumneko_lua.setup{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
cmp.setup({
|
cmp.setup({
|
||||||
snippet = {
|
snippet = {
|
||||||
-- REQUIRED - you must specify a snippet engine
|
-- REQUIRED - you must specify a snippet engine
|
||||||
expand = function(args)
|
expand = function(args)
|
||||||
|
|
|
@ -50,35 +50,35 @@ return require('packer').startup(function(use)
|
||||||
-- Vim-surround
|
-- Vim-surround
|
||||||
use('tpope/vim-surround')
|
use('tpope/vim-surround')
|
||||||
|
|
||||||
-- Slime, for tmux repl-ing
|
-- Slime, for tmux repl-ing
|
||||||
use('jpalardy/vim-slime')
|
use('jpalardy/vim-slime')
|
||||||
|
|
||||||
-- Telescope, fuzzy finding
|
-- Telescope, fuzzy finding
|
||||||
use('nvim-lua/plenary.nvim')
|
use('nvim-lua/plenary.nvim')
|
||||||
use('nvim-telescope/telescope.nvim')
|
use('nvim-telescope/telescope.nvim')
|
||||||
use{'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
|
use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
|
||||||
use( "nvim-telescope/telescope-file-browser.nvim")
|
use("nvim-telescope/telescope-file-browser.nvim")
|
||||||
|
|
||||||
-- Treesitter
|
-- Treesitter
|
||||||
use{'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
|
use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
|
||||||
|
|
||||||
-- Devicons
|
-- Devicons
|
||||||
use('kyazdani42/nvim-web-devicons')
|
use('kyazdani42/nvim-web-devicons')
|
||||||
|
|
||||||
-- Registry history
|
-- Registry history
|
||||||
use {
|
use {
|
||||||
"AckslD/nvim-neoclip.lua",
|
"AckslD/nvim-neoclip.lua",
|
||||||
requires = {
|
requires = {
|
||||||
{'kkharji/sqlite.lua', module = 'sqlite'},
|
{ 'kkharji/sqlite.lua', module = 'sqlite' },
|
||||||
{'nvim-telescope/telescope.nvim'},
|
{ 'nvim-telescope/telescope.nvim' },
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
require('neoclip').setup({
|
require('neoclip').setup({
|
||||||
enable_persistent_history = true,
|
enable_persistent_history = true,
|
||||||
continuous_sync = true
|
continuous_sync = true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Buffers
|
-- Buffers
|
||||||
|
@ -87,67 +87,73 @@ return require('packer').startup(function(use)
|
||||||
|
|
||||||
-- Comments
|
-- Comments
|
||||||
use {
|
use {
|
||||||
'numToStr/Comment.nvim',
|
'numToStr/Comment.nvim',
|
||||||
config = function()
|
config = function()
|
||||||
require('Comment').setup()
|
require('Comment').setup()
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Git Repo Telescope
|
-- Git Repo Telescope
|
||||||
use{'cljoly/telescope-repo.nvim'}
|
use { 'cljoly/telescope-repo.nvim' }
|
||||||
|
|
||||||
-- Greeter
|
-- Greeter
|
||||||
use {
|
use {
|
||||||
'goolord/alpha-nvim',
|
'goolord/alpha-nvim',
|
||||||
requires = { 'nvim-tree/nvim-web-devicons' },
|
requires = { 'nvim-tree/nvim-web-devicons' },
|
||||||
config = function ()
|
config = function()
|
||||||
require'alpha'.setup(require'alpha.themes.startify'.config)
|
require 'alpha'.setup(require 'alpha.themes.startify'.config)
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Which-Key
|
-- Which-Key
|
||||||
use {
|
use {
|
||||||
"folke/which-key.nvim",
|
"folke/which-key.nvim",
|
||||||
config = function()
|
config = function()
|
||||||
require("which-key").setup {
|
require("which-key").setup {
|
||||||
-- your configuration comes here
|
-- your configuration comes here
|
||||||
-- or leave it empty to use the default settings
|
-- or leave it empty to use the default settings
|
||||||
-- refer to the configuration section below
|
-- refer to the configuration section below
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Close brackets
|
-- Close brackets
|
||||||
use {
|
use {
|
||||||
"windwp/nvim-autopairs",
|
"windwp/nvim-autopairs",
|
||||||
config = function() require("nvim-autopairs").setup {} end
|
config = function() require("nvim-autopairs").setup {} end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
-- Cursor line
|
||||||
use('yamatsum/nvim-cursorline')
|
use('yamatsum/nvim-cursorline')
|
||||||
require('nvim-cursorline').setup {
|
require('nvim-cursorline').setup {
|
||||||
cursorline = {
|
cursorline = {
|
||||||
enable = true,
|
enable = true,
|
||||||
timeout = 0,
|
timeout = 0,
|
||||||
number = true,
|
number = true,
|
||||||
},
|
},
|
||||||
cursorword = {
|
cursorword = {
|
||||||
enable = false,
|
enable = false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
-- file ex
|
-- file ex
|
||||||
use {
|
use {
|
||||||
"nvim-neo-tree/neo-tree.nvim",
|
"nvim-neo-tree/neo-tree.nvim",
|
||||||
branch = "v2.x",
|
branch = "v2.x",
|
||||||
requires = {
|
requires = {
|
||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
|
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
|
||||||
"MunifTanjim/nui.nvim",
|
"MunifTanjim/nui.nvim",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end
|
-- Indent lines
|
||||||
|
require("packer").startup(function()
|
||||||
|
use "lukas-reineke/indent-blankline.nvim"
|
||||||
|
end)
|
||||||
|
|
||||||
|
-- Object Explorer
|
||||||
|
use 'simrat39/symbols-outline.nvim'
|
||||||
|
|
||||||
|
end
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue