clean up
This commit is contained in:
siduck76
parent
3a244429d5
commit
78cefbb297
14 changed files with 576 additions and 552 deletions
49
init.lua
49
init.lua
|
|
@ -1,35 +1,36 @@
|
|||
-- load plugins
|
||||
require('pluginsList.lua')
|
||||
require('web-devicons.lua')
|
||||
require("pluginsList.lua")
|
||||
require("web-devicons.lua")
|
||||
|
||||
require('utils.lua')
|
||||
require('nvimTree.lua')
|
||||
require('bufferline.lua')
|
||||
require('statusline.lua')
|
||||
require('telescope-nvim.lua')
|
||||
require("utils.lua")
|
||||
require("nvimTree.lua")
|
||||
require("bufferline.lua")
|
||||
require("statusline.lua")
|
||||
require("telescope-nvim.lua")
|
||||
|
||||
-- lsp
|
||||
require('nvim-lspconfig.lua')
|
||||
require('nvim-compe.lua')
|
||||
require('coc.lua')
|
||||
require("nvim-lspconfig.lua")
|
||||
require("nvim-compe.lua")
|
||||
require("coc.lua")
|
||||
|
||||
require('gitsigns.lua')
|
||||
require("gitsigns.lua")
|
||||
|
||||
require'colorizer'.setup()
|
||||
require "colorizer".setup()
|
||||
|
||||
local cmd = vim.cmd
|
||||
local g = vim.g
|
||||
local indent = 2
|
||||
|
||||
cmd 'colorscheme base16-onedark'
|
||||
cmd 'syntax enable'
|
||||
cmd 'syntax on'
|
||||
cmd "colorscheme base16-onedark"
|
||||
cmd "syntax enable"
|
||||
cmd "syntax on"
|
||||
|
||||
g.auto_save = 1
|
||||
g.mapleader = ' '
|
||||
|
||||
require('treesitter.lua')
|
||||
require('mappings.lua')
|
||||
g.mapleader = " "
|
||||
|
||||
require("treesitter.lua")
|
||||
require("mappings.lua")
|
||||
|
||||
-- highlights
|
||||
cmd("hi LineNr guibg=NONE")
|
||||
|
|
@ -44,14 +45,16 @@ cmd("highlight TelescopeBorder guifg=#3e4451")
|
|||
cmd("highlight TelescopePromptBorder guifg=#3e4451")
|
||||
cmd("highlight TelescopeResultsBorder guifg=#3e4451")
|
||||
cmd("highlight TelescopePreviewBorder guifg=#525865")
|
||||
cmd("highlight PmenuSel guibg=#BBE67E")
|
||||
cmd("highlight PmenuSel guibg=#98c379")
|
||||
|
||||
-- tree folder name , icon color
|
||||
cmd("highlight NvimTreeFolderIcon guifg = #61afef")
|
||||
cmd("highlight NvimTreeFolderName guifg = #61afef")
|
||||
|
||||
require('nvim-autopairs').setup()
|
||||
require("nvim-autopairs").setup()
|
||||
|
||||
require('lspkind').init({
|
||||
File = ' ',
|
||||
})
|
||||
require("lspkind").init(
|
||||
{
|
||||
File = " "
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,54 +1,53 @@
|
|||
vim.o.termguicolors = true
|
||||
|
||||
require'bufferline'.setup{
|
||||
require "bufferline".setup {
|
||||
options = {
|
||||
buffer_close_icon= '',
|
||||
modified_icon = '●',
|
||||
close_icon = '',
|
||||
left_trunc_marker = '',
|
||||
right_trunc_marker = '',
|
||||
buffer_close_icon = "",
|
||||
modified_icon = "●",
|
||||
close_icon = "",
|
||||
left_trunc_marker = "",
|
||||
right_trunc_marker = "",
|
||||
max_name_length = 14,
|
||||
max_prefix_length = 13,
|
||||
tab_size = 18,
|
||||
enforce_regular_tabs = true ,
|
||||
view = "multiwindow" ,
|
||||
show_buffer_close_icons = true ,
|
||||
enforce_regular_tabs = true,
|
||||
view = "multiwindow",
|
||||
show_buffer_close_icons = true,
|
||||
separator_style = "thin"
|
||||
},
|
||||
|
||||
highlights = {
|
||||
background = {
|
||||
guifg = comment_fg,
|
||||
guibg = '#282c34'
|
||||
guibg = "#282c34"
|
||||
},
|
||||
fill = {
|
||||
guifg = comment_fg,
|
||||
guibg = '#282c34'
|
||||
guibg = "#282c34"
|
||||
},
|
||||
buffer_selected = {
|
||||
guifg = normal_fg,
|
||||
guibg = '#3A3E44',
|
||||
guibg = "#3A3E44",
|
||||
gui = "bold"
|
||||
},
|
||||
separator_visible = {
|
||||
guifg = '#282c34' ,
|
||||
guibg = '#282c34'
|
||||
guifg = "#282c34",
|
||||
guibg = "#282c34"
|
||||
},
|
||||
separator_selected = {
|
||||
guifg = '#282c34' ,
|
||||
guibg = '#282c34'
|
||||
guifg = "#282c34",
|
||||
guibg = "#282c34"
|
||||
},
|
||||
separator = {
|
||||
guifg = '#282c34' ,
|
||||
guibg = '#282c34'
|
||||
guifg = "#282c34",
|
||||
guibg = "#282c34"
|
||||
},
|
||||
indicator_selected = {
|
||||
guifg = '#282c34' ,
|
||||
guibg = '#282c34'
|
||||
guifg = "#282c34",
|
||||
guibg = "#282c34"
|
||||
},
|
||||
modified_selected = {
|
||||
guifg = string_fg,
|
||||
guibg = '#3A3E44'
|
||||
guibg = "#3A3E44"
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +1,27 @@
|
|||
require('gitsigns').setup {
|
||||
require("gitsigns").setup {
|
||||
signs = {
|
||||
add = {hl = 'DiffAdd' , text = '▌', numhl='GitSignsAddNr'},
|
||||
change = {hl = 'DiffChange', text = '▌', numhl='GitSignsChangeNr'},
|
||||
delete = {hl = 'DiffDelete', text = '_', numhl='GitSignsDeleteNr'},
|
||||
topdelete = {hl = 'DiffDelete', text = '‾', numhl='GitSignsDeleteNr'},
|
||||
changedelete = {hl = 'DiffChange', text = '~', numhl='GitSignsChangeNr'},
|
||||
add = {hl = "DiffAdd", text = "▌", numhl = "GitSignsAddNr"},
|
||||
change = {hl = "DiffChange", text = "▌", numhl = "GitSignsChangeNr"},
|
||||
delete = {hl = "DiffDelete", text = "_", numhl = "GitSignsDeleteNr"},
|
||||
topdelete = {hl = "DiffDelete", text = "‾", numhl = "GitSignsDeleteNr"},
|
||||
changedelete = {hl = "DiffChange", text = "~", numhl = "GitSignsChangeNr"}
|
||||
},
|
||||
numhl = false,
|
||||
keymaps = {
|
||||
-- Default keymap options
|
||||
noremap = true,
|
||||
buffer = true,
|
||||
|
||||
['n ]c'] = { expr = true, "&diff ? ']c' : '<cmd>lua require\"gitsigns\".next_hunk()<CR>'"},
|
||||
['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns\".prev_hunk()<CR>'"},
|
||||
|
||||
['n <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk()<CR>',
|
||||
['n <leader>hu'] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>',
|
||||
['n <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk()<CR>',
|
||||
['n <leader>hp'] = '<cmd>lua require"gitsigns".preview_hunk()<CR>',
|
||||
['n <leader>hb'] = '<cmd>lua require"gitsigns".blame_line()<CR>',
|
||||
["n ]c"] = {expr = true, '&diff ? \']c\' : \'<cmd>lua require"gitsigns".next_hunk()<CR>\''},
|
||||
["n [c"] = {expr = true, '&diff ? \'[c\' : \'<cmd>lua require"gitsigns".prev_hunk()<CR>\''},
|
||||
["n <leader>hs"] = '<cmd>lua require"gitsigns".stage_hunk()<CR>',
|
||||
["n <leader>hu"] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>',
|
||||
["n <leader>hr"] = '<cmd>lua require"gitsigns".reset_hunk()<CR>',
|
||||
["n <leader>hp"] = '<cmd>lua require"gitsigns".preview_hunk()<CR>',
|
||||
["n <leader>hb"] = '<cmd>lua require"gitsigns".blame_line()<CR>'
|
||||
},
|
||||
watch_index = {
|
||||
interval = 100
|
||||
},
|
||||
sign_priority = 5,
|
||||
status_formatter = nil, -- Use default
|
||||
status_formatter = nil -- Use default
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,19 +5,18 @@ vim.cmd [[ packadd completion-nvim ]]
|
|||
local html_snippet_capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||
html_snippet_capabilities.textDocument.completion.completionItem.snippetSupport = true
|
||||
|
||||
require'lspconfig'.html.setup {
|
||||
require "lspconfig".html.setup {
|
||||
on_attach = lsp_on_attach,
|
||||
capabilities = html_snippet_capabilities,
|
||||
cmd = { "html-languageserver", "--stdio" };
|
||||
filetypes = { "html" };
|
||||
cmd = {"html-languageserver", "--stdio"},
|
||||
filetypes = {"html"},
|
||||
init_opitons = {
|
||||
configurationSection = { "html", "css", "javascript" };
|
||||
configurationSection = {"html", "css", "javascript"},
|
||||
embeddedLanguages = {
|
||||
css = true,
|
||||
javascript = true,
|
||||
};
|
||||
};
|
||||
javascript = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
vim.g.completion_enable_snippet = 'UltiSnips'
|
||||
|
||||
vim.g.completion_enable_snippet = "UltiSnips"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
local function map(mode, lhs, rhs, opts)
|
||||
local options = {noremap = true}
|
||||
if opts then options = vim.tbl_extend('force', options, opts) end
|
||||
if opts then
|
||||
options = vim.tbl_extend("force", options, opts)
|
||||
end
|
||||
vim.api.nvim_set_keymap(mode, lhs, rhs, options)
|
||||
end
|
||||
|
||||
-- keybind list
|
||||
map('', '<leader>c', '"+y')
|
||||
|
||||
map("", "<leader>c", '"+y')
|
||||
|
|
|
|||
|
|
@ -3,32 +3,31 @@ vim.cmd [[packadd nvim-compe]]
|
|||
|
||||
vim.o.completeopt = "menuone,noselect"
|
||||
|
||||
require'compe'.setup {
|
||||
enabled = true;
|
||||
autocomplete = true;
|
||||
debug = false;
|
||||
min_length = 1;
|
||||
preselect = 'enable';
|
||||
throttle_time = 80;
|
||||
source_timeout = 200;
|
||||
incomplete_delay = 400;
|
||||
max_abbr_width = 100;
|
||||
max_kind_width = 100;
|
||||
max_menu_width = 100;
|
||||
documentation = false;
|
||||
|
||||
require "compe".setup {
|
||||
enabled = true,
|
||||
autocomplete = true,
|
||||
debug = false,
|
||||
min_length = 1,
|
||||
preselect = "enable",
|
||||
throttle_time = 80,
|
||||
source_timeout = 200,
|
||||
incomplete_delay = 400,
|
||||
max_abbr_width = 100,
|
||||
max_kind_width = 100,
|
||||
max_menu_width = 100,
|
||||
documentation = false,
|
||||
source = {
|
||||
path = true;
|
||||
buffer = true;
|
||||
calc = true;
|
||||
vsnip = true;
|
||||
nvim_lsp = true;
|
||||
nvim_lua = true;
|
||||
spell = true;
|
||||
tags = true;
|
||||
snippets_nvim = true;
|
||||
treesitter = true;
|
||||
};
|
||||
path = true,
|
||||
buffer = true,
|
||||
calc = true,
|
||||
vsnip = true,
|
||||
nvim_lsp = true,
|
||||
nvim_lua = true,
|
||||
spell = true,
|
||||
tags = true,
|
||||
snippets_nvim = true,
|
||||
treesitter = true
|
||||
}
|
||||
}
|
||||
|
||||
local t = function(str)
|
||||
|
|
|
|||
|
|
@ -3,30 +3,32 @@ vim.cmd [[packadd nvim-compe]]
|
|||
|
||||
local function map(mode, lhs, rhs, opts)
|
||||
local options = {noremap = true}
|
||||
if opts then options = vim.tbl_extend('force', options, opts) end
|
||||
if opts then
|
||||
options = vim.tbl_extend("force", options, opts)
|
||||
end
|
||||
vim.api.nvim_set_keymap(mode, lhs, rhs, options)
|
||||
end
|
||||
|
||||
local opts = { noremap=true, silent=true }
|
||||
local opts = {noremap = true, silent = true}
|
||||
|
||||
-- Mappings.
|
||||
map('n', 'gd', '<Cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
||||
map('n', 'gD', '<Cmd>lua vim.lsp.buf.declaration()<CR>', opts)
|
||||
map('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
|
||||
-- Mappings.
|
||||
map("n", "gd", "<Cmd>lua vim.lsp.buf.definition()<CR>", opts)
|
||||
map("n", "gD", "<Cmd>lua vim.lsp.buf.declaration()<CR>", opts)
|
||||
map("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
|
||||
|
||||
map('n', 'K', '<Cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
||||
map('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
|
||||
map('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
|
||||
map('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
|
||||
map('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
|
||||
map('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
|
||||
map('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
|
||||
map('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
|
||||
map('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
|
||||
map('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
|
||||
map('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
|
||||
map('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
|
||||
map("n", "K", "<Cmd>lua vim.lsp.buf.hover()<CR>", opts)
|
||||
map("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts)
|
||||
map("n", "<C-k>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
|
||||
map("n", "<space>wa", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>", opts)
|
||||
map("n", "<space>wr", "<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>", opts)
|
||||
map("n", "<space>wl", "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>", opts)
|
||||
map("n", "<space>D", "<cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
|
||||
map("n", "<space>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
|
||||
map("n", "<space>e", "<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>", opts)
|
||||
map("n", "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", opts)
|
||||
map("n", "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>", opts)
|
||||
map("n", "<space>q", "<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>", opts)
|
||||
|
||||
require'lspconfig'.tsserver.setup{}
|
||||
require'lspconfig'.cssls.setup{}
|
||||
require'lspconfig'.html.setup{}
|
||||
require "lspconfig".tsserver.setup {}
|
||||
require "lspconfig".cssls.setup {}
|
||||
require "lspconfig".html.setup {}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ vim.cmd [[packadd nvim-tree.lua]]
|
|||
|
||||
vim.o.termguicolors = true
|
||||
|
||||
vim.g.nvim_tree_side = 'left'
|
||||
vim.g.nvim_tree_side = "left"
|
||||
vim.g.nvim_tree_width = 24
|
||||
vim.g.nvim_tree_ignore = { '.git', 'node_modules', '.cache' }
|
||||
vim.g.nvim_tree_ignore = {".git", "node_modules", ".cache"}
|
||||
vim.g.nvim_tree_auto_open = 0
|
||||
vim.g.nvim_tree_auto_close = 0
|
||||
vim.g.nvim_tree_quit_on_open = 0
|
||||
|
|
@ -12,20 +12,19 @@ vim.g.nvim_tree_follow = 1
|
|||
vim.g.nvim_tree_indent_markers = 1
|
||||
vim.g.nvim_tree_hide_dotfiles = 1
|
||||
vim.g.nvim_tree_git_hl = 1
|
||||
vim.g.nvim_tree_root_folder_modifier = ':~'
|
||||
vim.g.nvim_tree_root_folder_modifier = ":~"
|
||||
vim.g.nvim_tree_tab_open = 1
|
||||
vim.g.nvim_tree_allow_resize = 1
|
||||
|
||||
vim.g.nvim_tree_show_icons = {
|
||||
git = 1,
|
||||
folders = 1,
|
||||
files = 1,
|
||||
}
|
||||
files = 1
|
||||
}
|
||||
|
||||
vim.g.nvim_tree_icons = {
|
||||
default = ' ',
|
||||
symlink = ' ',
|
||||
|
||||
default = " ",
|
||||
symlink = " ",
|
||||
git = {
|
||||
unstaged = "✗",
|
||||
staged = "✓",
|
||||
|
|
@ -36,20 +35,25 @@ vim.g.nvim_tree_icons = {
|
|||
folder = {
|
||||
default = "",
|
||||
open = "",
|
||||
symlink = "",
|
||||
}
|
||||
symlink = ""
|
||||
}
|
||||
}
|
||||
|
||||
local get_lua_cb = function (cb_name)
|
||||
local get_lua_cb = function(cb_name)
|
||||
return string.format(":lua require'nvim-tree'.on_keypress('%s')<CR>", cb_name)
|
||||
end
|
||||
|
||||
-- Mappings for nvimtree
|
||||
|
||||
vim.api.nvim_set_keymap('n', '<C-n>', ':NvimTreeToggle<CR>', {
|
||||
vim.api.nvim_set_keymap(
|
||||
"n",
|
||||
"<C-n>",
|
||||
":NvimTreeToggle<CR>",
|
||||
{
|
||||
noremap = true,
|
||||
silent = true
|
||||
})
|
||||
}
|
||||
)
|
||||
|
||||
vim.g.nvim_tree_bindings = {
|
||||
["<CR>"] = get_lua_cb("edit"),
|
||||
|
|
@ -76,5 +80,5 @@ vim.g.nvim_tree_bindings = {
|
|||
["[c"] = get_lua_cb("prev_git_item"),
|
||||
["]c"] = get_lua_cb("next_git_item"),
|
||||
["-"] = get_lua_cb("dir_up"),
|
||||
["q"] = get_lua_cb("close"),
|
||||
["q"] = get_lua_cb("close")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +1,30 @@
|
|||
-- check if packer is installed (~/local/share/nvim/site/pack)
|
||||
local packer_exists = pcall(vim.cmd, [[packadd packer.nvim]])
|
||||
|
||||
return require('packer').startup(function()
|
||||
use {'wbthomason/packer.nvim', opt = true}
|
||||
use { 'kyazdani42/nvim-web-devicons'}
|
||||
use { 'kyazdani42/nvim-tree.lua'}
|
||||
use { 'nvim-lua/plenary.nvim'}
|
||||
use { 'lewis6991/gitsigns.nvim'}
|
||||
use { 'glepnir/galaxyline.nvim'}
|
||||
use { 'akinsho/nvim-bufferline.lua'}
|
||||
use { '907th/vim-auto-save'}
|
||||
use { 'nvim-treesitter/nvim-treesitter'}
|
||||
use { 'chriskempson/base16-vim'}
|
||||
use { 'norcalli/nvim-colorizer.lua'}
|
||||
use { 'ryanoasis/vim-devicons'}
|
||||
use { 'sbdchd/neoformat'}
|
||||
use { 'neovim/nvim-lspconfig'}
|
||||
use { 'hrsh7th/nvim-compe'}
|
||||
use { 'windwp/nvim-autopairs'}
|
||||
use { 'alvan/vim-closetag'}
|
||||
use { 'tweekmonster/startuptime.vim'}
|
||||
use {'onsails/lspkind-nvim'}
|
||||
use { 'nvim-telescope/telescope.nvim'}
|
||||
use {'nvim-telescope/telescope-media-files.nvim'}
|
||||
use {'nvim-lua/popup.nvim'}
|
||||
end)
|
||||
return require("packer").startup(
|
||||
function()
|
||||
use {"wbthomason/packer.nvim", opt = true}
|
||||
use {"kyazdani42/nvim-web-devicons"}
|
||||
use {"kyazdani42/nvim-tree.lua"}
|
||||
use {"nvim-lua/plenary.nvim"}
|
||||
use {"lewis6991/gitsigns.nvim"}
|
||||
use {"glepnir/galaxyline.nvim"}
|
||||
use {"akinsho/nvim-bufferline.lua"}
|
||||
use {"907th/vim-auto-save"}
|
||||
use {"nvim-treesitter/nvim-treesitter"}
|
||||
use {"chriskempson/base16-vim"}
|
||||
use {"norcalli/nvim-colorizer.lua"}
|
||||
-- use { 'Yggdroot/indentLine'}
|
||||
use {"ryanoasis/vim-devicons"}
|
||||
use {"sbdchd/neoformat"}
|
||||
use {"neovim/nvim-lspconfig"}
|
||||
use {"hrsh7th/nvim-compe"}
|
||||
use {"windwp/nvim-autopairs"}
|
||||
use {"alvan/vim-closetag"}
|
||||
use {"tweekmonster/startuptime.vim"}
|
||||
use {"onsails/lspkind-nvim"}
|
||||
use {"nvim-telescope/telescope.nvim"}
|
||||
use {"nvim-telescope/telescope-media-files.nvim"}
|
||||
use {"nvim-lua/popup.nvim"}
|
||||
end
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,66 +1,70 @@
|
|||
local gl = require('galaxyline')
|
||||
local gl = require("galaxyline")
|
||||
local gls = gl.section
|
||||
gl.short_line_list = {'LuaTree','vista','dbui'}
|
||||
gl.short_line_list = {"LuaTree", "vista", "dbui"}
|
||||
|
||||
local colors = {
|
||||
bg = '#282c34',
|
||||
line_bg = '#282c34',
|
||||
fg = '#D8DEE9',
|
||||
fg_green = '#65a380',
|
||||
yellow = '#A3BE8C',
|
||||
cyan = '#22262C',
|
||||
darkblue = '#61afef',
|
||||
green = '#BBE67E',
|
||||
orange = '#FF8800',
|
||||
purple = '#252930',
|
||||
magenta = '#c678dd',
|
||||
blue = '#22262C';
|
||||
red = '#DF8890',
|
||||
lightbg = '#3C4048',
|
||||
nord = '#81A1C1',
|
||||
greenYel = '#EBCB8B'
|
||||
bg = "#282c34",
|
||||
line_bg = "#282c34",
|
||||
fg = "#D8DEE9",
|
||||
fg_green = "#65a380",
|
||||
yellow = "#A3BE8C",
|
||||
cyan = "#22262C",
|
||||
darkblue = "#61afef",
|
||||
green = "#BBE67E",
|
||||
orange = "#FF8800",
|
||||
purple = "#252930",
|
||||
magenta = "#c678dd",
|
||||
blue = "#22262C",
|
||||
red = "#DF8890",
|
||||
lightbg = "#3C4048",
|
||||
nord = "#81A1C1",
|
||||
greenYel = "#EBCB8B"
|
||||
}
|
||||
|
||||
gls.left[1] = {
|
||||
leftRounded = {
|
||||
provider = function() return '' end,
|
||||
highlight = { colors.nord, colors.bg }
|
||||
},
|
||||
provider = function()
|
||||
return ""
|
||||
end,
|
||||
highlight = {colors.nord, colors.bg}
|
||||
}
|
||||
}
|
||||
|
||||
gls.left[2] = {
|
||||
ViMode = {
|
||||
provider = function()
|
||||
return ' '
|
||||
return " "
|
||||
end,
|
||||
highlight = {colors.bg,colors.nord},
|
||||
separator = ' ',
|
||||
separator_highlight = {colors.lightbg,colors.lightbg},
|
||||
},
|
||||
highlight = {colors.bg, colors.nord},
|
||||
separator = " ",
|
||||
separator_highlight = {colors.lightbg, colors.lightbg}
|
||||
}
|
||||
}
|
||||
|
||||
gls.left[3] ={
|
||||
gls.left[3] = {
|
||||
FileIcon = {
|
||||
provider = 'FileIcon',
|
||||
provider = "FileIcon",
|
||||
condition = buffer_not_empty,
|
||||
highlight = {require('galaxyline.provider_fileinfo').get_file_icon_color,colors.lightbg},
|
||||
},
|
||||
highlight = {require("galaxyline.provider_fileinfo").get_file_icon_color, colors.lightbg}
|
||||
}
|
||||
}
|
||||
|
||||
gls.left[4] = {
|
||||
FileName = {
|
||||
provider = {'FileName','FileSize'},
|
||||
provider = {"FileName", "FileSize"},
|
||||
condition = buffer_not_empty,
|
||||
highlight = {colors.fg,colors.lightbg}
|
||||
highlight = {colors.fg, colors.lightbg}
|
||||
}
|
||||
}
|
||||
|
||||
gls.left[5] = {
|
||||
teech = {
|
||||
provider = function() return '' end,
|
||||
separator = ' ',
|
||||
highlight = { colors.lightbg, colors.bg }
|
||||
},
|
||||
provider = function()
|
||||
return ""
|
||||
end,
|
||||
separator = " ",
|
||||
highlight = {colors.lightbg, colors.bg}
|
||||
}
|
||||
}
|
||||
|
||||
local checkwidth = function()
|
||||
|
|
@ -73,119 +77,128 @@ end
|
|||
|
||||
gls.left[6] = {
|
||||
DiffAdd = {
|
||||
provider = 'DiffAdd',
|
||||
provider = "DiffAdd",
|
||||
condition = checkwidth,
|
||||
icon = ' ',
|
||||
highlight = {colors.greenYel,colors.line_bg},
|
||||
icon = " ",
|
||||
highlight = {colors.greenYel, colors.line_bg}
|
||||
}
|
||||
}
|
||||
|
||||
gls.left[7] = {
|
||||
DiffModified = {
|
||||
provider = 'DiffModified',
|
||||
provider = "DiffModified",
|
||||
condition = checkwidth,
|
||||
icon = ' ',
|
||||
highlight = {colors.orange,colors.line_bg},
|
||||
icon = " ",
|
||||
highlight = {colors.orange, colors.line_bg}
|
||||
}
|
||||
}
|
||||
|
||||
gls.left[8] = {
|
||||
DiffRemove = {
|
||||
provider = 'DiffRemove',
|
||||
provider = "DiffRemove",
|
||||
condition = checkwidth,
|
||||
icon = ' ',
|
||||
highlight = {colors.red,colors.line_bg},
|
||||
icon = " ",
|
||||
highlight = {colors.red, colors.line_bg}
|
||||
}
|
||||
}
|
||||
|
||||
gls.left[9] = {
|
||||
LeftEnd = {
|
||||
provider = function() return ' ' end,
|
||||
separator = ' ',
|
||||
separator_highlight = {colors.line_bg,colors.line_bg},
|
||||
highlight = {colors.line_bg,colors.line_bg}
|
||||
provider = function()
|
||||
return " "
|
||||
end,
|
||||
separator = " ",
|
||||
separator_highlight = {colors.line_bg, colors.line_bg},
|
||||
highlight = {colors.line_bg, colors.line_bg}
|
||||
}
|
||||
}
|
||||
|
||||
gls.left[10] = {
|
||||
DiagnosticError = {
|
||||
provider = 'DiagnosticError',
|
||||
icon = ' ',
|
||||
highlight = {colors.red,colors.bg}
|
||||
provider = "DiagnosticError",
|
||||
icon = " ",
|
||||
highlight = {colors.red, colors.bg}
|
||||
}
|
||||
}
|
||||
|
||||
gls.left[11] = {
|
||||
Space = {
|
||||
provider = function () return ' ' end,
|
||||
highlight = {colors.line_bg,colors.line_bg}
|
||||
provider = function()
|
||||
return " "
|
||||
end,
|
||||
highlight = {colors.line_bg, colors.line_bg}
|
||||
}
|
||||
}
|
||||
|
||||
gls.left[12] = {
|
||||
DiagnosticWarn = {
|
||||
provider = 'DiagnosticWarn',
|
||||
icon = ' ',
|
||||
highlight = {colors.blue,colors.bg},
|
||||
provider = "DiagnosticWarn",
|
||||
icon = " ",
|
||||
highlight = {colors.blue, colors.bg}
|
||||
}
|
||||
}
|
||||
|
||||
gls.right[1] = {
|
||||
GitIcon = {
|
||||
provider = function() return ' ' end,
|
||||
condition = require('galaxyline.provider_vcs').check_git_workspace,
|
||||
highlight = {colors.green,colors.line_bg},
|
||||
provider = function()
|
||||
return " "
|
||||
end,
|
||||
condition = require("galaxyline.provider_vcs").check_git_workspace,
|
||||
highlight = {colors.green, colors.line_bg}
|
||||
}
|
||||
}
|
||||
|
||||
gls.right[2] = {
|
||||
GitBranch = {
|
||||
provider = 'GitBranch',
|
||||
condition = require('galaxyline.provider_vcs').check_git_workspace,
|
||||
highlight = {colors.green,colors.line_bg},
|
||||
provider = "GitBranch",
|
||||
condition = require("galaxyline.provider_vcs").check_git_workspace,
|
||||
highlight = {colors.green, colors.line_bg}
|
||||
}
|
||||
}
|
||||
|
||||
gls.right[3] = {
|
||||
right_LeftRounded = {
|
||||
provider = function() return '' end,
|
||||
separator = ' ',
|
||||
separator_highlight = {colors.bg,colors.bg},
|
||||
highlight = { colors.red, colors.bg }
|
||||
},
|
||||
provider = function()
|
||||
return ""
|
||||
end,
|
||||
separator = " ",
|
||||
separator_highlight = {colors.bg, colors.bg},
|
||||
highlight = {colors.red, colors.bg}
|
||||
}
|
||||
}
|
||||
|
||||
gls.right[4] = {
|
||||
SiMode = {
|
||||
provider = function()
|
||||
local alias = {
|
||||
n = 'NORMAL',
|
||||
i = 'INSERT',
|
||||
c = 'COMMAND',
|
||||
V = 'VISUAL',
|
||||
[''] = 'VISUAL',
|
||||
v = 'VISUAL',
|
||||
R = 'REPLACE',
|
||||
n = "NORMAL",
|
||||
i = "INSERT",
|
||||
c = "COMMAND",
|
||||
V = "VISUAL",
|
||||
[""] = "VISUAL",
|
||||
v = "VISUAL",
|
||||
R = "REPLACE"
|
||||
}
|
||||
return alias[vim.fn.mode()]
|
||||
end,
|
||||
highlight = { colors.bg, colors.red },
|
||||
},
|
||||
highlight = {colors.bg, colors.red}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
gls.right[5] = {
|
||||
PerCent = {
|
||||
provider = 'LinePercent',
|
||||
separator = ' ',
|
||||
separator_highlight = {colors.red,colors.red},
|
||||
highlight = {colors.bg,colors.fg},
|
||||
provider = "LinePercent",
|
||||
separator = " ",
|
||||
separator_highlight = {colors.red, colors.red},
|
||||
highlight = {colors.bg, colors.fg}
|
||||
}
|
||||
}
|
||||
|
||||
gls.right[6] = {
|
||||
rightRounded = {
|
||||
provider = function() return '' end,
|
||||
highlight = { colors.fg, colors.bg }
|
||||
},
|
||||
provider = function()
|
||||
return ""
|
||||
end,
|
||||
highlight = {colors.fg, colors.bg}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
require('telescope').setup{
|
||||
|
||||
require("telescope").setup {
|
||||
defaults = {
|
||||
vimgrep_arguments = {
|
||||
'rg',
|
||||
'--color=never',
|
||||
'--no-heading',
|
||||
'--with-filename',
|
||||
'--line-number',
|
||||
'--column',
|
||||
'--smart-case'
|
||||
"rg",
|
||||
"--color=never",
|
||||
"--no-heading",
|
||||
"--with-filename",
|
||||
"--line-number",
|
||||
"--column",
|
||||
"--smart-case"
|
||||
},
|
||||
prompt_position = "bottom",
|
||||
prompt_prefix = "> ",
|
||||
|
|
@ -21,15 +20,15 @@ require('telescope').setup{
|
|||
layout_defaults = {
|
||||
horizontal = {
|
||||
mirror = false,
|
||||
preview_width = 0.5,
|
||||
preview_width = 0.5
|
||||
},
|
||||
vertical = {
|
||||
mirror = false,
|
||||
mirror = false
|
||||
}
|
||||
},
|
||||
},
|
||||
file_sorter = require'telescope.sorters'.get_fuzzy_file,
|
||||
file_sorter = require "telescope.sorters".get_fuzzy_file,
|
||||
file_ignore_patterns = {},
|
||||
generic_sorter = require'telescope.sorters'.get_generic_fuzzy_sorter,
|
||||
generic_sorter = require "telescope.sorters".get_generic_fuzzy_sorter,
|
||||
shorten_path = true,
|
||||
winblend = 0,
|
||||
width = 0.75,
|
||||
|
|
@ -37,36 +36,38 @@ require('telescope').setup{
|
|||
results_height = 1,
|
||||
results_width = 0.8,
|
||||
border = {},
|
||||
borderchars = { '─', '│', '─', '│', '╭', '╮', '╯', '╰' },
|
||||
borderchars = {"─", "│", "─", "│", "╭", "╮", "╯", "╰"},
|
||||
color_devicons = true,
|
||||
use_less = true,
|
||||
set_env = { ['COLORTERM'] = 'truecolor' }, -- default = nil,
|
||||
file_previewer = require'telescope.previewers'.vim_buffer_cat.new,
|
||||
grep_previewer = require'telescope.previewers'.vim_buffer_vimgrep.new,
|
||||
qflist_previewer = require'telescope.previewers'.vim_buffer_qflist.new,
|
||||
|
||||
set_env = {["COLORTERM"] = "truecolor"}, -- default = nil,
|
||||
file_previewer = require "telescope.previewers".vim_buffer_cat.new,
|
||||
grep_previewer = require "telescope.previewers".vim_buffer_vimgrep.new,
|
||||
qflist_previewer = require "telescope.previewers".vim_buffer_qflist.new,
|
||||
-- Developer configurations: Not meant for general override
|
||||
buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker
|
||||
buffer_previewer_maker = require "telescope.previewers".buffer_previewer_maker
|
||||
},
|
||||
|
||||
extensions = {
|
||||
media_files = {
|
||||
filetypes = {"png", "webp", "jpg", "jpeg"},
|
||||
find_cmd = "rg" -- find command (defaults to `fd`)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
require("telescope").load_extension("media_files")
|
||||
|
||||
require('telescope').load_extension('media_files')
|
||||
local opt = {noremap = true, silent = true}
|
||||
|
||||
local opt = { noremap = true, silent = true }
|
||||
|
||||
vim.g.mapleader = ' '
|
||||
vim.api.nvim_set_keymap('n', '<Leader>ff', [[<Cmd>lua require('telescope.builtin').find_files()<CR>]], opt)
|
||||
vim.api.nvim_set_keymap('n', '<Leader>fp', [[<Cmd>lua require('telescope').extensions.media_files.media_files()<CR>]], opt)
|
||||
vim.api.nvim_set_keymap('n', '<Leader>fb', [[<Cmd>lua require('telescope.builtin').buffers()<CR>]], opt)
|
||||
vim.api.nvim_set_keymap('n', '<Leader>fh', [[<Cmd>lua require('telescope.builtin').help_tags()<CR>]], opt)
|
||||
vim.api.nvim_set_keymap('n', '<Leader>fo', [[<Cmd>lua require('telescope.builtin').oldfiles()<CR>]], opt)
|
||||
vim.api.nvim_set_keymap('n', '<Leader>fm', [[<Cmd> Neoformat<CR>]] , opt)
|
||||
vim.api.nvim_set_keymap('n', '<C-a>', [[ <Cmd> %y+<CR>]] , opt)
|
||||
vim.g.mapleader = " "
|
||||
vim.api.nvim_set_keymap("n", "<Leader>ff", [[<Cmd>lua require('telescope.builtin').find_files()<CR>]], opt)
|
||||
vim.api.nvim_set_keymap(
|
||||
"n",
|
||||
"<Leader>fp",
|
||||
[[<Cmd>lua require('telescope').extensions.media_files.media_files()<CR>]],
|
||||
opt
|
||||
)
|
||||
vim.api.nvim_set_keymap("n", "<Leader>fb", [[<Cmd>lua require('telescope.builtin').buffers()<CR>]], opt)
|
||||
vim.api.nvim_set_keymap("n", "<Leader>fh", [[<Cmd>lua require('telescope.builtin').help_tags()<CR>]], opt)
|
||||
vim.api.nvim_set_keymap("n", "<Leader>fo", [[<Cmd>lua require('telescope.builtin').oldfiles()<CR>]], opt)
|
||||
vim.api.nvim_set_keymap("n", "<Leader>fm", [[<Cmd> Neoformat<CR>]], opt)
|
||||
vim.api.nvim_set_keymap("n", "<C-a>", [[ <Cmd> %y+<CR>]], opt)
|
||||
|
|
|
|||
|
|
@ -2,12 +2,16 @@ local ts_config = require("nvim-treesitter.configs")
|
|||
|
||||
ts_config.setup {
|
||||
ensure_installed = {
|
||||
"javascript","html","css","bash","cpp","rust","lua"
|
||||
"javascript",
|
||||
"html",
|
||||
"css",
|
||||
"bash",
|
||||
"cpp",
|
||||
"rust",
|
||||
"lua"
|
||||
},
|
||||
|
||||
highlight = {
|
||||
enable = true,
|
||||
use_languagetree = true,
|
||||
},
|
||||
use_languagetree = true
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,31 +1,32 @@
|
|||
local scopes = { o = vim.o, b = vim.bo, w = vim.wo}
|
||||
local scopes = {o = vim.o, b = vim.bo, w = vim.wo}
|
||||
|
||||
local function opt(scope, key, value)
|
||||
scopes[scope][key] = value
|
||||
if scope ~= 'o' then scopes['o'][key] = value end
|
||||
if scope ~= "o" then
|
||||
scopes["o"][key] = value
|
||||
end
|
||||
end
|
||||
|
||||
opt('o', 'hidden', true)
|
||||
opt('o', 'ignorecase', true)
|
||||
opt('o', 'splitbelow', true)
|
||||
opt('o', 'splitright', true)
|
||||
opt('o', 'termguicolors', true)
|
||||
opt('w', 'number', true)
|
||||
opt('o', 'numberwidth' , 2)
|
||||
opt("o", "hidden", true)
|
||||
opt("o", "ignorecase", true)
|
||||
opt("o", "splitbelow", true)
|
||||
opt("o", "splitright", true)
|
||||
opt("o", "termguicolors", true)
|
||||
opt("w", "number", true)
|
||||
opt("o", "numberwidth", 2)
|
||||
|
||||
opt('o' ,'mouse' , "a")
|
||||
|
||||
opt('w', 'signcolumn' , "yes")
|
||||
opt('o' , 'cmdheight' , 1)
|
||||
opt('o' , 'updatetime' , 250)
|
||||
opt('o' , 'clipboard' , 'unnamedplus')
|
||||
opt("o", "mouse", "a")
|
||||
|
||||
opt("w", "signcolumn", "yes")
|
||||
opt("o", "cmdheight", 1)
|
||||
opt("o", "updatetime", 250)
|
||||
opt("o", "clipboard", "unnamedplus")
|
||||
|
||||
local M = {}
|
||||
|
||||
function M.is_buffer_empty()
|
||||
-- Check whether the current buffer is empty
|
||||
return vim.fn.empty(vim.fn.expand('%:t')) == 1
|
||||
return vim.fn.empty(vim.fn.expand("%:t")) == 1
|
||||
end
|
||||
|
||||
function M.has_width_gt(cols)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
vim.cmd [[packadd nvim-web-devicons]]
|
||||
|
||||
require'nvim-web-devicons'.setup {
|
||||
|
||||
require "nvim-web-devicons".setup {
|
||||
override = {
|
||||
html = {
|
||||
icon = "",
|
||||
|
|
@ -53,12 +52,10 @@ require'nvim-web-devicons'.setup {
|
|||
color = "#61afef",
|
||||
name = "toml"
|
||||
},
|
||||
|
||||
lock = {
|
||||
icon = "",
|
||||
color = "#DE6B74",
|
||||
name = "lock"
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue