Merge branch 'main' into wsl-ubuntu

- conflicted : config.fish
	- moved interactive functions
	- add $LESS
	- add custom history
This commit is contained in:
qwjyh 2022-10-17 19:03:03 +09:00
commit e27916a8ee
9 changed files with 138 additions and 8 deletions

View file

@ -4,7 +4,8 @@
vim.o.number = true
vim.o.relativenumber = true
vim.cmd([[
highlight LineNr cterm=none ctermfg=256
highlight LineNr cterm=none ctermfg=243
highlight CursorLineNr cterm=none ctermfg=250
]])
vim.o.tabstop = 4
vim.o.shiftwidth = 4
@ -139,3 +140,13 @@ cmp.setup({
vim.api.nvim_set_keymap('n', '<c-P>',
"<cmd>lua require('fzf-lua').files()<CR>",
{ noremap = true, silent = true })
-----------------------------------------------------------
-- lualine
require('lualine_setup')
lualine = require('lualine')
lualine.setup({
options = { theme = 'iceberg_dark' }
})
lualine.setup()