Some fixes and add plugins

This commit is contained in:
Tyler Hallada 2022-10-24 12:04:40 -04:00
parent b74d6254bc
commit c154afd495
8 changed files with 40 additions and 3 deletions

View File

@ -117,6 +117,7 @@ return require('packer').startup(function(use)
'weilbith/nvim-code-action-menu', 'weilbith/nvim-code-action-menu',
cmd = 'CodeActionMenu', cmd = 'CodeActionMenu',
} }
use 'onsails/lspkind.nvim'
use { use {
'nvim-treesitter/nvim-treesitter', 'nvim-treesitter/nvim-treesitter',
run = function() require('nvim-treesitter.install').update({ with_sync = true }) end, run = function() require('nvim-treesitter.install').update({ with_sync = true }) end,
@ -270,7 +271,7 @@ return require('packer').startup(function(use)
'kyazdani42/nvim-web-devicons', 'kyazdani42/nvim-web-devicons',
}, },
config = function() config = function()
require('octo').setup() require('plugins.octo-nvim')
end end
} }
use { use {
@ -397,6 +398,12 @@ return require('packer').startup(function(use)
require('plugins.drex-nvim') require('plugins.drex-nvim')
end, end,
} }
use {
'norcalli/nvim-colorizer.lua',
config = function()
require('plugins.nvim-colorizer')
end,
}
use { use {
'folke/which-key.nvim', 'folke/which-key.nvim',
config = function() config = function()

View File

@ -7,3 +7,5 @@ vim.keymap.set('n', '<leader>gp', [[<Cmd>Git push<CR>]], { noremap = false, sile
vim.keymap.set('n', '<leader>gf', [[<Cmd>Git push --force<CR>]], { noremap = false, silent = true }) vim.keymap.set('n', '<leader>gf', [[<Cmd>Git push --force<CR>]], { noremap = false, silent = true })
vim.keymap.set('n', '<leader>gu', [[<Cmd>Git pull<CR>]], { noremap = false, silent = true }) vim.keymap.set('n', '<leader>gu', [[<Cmd>Git pull<CR>]], { noremap = false, silent = true })
vim.keymap.set('n', '<leader>gh', [[<Cmd>Git diff --cached<CR>]], { noremap = false, silent = true }) vim.keymap.set('n', '<leader>gh', [[<Cmd>Git diff --cached<CR>]], { noremap = false, silent = true })
vim.keymap.set('n', '<leader>go', [[<Cmd>Gbrowse<CR>]], { noremap = false, silent = true })
vim.keymap.set('v', '<leader>go', [[<Cmd>Gbrowse<CR>]], { noremap = false, silent = true })

View File

@ -9,5 +9,17 @@ require('lualine').setup({
path = 1, -- 0 = just filename, 1 = relative path, 2 = absolute path path = 1, -- 0 = just filename, 1 = relative path, 2 = absolute path
}, },
}, },
} },
inactive_sections = {
lualine_a = {},
lualine_b = {},
lualine_c = { {
'filename',
file_status = true, -- displays file status (readonly status, modified status)
path = 1 -- 0 = just filename, 1 = relative path, 2 = absolute path
} },
lualine_x = { 'location' },
lualine_y = {},
lualine_z = {}
},
}) })

View File

@ -51,6 +51,7 @@ null_ls.setup({
sources = { sources = {
-- Linter -- Linter
-- null_ls.builtins.diagnostics.eslint_d, -- null_ls.builtins.diagnostics.eslint_d,
-- null_ls.builtins.diagnostics.prettierd,
-- null_ls.builtins.diagnostics.jsonlint, -- null_ls.builtins.diagnostics.jsonlint,
null_ls.builtins.diagnostics.markdownlint, null_ls.builtins.diagnostics.markdownlint,
null_ls.builtins.diagnostics.stylelint, null_ls.builtins.diagnostics.stylelint,

View File

@ -1,4 +1,5 @@
local cmp = require'cmp' local cmp = require('cmp')
local lspkind = require('lspkind')
cmp.setup({ cmp.setup({
experimental = { ghost_text = true }, experimental = { ghost_text = true },
@ -66,6 +67,13 @@ cmp.setup({
comparators = { comparators = {
function(...) return require('cmp_buffer'):compare_locality(...) end, function(...) return require('cmp_buffer'):compare_locality(...) end,
} }
},
formatting = {
format = lspkind.cmp_format({
mode = 'symbol_text',
maxwidth = 50,
ellipsis_char = '',
})
} }
}) })

View File

@ -0,0 +1 @@
require('colorizer').setup()

View File

@ -0,0 +1,4 @@
require('octo').setup()
-- Doesn't work, need to set this in settings too
vim.api.nvim_set_hl(0, 'OctoEditable', { bg = '#313131' })

View File

@ -76,3 +76,5 @@ vim.cmd([[set formatoptions+=wantrqlc]])
vim.g.neovide_scroll_animation_length = 0.3 -- default: 0.3 vim.g.neovide_scroll_animation_length = 0.3 -- default: 0.3
vim.g.neovide_cursor_animation_length = 0.06 vim.g.neovide_cursor_animation_length = 0.06
vim.g.neovide_cursor_trail_size = 0.2 -- default: 0.8 vim.g.neovide_cursor_trail_size = 0.2 -- default: 0.8
vim.api.nvim_set_hl(0, 'OctoEditable', { bg = '#313131' })