Revert "Refactor theme and status line into their own file"

This reverts commit cdaa750c86.
This commit is contained in:
Chris Patti 2023-06-04 16:10:59 +00:00
parent cdaa750c86
commit 5e4d24cb2f
4 changed files with 34 additions and 33 deletions

View File

@ -122,18 +122,35 @@ require('lazy').setup({
changedelete = { text = '~' }, changedelete = { text = '~' },
}, },
on_attach = function(bufnr) on_attach = function(bufnr)
vim.keymap.set('n', '[c', require('gitsigns').prev_hunk, { buffer = bufnr, desc = 'Go to Previous Hunk' }) vim.keymap.set('n', '<leader>gp', require('gitsigns').prev_hunk, { buffer = bufnr, desc = '[G]o to [P]revious Hunk' })
vim.keymap.set('n', ']c', require('gitsigns').next_hunk, { buffer = bufnr, desc = 'Go to Next Hunk' }) vim.keymap.set('n', '<leader>gn', require('gitsigns').next_hunk, { buffer = bufnr, desc = '[G]o to [N]ext Hunk' })
vim.keymap.set('n', '<leader>ph', require('gitsigns').preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' }) vim.keymap.set('n', '<leader>ph', require('gitsigns').preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' })
end, end,
}, },
}, },
-- Theme related configs go here {
require 'kickstart.plugins.theme', -- Theme inspired by Atom
'navarasu/onedark.nvim',
priority = 1000,
config = function()
vim.cmd.colorscheme 'onedark'
end,
},
-- Status line related configs go here {
require 'kickstart.plugins.statusline', -- Set lualine as statusline
'nvim-lualine/lualine.nvim',
-- See `:help lualine.txt`
opts = {
options = {
icons_enabled = false,
theme = 'onedark',
component_separators = '|',
section_separators = '',
},
},
},
{ {
-- Add indentation guides even on blank lines -- Add indentation guides even on blank lines

View File

@ -5,7 +5,6 @@
return { return {
'neovim/nvim-lspconfig', 'neovim/nvim-lspconfig',
config = function() config = function()
-- Switch for controlling whether you want autoformatting. -- Switch for controlling whether you want autoformatting.
-- Use :KickstartFormatToggle to toggle autoformatting on or off -- Use :KickstartFormatToggle to toggle autoformatting on or off
@ -29,9 +28,11 @@ return {
return _augroups[client.id] return _augroups[client.id]
end end
-- Whenever an LSP attaches to a buffer, we will run this function.
--
-- See `:help LspAttach` for more information about this autocmd event.
vim.api.nvim_create_autocmd('LspAttach', { vim.api.nvim_create_autocmd('LspAttach', {
group = vim.api.nvim_create_augroup('kickstart-lsp-attach-format', { clear = true }), group = vim.api.nvim_create_augroup('kickstart-lsp-attach-format', { clear = true }),
-- This is where we attach the autoformatting for reasonable clients -- This is where we attach the autoformatting for reasonable clients
callback = function(args) callback = function(args)
local client_id = args.data.client_id local client_id = args.data.client_id
@ -49,6 +50,8 @@ return {
return return
end end
-- Create an autocmd that will run *before* we save the buffer.
-- Run the formatting command for the LSP that has just attached.
vim.api.nvim_create_autocmd('BufWritePre', { vim.api.nvim_create_autocmd('BufWritePre', {
group = get_augroup(client), group = get_augroup(client),
buffer = bufnr, buffer = bufnr,
@ -57,7 +60,12 @@ return {
return return
end end
vim.lsp.buf.format { async = false } vim.lsp.buf.format {
async = false,
filter = function(c)
return c.id == client.id
end,
}
end, end,
}) })
end, end,

View File

@ -1,14 +0,0 @@
return {
-- Set lualine as statusline
'nvim-lualine/lualine.nvim',
-- See `:help lualine.txt`
opts = {
options = {
icons_enabled = false,
theme = 'tokyonight',
component_separators = '|',
section_separators = '',
},
},
}

View File

@ -1,10 +0,0 @@
return {
"folke/tokyonight.nvim",
lazy = false,
priority = 1000,
opts = {},
config = function()
vim.cmd.colorscheme 'tokyonight-storm'
end,
}