diff options
| -rw-r--r-- | init.vim | 33 | ||||
| -rw-r--r-- | lua/lualinesetup.lua | 13 |
2 files changed, 27 insertions, 19 deletions
@@ -46,7 +46,8 @@ Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} Plug 'nvim-treesitter/nvim-treesitter-textobjects' Plug 'nvim-treesitter/playground' Plug 'onsails/lspkind.nvim' -Plug 'tpope/vim-surround' +" Plug 'tpope/vim-surround' +Plug 'kylechui/nvim-surround' Plug 'vito-c/jq.vim' if has('rneovim') @@ -75,7 +76,7 @@ set updatetime=1000 let mapleader=" " function! Jump(...) - normal! '[ + normal! `[ endfunction noremap <silent> g. <cmd>set operatorfunc=Jump<cr>g@ @@ -102,7 +103,7 @@ noremap <leader>p <plug>(SynStack) noremap <leader>ff <cmd>Telescope find_files<cr> noremap <M-f> <cmd>Telescope find_files<cr> function! s:find_in_dir() - exec "Telescope find_files search_dirs={\"" . escape(expand('%:h'), ' ') . "\"}" + exec "Telescope find_files search_dirs={\"" . escape(resolve(expand('%:h')), ' ') . "\"} hidden=true" endfunction noremap <M-F> <cmd>call <sid>find_in_dir()<cr> @@ -114,13 +115,8 @@ noremap ^ ^zH noremap <leader>t <cmd>TroubleToggle<cr> -function! HighlightColorColumns() abort - hi MyColorColumn guifg=#644141 guibg=none gui=None -endfunction -call HighlightColorColumns() augroup InitVim au! - au ColorScheme * call HighlightColorColumns() autocmd BufRead *.java,*.c,*.cpp,*.cxx,*.hs TSBufEnable highlight " Automatically stop highligting things when leaving insert mode. If I want @@ -303,14 +299,19 @@ lua << EOF borderchars = { " ", " ", " ", " ", " ", " ", " ", " " }, prompt_prefix = '🞂 ', selection_caret = '🞂 ', - layout_strategy = "center", + layout_strategy = "horizontal", results_title = false, sorting_strategy = "ascending", + pickers = { + find_files = { + hidden = true + } + }, -- path_display = "shorten", layout_config = { - center = { - width = 0.5, - height = 0.5, + horizontal = { + width = 0.66, + height = 0.66, }, -- other layout configuration here }, @@ -320,10 +321,9 @@ lua << EOF }) require("virt-column").setup({ - char = '│', - highlight = "MyColorColumn" + char = '▐', + highlight = "ColorColumnLine" }) - vim.fn.HighlightColorColumns() function run_format_code() local lsps = vim.lsp.buf_get_clients() @@ -334,5 +334,8 @@ lua << EOF end end + require("nvim-surround").setup({}) + + EOF diff --git a/lua/lualinesetup.lua b/lua/lualinesetup.lua index 16e0cce..b324f39 100644 --- a/lua/lualinesetup.lua +++ b/lua/lualinesetup.lua @@ -19,8 +19,8 @@ end local config = { options = { theme = 'meltdown', - component_separators = '‣', -- '┃' - section_separators = '', + component_separators = '', -- '┃' + section_separators = {left = '', right = ''}, }, sections = { lualine_a = { 'mode' }, @@ -29,12 +29,17 @@ local config = { -- right lualine_x = { + -- { clients_lsp, color = { fg = '#80a0ff' } }, + -- { 'encoding', color = { fg = '#80a0ff' } }, + -- { 'fileformat', color = { fg = '#ffb700' } }, + -- { 'filetype', color = { fg = '#80a0ff' } }, + }, + lualine_y = { { clients_lsp, color = { fg = '#80a0ff' } }, { 'encoding', color = { fg = '#80a0ff' } }, { 'fileformat', color = { fg = '#ffb700' } }, { 'filetype', color = { fg = '#80a0ff' } }, - }, - lualine_y = { 'progress' }, + 'progress' }, lualine_z = { 'location' } }, } |