diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index a9f1851..019e508 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -216,5 +216,5 @@ vim.lsp.enable { 'ty', } -vim.o.background = "dark" -vim.cmd([[colorscheme gruvbox-material]]) +vim.o.background = 'dark' +vim.cmd [[colorscheme gruvbox-material]] diff --git a/.config/nvim/lua/plugins/gruvbox.lua b/.config/nvim/lua/plugins/gruvbox.lua deleted file mode 100644 index 9f11247..0000000 --- a/.config/nvim/lua/plugins/gruvbox.lua +++ /dev/null @@ -1 +0,0 @@ -return { "sainnhe/gruvbox-material", priority = 1000 , config = true} diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua index 3453f01..6dd3923 100644 --- a/.config/nvim/lua/plugins/lualine.lua +++ b/.config/nvim/lua/plugins/lualine.lua @@ -1,96 +1,27 @@ return { - 'nvim-lualine/lualine.nvim', - opts = { - options = { - section_separators = { left = '', right = '' }, - component_separators = { left = '|', right = '|' }, - theme = vim.g.colors_name, - refresh = { - statusline = 1000, - }, - }, - sections = { - lualine_c = { + 'nvim-lualine/lualine.nvim', + opts = { + options = { + section_separators = { left = '', right = '' }, + component_separators = { left = '|', right = '|' }, + theme = vim.g.colors_name, + refresh = { + statusline = 1000, + }, + }, + sections = { + lualine_c = { { - 'filename', - path = 1, + 'filename', + path = 1, }, + }, + lualine_x = { + { + 'lsp_status', + icon = '', }, - lualine_x = { - { - 'lsp_status', - icon = '', -- f013 - symbols = { - -- Standard unicode symbols to cycle through for LSP progress: - -- spinner - -- = - -- { - -- '⠋', - -- '⠙', - -- '⠹', - -- '⠸', - -- '⠼', - -- '⠴', - -- '⠦', - -- '⠧', - -- '⠇', - -- '⠏' - -- }, - -- -- - -- Standard - -- unicode - -- symbol - -- for - -- when - -- LSP - -- is - -- done: - -- done - -- = - -- '✓', - -- -- - -- Delimiter - -- inserted - -- between - -- LSP - -- names: - -- separator - -- = - -- ' - -- ', - -- }, - -- -- - -- List - -- of - -- LSP - -- names - -- to - -- ignore - -- (e.g., - -- `null-ls`): - -- ignore_lsp - -- = - -- {}, - -- -- - -- Display - -- the - -- LSP - -- name - -- show_name - -- = - -- true, - -- }, - -- 'encoding', - -- 'fileformat', - -- 'filetype', - -- }, - -- }, - -- }, - -- } - } - } + }, + }, + }, } -} -} -} - diff --git a/.config/nvim/lua/plugins/mason.lua b/.config/nvim/lua/plugins/mason.lua index 4ff28e4..ab125be 100644 --- a/.config/nvim/lua/plugins/mason.lua +++ b/.config/nvim/lua/plugins/mason.lua @@ -2,11 +2,11 @@ return { 'mason-org/mason.nvim', opts = { ui = { - icons = { - package_installed = "✓", - package_pending = "➜", - package_uninstalled = "✗" - } - } + icons = { + package_installed = '✓', + package_pending = '➜', + package_uninstalled = '✗', + }, + }, }, } diff --git a/.config/nvim/lua/plugins/mini.lua b/.config/nvim/lua/plugins/mini.lua index 4c24240..986d695 100644 --- a/.config/nvim/lua/plugins/mini.lua +++ b/.config/nvim/lua/plugins/mini.lua @@ -14,30 +14,30 @@ return { } require('mini.pairs').setup() require('mini.icons').setup() --- require('mini.statusline').setup({ --- content = { --- active = function() --- local mode, mode_hl = MiniStatusline.section_mode({ trunc_width = 120 }) --- local git = MiniStatusline.section_git({ trunc_width = 40 }) --- local diff = MiniStatusline.section_diff({ trunc_width = 75 }) --- local diagnostics = MiniStatusline.section_diagnostics({ trunc_width = 75 }) --- local lsp = MiniStatusline.section_lsp({ trunc_width = 75 }) --- local filename = MiniStatusline.section_filename({ trunc_width = 140 }) --- local fileinfo = MiniStatusline.section_fileinfo({ trunc_width = 120 }) --- local location = MiniStatusline.section_location({ trunc_width = 75 }) --- local search = MiniStatusline.section_searchcount({ trunc_width = 75 }) --- --- return MiniStatusline.combine_groups({ --- { hl = mode_hl, strings = { mode } }, --- { hl = 'MiniStatuslineDevinfo', strings = { git, diagnostics, diff } }, --- '%<', -- Mark truncation point --- { hl = 'MiniStatuslineFilename', strings = { filename } }, --- '%=', -- Fill rest of screen --- { hl = 'MiniStatuslineFileinfo', strings = { lsp, fileinfo } }, --- { hl = mode_hl, strings = { location } }, --- }) --- end, --- }, --- }) + -- require('mini.statusline').setup({ + -- content = { + -- active = function() + -- local mode, mode_hl = MiniStatusline.section_mode({ trunc_width = 120 }) + -- local git = MiniStatusline.section_git({ trunc_width = 40 }) + -- local diff = MiniStatusline.section_diff({ trunc_width = 75 }) + -- local diagnostics = MiniStatusline.section_diagnostics({ trunc_width = 75 }) + -- local lsp = MiniStatusline.section_lsp({ trunc_width = 75 }) + -- local filename = MiniStatusline.section_filename({ trunc_width = 140 }) + -- local fileinfo = MiniStatusline.section_fileinfo({ trunc_width = 120 }) + -- local location = MiniStatusline.section_location({ trunc_width = 75 }) + -- local search = MiniStatusline.section_searchcount({ trunc_width = 75 }) + -- + -- return MiniStatusline.combine_groups({ + -- { hl = mode_hl, strings = { mode } }, + -- { hl = 'MiniStatuslineDevinfo', strings = { git, diagnostics, diff } }, + -- '%<', -- Mark truncation point + -- { hl = 'MiniStatuslineFilename', strings = { filename } }, + -- '%=', -- Fill rest of screen + -- { hl = 'MiniStatuslineFileinfo', strings = { lsp, fileinfo } }, + -- { hl = mode_hl, strings = { location } }, + -- }) + -- end, + -- }, + -- }) end, } diff --git a/.config/nvim/lua/plugins/theme.lua b/.config/nvim/lua/plugins/theme.lua index 7b8cf22..f0da2e1 100644 --- a/.config/nvim/lua/plugins/theme.lua +++ b/.config/nvim/lua/plugins/theme.lua @@ -1,15 +1,16 @@ -return { { - 'Mofiqul/dracula.nvim', - lazy = false, - priority = 1000, -}, -{ "ellisonleao/gruvbox.nvim", priority = 1000 , config = true }, -{ "rebelot/kanagawa.nvim", priority = 1000 , config = true }, -{ +return { + { + 'Mofiqul/dracula.nvim', + lazy = false, + priority = 1000, + }, + { 'ellisonleao/gruvbox.nvim', priority = 1000, config = true }, + { 'rebelot/kanagawa.nvim', priority = 1000, config = true }, + { 'f4z3r/gruvbox-material.nvim', - name = 'gruvbox-material', - lazy = false, - priority = 1000, - opts = {}, - }, + name = 'gruvbox-material', + lazy = false, + priority = 1000, + opts = {}, + }, }