diff --git a/init.lua b/init.lua index 50f7e69..e1ecc64 100644 --- a/init.lua +++ b/init.lua @@ -1,19 +1,17 @@ -- load all plugins -require("pluginsList.lua") -require("file-icons.lua") +require "pluginsList.lua" +require "file-icons.lua" -require("misc-utils.lua") -require("nvimTree.lua") -require("bufferline.lua") -require("statusline.lua") -require("telescope.lua") +require "misc-utils.lua" +require "bufferline.lua" +require "statusline.lua" -require("gitsigns.lua") -require "colorizer".setup() +require("colorizer").setup() +require("neoscroll").setup() -- smooth scroll -- lsp -require("lspconfig.lua") -require("compe.lua") +require "lspconfig.lua" +require "compe.lua" local cmd = vim.cmd local g = vim.g @@ -36,7 +34,7 @@ local indent = 2 g.indentLine_enabled = 1 g.indent_blankline_char = "▏" -cmd("hi IndentBlanklineChar guifg=#2a2e36") +cmd "hi IndentBlanklineChar guifg=#2a2e36" g.indent_blankline_filetype_exclude = {"help", "terminal"} g.indent_blankline_buftype_exclude = {"terminal"} @@ -48,30 +46,37 @@ require("treesitter.lua") require("mappings.lua") -- highlights -- -cmd("hi LineNr guifg=#383c44 guibg=NONE") -cmd("hi Comment guifg=#3d4149") - -cmd("hi SignColumn guibg=NONE") -cmd("hi VertSplit guibg=NONE guifg=#2a2e36") -cmd("hi DiffAdd guifg=#81A1C1 guibg = none") -cmd("hi DiffChange guifg =#3A3E44 guibg = none") -cmd("hi DiffModified guifg = #81A1C1 guibg = none") -cmd("hi EndOfBuffer guifg=#1e222a") +cmd "hi LineNr guifg=#383c44 guibg=NONE" +cmd "hi Comment guifg=#3d4149" +cmd "hi SignColumn guibg=NONE" +cmd "hi VertSplit guibg=NONE guifg=#2a2e36" +cmd "hi EndOfBuffer guifg=#1e222a" +cmd "hi PmenuSel guibg=#98c379" +cmd "hi Pmenu guibg=#282c34" -- telescope stuff and popupmenu -cmd("hi TelescopeBorder guifg=#2a2e36") -cmd("hi TelescopePromptBorder guifg=#2a2e36") -cmd("hi TelescopeResultsBorder guifg=#2a2e36") -cmd("hi TelescopePreviewBorder guifg=#525865") -cmd("hi PmenuSel guibg=#98c379") -cmd("hi Pmenu guibg=#282c34") +require "telescope.lua" --- tree folder name , icon color -cmd("hi NvimTreeFolderIcon guifg = #61afef") -cmd("hi NvimTreeFolderName guifg = #61afef") -cmd("hi NvimTreeIndentMarker guifg=#383c44") +cmd "hi TelescopeBorder guifg=#2a2e36" +cmd "hi TelescopePromptBorder guifg=#2a2e36" +cmd "hi TelescopeResultsBorder guifg=#2a2e36" +cmd "hi TelescopePreviewBorder guifg=#525865" -cmd("hi Normal guibg=NONE ctermbg=NONE") +-- nvim tree color for folder name and icon +require "nvimTree.lua" + +cmd "hi NvimTreeFolderIcon guifg = #61afef" +cmd "hi NvimTreeFolderName guifg = #61afef" +cmd "hi NvimTreeIndentMarker guifg=#383c44" + +cmd "hi Normal guibg=NONE ctermbg=NONE" + +-- git signs +require "gitsigns.lua" + +cmd "hi DiffAdd guifg=#81A1C1 guibg = none" +cmd "hi DiffChange guifg =#3A3E44 guibg = none" +cmd "hi DiffModified guifg = #81A1C1 guibg = none" require("nvim-autopairs").setup() require("lspkind").init( @@ -80,8 +85,6 @@ require("lspkind").init( } ) --- nvimTree bg color - -- hide line numbers in terminal windows vim.api.nvim_exec([[ au BufEnter term://* setlocal nonumber @@ -89,6 +92,3 @@ vim.api.nvim_exec([[ -- inactive statuslines as thin splitlines cmd("highlight! StatusLineNC gui=underline guibg=NONE guifg=#383c44") - --- smooth scroll -require("neoscroll").setup()