Skip to content

Commit

Permalink
Revert "Refactor theme and status line into their own file"
Browse files Browse the repository at this point in the history
This reverts commit cdaa750.
  • Loading branch information
feoh committed Jun 4, 2023
1 parent cdaa750 commit 5e4d24c
Showing 4 changed files with 34 additions and 33 deletions.
29 changes: 23 additions & 6 deletions init.lua
Original file line number Diff line number Diff line change
@@ -122,18 +122,35 @@ require('lazy').setup({
changedelete = { text = '~' },
},
on_attach = function(bufnr)
vim.keymap.set('n', '[c', require('gitsigns').prev_hunk, { buffer = bufnr, desc = 'Go to Previous Hunk' })
vim.keymap.set('n', ']c', require('gitsigns').next_hunk, { buffer = bufnr, desc = 'Go to Next Hunk' })
vim.keymap.set('n', '<leader>gp', require('gitsigns').prev_hunk, { buffer = bufnr, desc = '[G]o to [P]revious 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' })
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
14 changes: 11 additions & 3 deletions lua/kickstart/plugins/autoformat.lua
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@

return {
'neovim/nvim-lspconfig',

config = function()
-- Switch for controlling whether you want autoformatting.
-- Use :KickstartFormatToggle to toggle autoformatting on or off
@@ -29,9 +28,11 @@ return {
return _augroups[client.id]
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', {
group = vim.api.nvim_create_augroup('kickstart-lsp-attach-format', { clear = true }),

-- This is where we attach the autoformatting for reasonable clients
callback = function(args)
local client_id = args.data.client_id
@@ -49,6 +50,8 @@ return {
return
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', {
group = get_augroup(client),
buffer = bufnr,
@@ -57,7 +60,12 @@ return {
return
end

vim.lsp.buf.format { async = false }
vim.lsp.buf.format {
async = false,
filter = function(c)
return c.id == client.id
end,
}
end,
})
end,
14 changes: 0 additions & 14 deletions lua/kickstart/plugins/statusline.lua

This file was deleted.

10 changes: 0 additions & 10 deletions lua/kickstart/plugins/theme.lua

This file was deleted.

0 comments on commit 5e4d24c

Please sign in to comment.