diff --git a/private_dot_config/nvim/lua/config/mappings.lua b/private_dot_config/nvim/lua/config/mappings.lua index 644ff42..54f37ae 100644 --- a/private_dot_config/nvim/lua/config/mappings.lua +++ b/private_dot_config/nvim/lua/config/mappings.lua @@ -31,3 +31,9 @@ map("n", "", "BufferPin") --map("n", "s", ":%s//g") --replace all map("n", "t", ":NvimTreeToggle") --open file explorer map("n", "l", ":Twilight") --surrounding dim + +-- fzf and grep +map("n", "f", ":lua require('fzf-lua').files()") --search cwd +map("n", "Fr", ":lua require('fzf-lua').resume()") --last search +map("n", "g", ":lua require('fzf-lua').grep()") --grep +map("n", "G", ":lua require('fzf-lua').grep_cword()") --grep word under cursor diff --git a/private_dot_config/nvim/lua/config/options.lua b/private_dot_config/nvim/lua/config/options.lua index bebf53f..f8d827d 100644 --- a/private_dot_config/nvim/lua/config/options.lua +++ b/private_dot_config/nvim/lua/config/options.lua @@ -1,11 +1,17 @@ local options = { + cursorline = true, --highlight line termguicolors = true, - number = true, - tabstop = 4, + + number = true, --numbered lines + + --indentation stuff softtabstop = 0, + tabstop = 4, expandtab = true, shiftwidth = 4, smarttab = true, + + --print blank and tabs list = true, listchars = 'tab:» ,lead:•,trail:•', } diff --git a/private_dot_config/nvim/lua/plugins/barbar.lua b/private_dot_config/nvim/lua/plugins/barbar.lua index 58b207b..b49098b 100644 --- a/private_dot_config/nvim/lua/plugins/barbar.lua +++ b/private_dot_config/nvim/lua/plugins/barbar.lua @@ -1 +1,15 @@ -require("barbar").setup({}) +require("barbar").setup({ + sidebar_filetypes = { -- Set the filetypes which barbar will offset itself for + -- Use the default values: {event = 'BufWinLeave', text = '', align = 'left'} + NvimTree = true, + -- Or, specify the text used for the offset: + undotree = { + text = 'undotree', + align = 'left', -- *optionally* specify an alignment (either 'left', 'center', or 'right') + }, + -- Or, specify the event which the sidebar executes when leaving: + ['neo-tree'] = {event = 'BufWipeout'}, + -- Or, specify all three + Outline = {event = 'BufWinLeave', text = 'symbols-outline', align = 'right'}, + }, +})