diff --git a/lua/core.lua b/lua/core.lua index 157f908..12881b7 100644 --- a/lua/core.lua +++ b/lua/core.lua @@ -17,7 +17,6 @@ o.ignorecase = true o.smartcase = true o.smartindent = true o.autoindent = true -o.mouse = "i" -- leader settings global.mapleader = ' ' diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua index ded28db..e8e182f 100644 --- a/lua/lazy-plugins.lua +++ b/lua/lazy-plugins.lua @@ -151,9 +151,10 @@ local plugins = { dependencies = { 'nvim-lua/plenary.nvim' }, event = "CmdlineEnter", keys = { - vim.keymap.set('', 'tf', ':Telescope fd'), - vim.keymap.set('', 't/', ':Telescope live_grep'), + vim.keymap.set('', 't/', ':Telescope lsp_dynamic_workspace_symbols'), + vim.keymap.set('', 'tg', ':Telescope live_grep'), vim.keymap.set('', 'tb', ':Telescope buffers'), + vim.keymap.set('', 'tf', ':Telescope fd'), }, config = function() require("plugins.telescope") diff --git a/lua/plugins/statusline.lua b/lua/plugins/statusline.lua index fe4f59a..ea2c25e 100644 --- a/lua/plugins/statusline.lua +++ b/lua/plugins/statusline.lua @@ -1,35 +1,43 @@ -require'lualine'.setup { - options = { - icons_enabled = true, - theme = 'gruvbox', - component_separators = {'|', '|'}, - section_separators = {'', ''}, - disabled_filetypes = {} - }, - sections = { - lualine_a = {'mode'}, - lualine_b = {'branch'}, - lualine_c = {'filename', 'diagonostics'}, - lualine_x = {'encoding', 'fileformat', 'filetype'}, - lualine_y = {'progress'}, - lualine_z = {'location'} - }, - inactive_sections = { - lualine_a = {}, - lualine_b = {}, - lualine_c = {'filename'}, - lualine_x = {'location'}, - lualine_y = {}, - lualine_z = {} - }, - -- Tabline is broken, disable for now. - -- tabline = { - -- lualine_a = {'buffers'}, - -- lualine_b = {}, - -- lualine_c = {}, - -- lualine_x = {}, - -- lualine_y = {}, - -- lualine_z = {'tabs'} - -- }, - extensions = {} +require 'lualine'.setup { + options = { + icons_enabled = true, + theme = 'gruvbox', + component_separators = { '|', '|' }, + section_separators = { '', '' }, + disabled_filetypes = {} + }, + sections = { + lualine_a = { 'mode' }, + lualine_b = { + 'branch', + }, + lualine_c = { + { + 'filename', + path = 1 + }, + 'diff', + }, + lualine_x = { 'encoding', 'fileformat', 'filetype' }, + lualine_y = { 'progress' }, + lualine_z = { 'location' } + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { 'filename' }, + lualine_x = { 'location' }, + lualine_y = {}, + lualine_z = {} + }, + -- Tabline is broken, disable for now. + -- tabline = { + -- lualine_a = {'buffers'}, + -- lualine_b = {}, + -- lualine_c = {}, + -- lualine_x = {}, + -- lualine_y = {}, + -- lualine_z = {'tabs'} + -- }, + extensions = {} }