clean stuff

This commit is contained in:
siduck76 2021-07-16 23:22:36 +05:30
parent 6f2b358d3a
commit 2952f4d5c7
12 changed files with 66 additions and 48 deletions

View File

@ -1,8 +1,7 @@
-- load all options -- load all options
require "options" require "options"
-- only try to load stuff if atleast base16 is initialized -- load stuff only if theme is initialized
-- TODO: Find a better way to trigger PackerSync
if require "theme" then if require "theme" then
local async local async
async = async =
@ -21,7 +20,7 @@ if require "theme" then
) )
async:send() async:send()
else else
-- otherwise run packer sync -- otherwise run PackerSync
require "pluginList" require "pluginList"
print("Now PackerSync will be executed, after completion, restart neovim.\n") print("Now PackerSync will be executed, after completion, restart neovim.\n")
vim.cmd("PackerSync") vim.cmd("PackerSync")

View File

@ -42,7 +42,7 @@ fg("IndentBlanklineChar", line)
-- misc -- -- misc --
fg("LineNr", grey) fg("LineNr", grey)
fg("Comment", grey_fg2) fg("Comment", grey_fg)
fg("NvimInternalError", red) fg("NvimInternalError", red)
fg("VertSplit", line) fg("VertSplit", line)
fg("EndOfBuffer", black) fg("EndOfBuffer", black)

View File

@ -26,7 +26,7 @@ opt.number = true
opt.numberwidth = 2 opt.numberwidth = 2
-- opt.relativenumber = true -- opt.relativenumber = true
-- for indenline -- Indenline
opt.expandtab = true opt.expandtab = true
opt.shiftwidth = 2 opt.shiftwidth = 2
opt.smartindent = true opt.smartindent = true

View File

@ -33,7 +33,7 @@ return packer.startup(
"norcalli/nvim-colorizer.lua", "norcalli/nvim-colorizer.lua",
event = "BufRead", event = "BufRead",
config = function() config = function()
require "plugins.colorizer" require("plugins.others").colorizer()
end end
} }
@ -63,7 +63,7 @@ return packer.startup(
"onsails/lspkind-nvim", "onsails/lspkind-nvim",
event = "BufRead", event = "BufRead",
config = function() config = function()
require "plugins.lspkind" require("plugins.others").lspkind()
end end
} }
@ -122,7 +122,6 @@ return packer.startup(
} }
use {"nvim-telescope/telescope-fzf-native.nvim", run = "make", cmd = "Telescope"} use {"nvim-telescope/telescope-fzf-native.nvim", run = "make", cmd = "Telescope"}
use { use {
"nvim-telescope/telescope-media-files.nvim", "nvim-telescope/telescope-media-files.nvim",
cmd = "Telescope" cmd = "Telescope"
@ -152,7 +151,7 @@ return packer.startup(
"terrortylor/nvim-comment", "terrortylor/nvim-comment",
cmd = "CommentToggle", cmd = "CommentToggle",
config = function() config = function()
require "plugins.comment" require("plugins.others").comment()
end end
} }
@ -188,7 +187,7 @@ return packer.startup(
"karb94/neoscroll.nvim", "karb94/neoscroll.nvim",
event = "WinScrolled", event = "WinScrolled",
config = function() config = function()
require "plugins.neoscroll" require("plugins.others").neoscroll()
end end
} }
@ -206,7 +205,7 @@ return packer.startup(
"lukas-reineke/indent-blankline.nvim", "lukas-reineke/indent-blankline.nvim",
event = "BufRead", event = "BufRead",
setup = function() setup = function()
require "plugins.blankline" require("plugins.others").blankline()
end end
} }
end end

View File

@ -3,7 +3,7 @@ local autosave
if if
not pcall( not pcall(
function() function()
func = require "autosave" autosave = require "autosave"
end end
) )
then then
@ -20,7 +20,7 @@ autosave.setup(
filetype_is_not = {}, filetype_is_not = {},
modifiable = true modifiable = true
}, },
write_all_buffers = true, write_all_buffers = false,
on_off_commands = true, on_off_commands = true,
clean_command_line_interval = 2500 clean_command_line_interval = 2500
} }

View File

@ -1,9 +0,0 @@
-- blankline config
vim.g.indentLine_enabled = 1
vim.g.indent_blankline_char = ""
vim.g.indent_blankline_filetype_exclude = {"help", "terminal", "dashboard"}
vim.g.indent_blankline_buftype_exclude = {"terminal"}
vim.g.indent_blankline_show_trailing_blankline_indent = false
vim.g.indent_blankline_show_first_indent_level = false

View File

@ -1,13 +0,0 @@
local colorizer
if
not pcall(
function()
colorizer = require("colorizer")
end
)
then
return
end
colorizer.setup()
vim.cmd("ColorizerReloadAllBuffers")

View File

@ -1,5 +0,0 @@
pcall(
function()
require("nvim_comment").setup()
end
)

View File

@ -1,5 +0,0 @@
pcall(
function()
require("lspkind").init()
end
)

54
lua/plugins/others.lua Normal file
View File

@ -0,0 +1,54 @@
local M = {}
M.colorizer = function()
local colorizer
if
not pcall(
function()
colorizer = require("colorizer")
end
)
then
return
end
colorizer.setup()
vim.cmd("ColorizerReloadAllBuffers")
end
M.comment = function()
pcall(
function()
require("nvim_comment").setup()
end
)
end
M.lspkind = function()
pcall(
function()
require("lspkind").init()
end
)
end
M.neoscroll = function()
pcall(
function()
require("neoscroll").setup()
end
)
end
M.blankline = function()
vim.g.indentLine_enabled = 1
vim.g.indent_blankline_char = ""
vim.g.indent_blankline_filetype_exclude = {"help", "terminal", "dashboard"}
vim.g.indent_blankline_buftype_exclude = {"terminal"}
vim.g.indent_blankline_show_trailing_blankline_indent = false
vim.g.indent_blankline_show_first_indent_level = false
end
return M

View File

@ -44,7 +44,7 @@ telescope.setup(
file_sorter = require("telescope.sorters").get_fuzzy_file, file_sorter = require("telescope.sorters").get_fuzzy_file,
file_ignore_patterns = {}, file_ignore_patterns = {},
generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter, generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter,
path_display = shorten, path_display = {"absolute"},
winblend = 0, winblend = 0,
border = {}, border = {},
borderchars = {"", "", "", "", "", "", "", ""}, borderchars = {"", "", "", "", "", "", "", ""},

View File

@ -1,4 +1,3 @@
-- colorscheme related stuff
vim.g.nvchad_theme = "onedark" vim.g.nvchad_theme = "onedark"
local base16 local base16
@ -12,7 +11,6 @@ if
return false return false
else else
base16(base16.themes["onedark"], true) base16(base16.themes["onedark"], true)
local cmd = vim.cmd
-- load bg color before async for smooth transition -- load bg color before async for smooth transition
local background = require("themes/" .. vim.g.nvchad_theme).black local background = require("themes/" .. vim.g.nvchad_theme).black