aboutsummaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
authorChris Patti <feoh@feoh.org>2023-06-04 16:10:59 +0000
committerChris Patti <feoh@feoh.org>2023-06-04 16:10:59 +0000
commit5e4d24cb2faf37d341bc906affcc2cac21919c51 (patch)
tree361228e816969815d05e635a3fa37f38e7d1506f /lua
parentcdaa750c86cfc0c8f2fc1c8638b7296c327bf5a9 (diff)
Revert "Refactor theme and status line into their own file"
This reverts commit cdaa750c86cfc0c8f2fc1c8638b7296c327bf5a9.
Diffstat (limited to 'lua')
-rw-r--r--lua/kickstart/plugins/autoformat.lua14
-rw-r--r--lua/kickstart/plugins/statusline.lua14
-rw-r--r--lua/kickstart/plugins/theme.lua10
3 files changed, 11 insertions, 27 deletions
diff --git a/lua/kickstart/plugins/autoformat.lua b/lua/kickstart/plugins/autoformat.lua
index 855f350..bc56b15 100644
--- a/lua/kickstart/plugins/autoformat.lua
+++ b/lua/kickstart/plugins/autoformat.lua
@@ -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,
diff --git a/lua/kickstart/plugins/statusline.lua b/lua/kickstart/plugins/statusline.lua
deleted file mode 100644
index f54393f..0000000
--- a/lua/kickstart/plugins/statusline.lua
+++ /dev/null
@@ -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 = '',
- },
- },
-}
-
diff --git a/lua/kickstart/plugins/theme.lua b/lua/kickstart/plugins/theme.lua
deleted file mode 100644
index 794aa4d..0000000
--- a/lua/kickstart/plugins/theme.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
- "folke/tokyonight.nvim",
- lazy = false,
- priority = 1000,
- opts = {},
- config = function()
- vim.cmd.colorscheme 'tokyonight-storm'
- end,
-}
-