diff --git a/init.lua b/init.lua index 415134ee..33008615 100644 --- a/init.lua +++ b/init.lua @@ -5,6 +5,14 @@ vim.g.maplocalleader = ' ' -- Set to true if you have a Nerd Font installed and selected in the terminal vim.g.have_nerd_font = true +-- Configure lazy.nvim to use LuaJIT for rocks support +vim.g.lazy_rocks = { + hererocks = { + lua_dir = '/usr/local/bin', + lua_version = '5.1', + } +} + -- [[ Setting options ]] -- See `:help vim.o` -- NOTE: You can change these options as you wish! diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 0c7f0b97..79c471a6 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -9,19 +9,12 @@ vim.g.netrw_banner = '0' -- disable topbar -- vim.g.netrw_browse_split = 4 -- open in prior buffer/window -- -- vim.g.netrw_altv = 1 -- open fle splits to the right vim.g.netrw_liststyle = 3 -- tree view -vim.diagnostic.config { - virtual_text = { - prefix = '●', -- Could be '■', '▎', 'x' - }, - severity_sort = true, - float = { - source = true, -- Or "if_many" - }, -} vim.wo.foldmethod = 'expr' -vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()' -vim.wo.foldenable = false +-- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()' +-- vim.wo.foldenable = false +vim.wo[0][0].foldexpr = 'v:lua.vim.treesitter.foldexpr()' +vim.wo[0][0].foldmethod = 'expr' -- copy current buffer path to "+ vim.keymap.set('n', 'yb', 'let @+ = expand("%")', { desc = 'yank to plus register current relative path' }) diff --git a/session.vim b/session.vim index 5ff6c16f..d5514e63 100644 --- a/session.vim +++ b/session.vim @@ -13,21 +13,14 @@ if &shortmess =~ 'A' else set shortmess=aoO endif -badd +6 lua/kickstart/plugins/treesitter.lua -badd +1 ~/.local/share/nvim/lazy/nvim-treesitter/lua/nvim-treesitter.lua -badd +126 lua/kickstart/plugins/lspconfig.lua +badd +20 lua/kickstart/plugins/conform.lua +badd +5 lua/kickstart/plugins/treesitter.lua +badd +1 init.lua +badd +37 lua/lazy-plugins.lua +badd +127 lua/kickstart/plugins/lspconfig.lua argglobal %argdel -edit ~/.local/share/nvim/lazy/nvim-treesitter/lua/nvim-treesitter.lua -let s:save_splitbelow = &splitbelow -let s:save_splitright = &splitright -set splitbelow splitright -wincmd _ | wincmd | -vsplit -1wincmd h -wincmd w -let &splitbelow = s:save_splitbelow -let &splitright = s:save_splitright +edit lua/kickstart/plugins/lspconfig.lua wincmd t let s:save_winminheight = &winminheight let s:save_winminwidth = &winminwidth @@ -35,8 +28,6 @@ set winminheight=0 set winheight=1 set winminwidth=0 set winwidth=1 -exe 'vert 1resize ' . ((&columns * 77 + 77) / 155) -exe 'vert 2resize ' . ((&columns * 77 + 77) / 155) argglobal balt lua/kickstart/plugins/treesitter.lua setlocal foldmethod=expr @@ -46,38 +37,13 @@ setlocal foldignore=# setlocal foldlevel=99 setlocal foldminlines=1 setlocal foldnestmax=20 -setlocal nofoldenable -let s:l = 1 - ((0 * winheight(0) + 20) / 40) +setlocal foldenable +let s:l = 127 - ((11 * winheight(0) + 20) / 40) if s:l < 1 | let s:l = 1 | endif keepjumps exe s:l normal! zt -keepjumps 1 -normal! 0 -wincmd w -argglobal -if bufexists(fnamemodify("lua/kickstart/plugins/lspconfig.lua", ":p")) | buffer lua/kickstart/plugins/lspconfig.lua | else | edit lua/kickstart/plugins/lspconfig.lua | endif -if &buftype ==# 'terminal' - silent file lua/kickstart/plugins/lspconfig.lua -endif -balt ~/.local/share/nvim/lazy/nvim-treesitter/lua/nvim-treesitter.lua -setlocal foldmethod=expr -setlocal foldexpr=v:lua.vim.treesitter.foldexpr() -setlocal foldmarker={{{,}}} -setlocal foldignore=# -setlocal foldlevel=99 -setlocal foldminlines=1 -setlocal foldnestmax=20 -setlocal nofoldenable -let s:l = 126 - ((18 * winheight(0) + 20) / 40) -if s:l < 1 | let s:l = 1 | endif -keepjumps exe s:l -normal! zt -keepjumps 126 -normal! 09| -wincmd w -2wincmd w -exe 'vert 1resize ' . ((&columns * 77 + 77) / 155) -exe 'vert 2resize ' . ((&columns * 77 + 77) / 155) +keepjumps 127 +normal! 034| tabnext 1 if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal' silent exe 'bwipe ' . s:wipebuf @@ -93,7 +59,6 @@ if filereadable(s:sx) endif let &g:so = s:so_save | let &g:siso = s:siso_save set hlsearch -nohlsearch doautoall SessionLoadPost unlet SessionLoad " vim: set ft=vim :