diff --git a/nvim/.config/nvim/after/plugin/indent-blankline.lua b/nvim/.config/nvim/after/plugin/indent-blankline.lua new file mode 100644 index 0000000..8086ee6 --- /dev/null +++ b/nvim/.config/nvim/after/plugin/indent-blankline.lua @@ -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, +} diff --git a/nvim/.config/nvim/after/plugin/null-ls.lua b/nvim/.config/nvim/after/plugin/null-ls.lua new file mode 100644 index 0000000..1a0c59b --- /dev/null +++ b/nvim/.config/nvim/after/plugin/null-ls.lua @@ -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, + } +}) diff --git a/nvim/.config/nvim/lua/clint/colorscheme.lua b/nvim/.config/nvim/lua/clint/colorscheme.lua index 2675ff0..710cd1e 100644 --- a/nvim/.config/nvim/lua/clint/colorscheme.lua +++ b/nvim/.config/nvim/lua/clint/colorscheme.lua @@ -1,5 +1,5 @@ -- general theme -vim.cmd("colorscheme ayu") +vim.cmd("colorscheme gruvbox") -- ignore background color for transparency -- vim.cmd("highlight Normal guibg=none") diff --git a/nvim/.config/nvim/lua/clint/lsp.lua b/nvim/.config/nvim/lua/clint/lsp.lua index f8f1346..710eb90 100644 --- a/nvim/.config/nvim/lua/clint/lsp.lua +++ b/nvim/.config/nvim/lua/clint/lsp.lua @@ -1,17 +1,20 @@ local cmp = require'cmp' --- local capabilities = require('cmp_nvim_lsp').default_capabilities() +local capabilities = require('cmp_nvim_lsp').default_capabilities() local on_attach = function() 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", "r", vim.lsp.buf.rename, {buffer=0}) + vim.keymap.set("n", "fo", vim.lsp.buf.format, {buffer=0}) end -require'lspconfig'.jedi_language_server.setup{ +require'lspconfig'.pyright.setup{ + capabilities = capabilities, on_attach = on_attach } require'lspconfig'.sumneko_lua.setup{ + capabilities = capabilities, on_attach = on_attach, settings = { Lua = { @@ -22,7 +25,7 @@ require'lspconfig'.sumneko_lua.setup{ } } - cmp.setup({ +cmp.setup({ snippet = { -- REQUIRED - you must specify a snippet engine expand = function(args) diff --git a/nvim/.config/nvim/lua/clint/plugins.lua b/nvim/.config/nvim/lua/clint/plugins.lua index a2ad287..8139293 100644 --- a/nvim/.config/nvim/lua/clint/plugins.lua +++ b/nvim/.config/nvim/lua/clint/plugins.lua @@ -50,35 +50,35 @@ return require('packer').startup(function(use) -- Vim-surround use('tpope/vim-surround') - -- Slime, for tmux repl-ing + -- Slime, for tmux repl-ing use('jpalardy/vim-slime') -- Telescope, fuzzy finding use('nvim-lua/plenary.nvim') use('nvim-telescope/telescope.nvim') - use{'nvim-telescope/telescope-fzf-native.nvim', run = 'make' } - use( "nvim-telescope/telescope-file-browser.nvim") + use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' } + use("nvim-telescope/telescope-file-browser.nvim") -- Treesitter - use{'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' } + use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' } -- Devicons use('kyazdani42/nvim-web-devicons') -- Registry history use { - "AckslD/nvim-neoclip.lua", - requires = { - {'kkharji/sqlite.lua', module = 'sqlite'}, - {'nvim-telescope/telescope.nvim'}, - }, - config = function() - require('neoclip').setup({ - enable_persistent_history = true, - continuous_sync = true - } - ) - end, + "AckslD/nvim-neoclip.lua", + requires = { + { 'kkharji/sqlite.lua', module = 'sqlite' }, + { 'nvim-telescope/telescope.nvim' }, + }, + config = function() + require('neoclip').setup({ + enable_persistent_history = true, + continuous_sync = true + } + ) + end, } -- Buffers @@ -87,67 +87,73 @@ return require('packer').startup(function(use) -- Comments use { - 'numToStr/Comment.nvim', - config = function() - require('Comment').setup() - end + 'numToStr/Comment.nvim', + config = function() + require('Comment').setup() + end } -- Git Repo Telescope - use{'cljoly/telescope-repo.nvim'} + use { 'cljoly/telescope-repo.nvim' } -- Greeter use { - 'goolord/alpha-nvim', - requires = { 'nvim-tree/nvim-web-devicons' }, - config = function () - require'alpha'.setup(require'alpha.themes.startify'.config) - end + 'goolord/alpha-nvim', + requires = { 'nvim-tree/nvim-web-devicons' }, + config = function() + require 'alpha'.setup(require 'alpha.themes.startify'.config) + end } -- Which-Key use { - "folke/which-key.nvim", - config = function() - require("which-key").setup { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - } - end + "folke/which-key.nvim", + config = function() + require("which-key").setup { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + } + end } -- Close brackets use { - "windwp/nvim-autopairs", - config = function() require("nvim-autopairs").setup {} end + "windwp/nvim-autopairs", + config = function() require("nvim-autopairs").setup {} end } - + -- Cursor line use('yamatsum/nvim-cursorline') require('nvim-cursorline').setup { - cursorline = { - enable = true, - timeout = 0, - number = true, - }, - cursorword = { - enable = false, - } + cursorline = { + enable = true, + timeout = 0, + number = true, + }, + cursorword = { + enable = false, + } } -- file ex use { - "nvim-neo-tree/neo-tree.nvim", - branch = "v2.x", - requires = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended - "MunifTanjim/nui.nvim", - } - } + "nvim-neo-tree/neo-tree.nvim", + branch = "v2.x", + requires = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended + "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 ) - -