pt/nvchad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: stylua formatting update (#261)

Browse Source 
* addded stylua config file

* chore: formatted with stylua
This commit is contained in:
Galen Rowell 2021-08-16 17:49:09 +10:00 committed by GitHub
parent 4abf43aa99
commit 86903ab982
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 1955 additions and 1987 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.stylua.toml Normal file
View File

@ -0,0 +1,6 @@
column_width = 120
line_endings = "Unix"
indent_type = "Spaces"
indent_width = 3
quote_style = "AutoPreferDouble"
no_call_parentheses = true

2
init.lua
View File

@ -1,6 +1,6 @@
local chad_modules = { local chad_modules = {
"options", "options",
"mappings" "mappings",
} }
for i = 1, #chad_modules, 1 do for i = 1, #chad_modules, 1 do

36
lua/chadrc.lua
View File

@ -6,8 +6,8 @@ local M = {
hidden_statusline = { hidden_statusline = {
-- these are filetypes, not pattern matched -- these are filetypes, not pattern matched
"NvimTree", "NvimTree",
"toggleterm" "toggleterm",
} },
}, },
options = { options = {
permanent_undo = true, permanent_undo = true,
@ -26,7 +26,7 @@ local M = {
smartindent = true, smartindent = true,
mapleader = " ", mapleader = " ",
autosave = false, autosave = false,
enable_insertNav = true -- navigation in insertmode enable_insertNav = true, -- navigation in insertmode
}, },
-- enable and disable plugins (true for disable) -- enable and disable plugins (true for disable)
plugin_status = { plugin_status = {
@ -50,30 +50,30 @@ local M = {
autosave_nvim = true, autosave_nvim = true,
nvim_comment = true, nvim_comment = true,
neoscroll_nvim = true, neoscroll_nvim = true,
telescope_media = true telescope_media = true,
}, },
-- make sure you dont use same keys twice -- make sure you dont use same keys twice
mappings = { mappings = {
truezen = { truezen = {
ataraxisMode = "<leader>zz", ataraxisMode = "<leader>zz",
minimalisticmode = "<leader>zm", minimalisticmode = "<leader>zm",
focusmode = "<leader>zf" focusmode = "<leader>zf",
}, },
comment_nvim = { comment_nvim = {
comment_toggle = "<leader>/" comment_toggle = "<leader>/",
}, },
nvimtree = { nvimtree = {
treetoggle = "<C-n>" treetoggle = "<C-n>",
}, },
neoformat = { neoformat = {
format = "<leader>fm" format = "<leader>fm",
}, },
dashboard = { dashboard = {
open = "<leader>db", open = "<leader>db",
newfile = "<leader>fn", newfile = "<leader>fn",
bookmarks = "<leader>bm", bookmarks = "<leader>bm",
sessionload = "<leader>l", sessionload = "<leader>l",
sessionsave = "<leader>s" sessionsave = "<leader>s",
}, },
telescope = { telescope = {
live_grep = "<leader>fw", live_grep = "<leader>fw",
@ -83,29 +83,29 @@ local M = {
buffers = "<leader>fb", buffers = "<leader>fb",
help_tags = "<leader>fh", help_tags = "<leader>fh",
oldfiles = "<leader>fo", oldfiles = "<leader>fo",
themes = "<leader>th" themes = "<leader>th",
}, },
telescope_media = { telescope_media = {
media_files = "<leader>fp" media_files = "<leader>fp",
}, },
bufferline = { bufferline = {
new_buffer = "<S-t>", new_buffer = "<S-t>",
newtab = "<C-t>b", newtab = "<C-t>b",
close = "<S-x>", close = "<S-x>",
cycleNext = "<TAB>", cycleNext = "<TAB>",
cyclePrev = "<S-Tab>" cyclePrev = "<S-Tab>",
}, },
fugitive = { fugitive = {
Git = "<leader>gs", Git = "<leader>gs",
diffget_2 = "<leader>gh", diffget_2 = "<leader>gh",
diffget_3 = "<leader>gl", diffget_3 = "<leader>gl",
git_blame = "<leader>gb" git_blame = "<leader>gb",
}, },
toggleterm = { toggleterm = {
toggle_window = "<leader>w", toggle_window = "<leader>w",
toggle_vert = "<leader>v", toggle_vert = "<leader>v",
toggle_hori = "<leader>h", toggle_hori = "<leader>h",
hide_term = "JK" hide_term = "JK",
}, },
insert_nav = { insert_nav = {
forward = "<C-l>", forward = "<C-l>",
@ -113,15 +113,15 @@ local M = {
top_of_line = "<C-a>", top_of_line = "<C-a>",
end_of_line = "<C-e>", end_of_line = "<C-e>",
prev_line = "<C-j>", prev_line = "<C-j>",
next_line = "<C-k>" next_line = "<C-k>",
}, },
misc = { misc = {
esc_Termmode = "jk", esc_Termmode = "jk",
copywhole_file = "<C-a>", copywhole_file = "<C-a>",
toggle_linenr = "<leader>n", toggle_linenr = "<leader>n",
theme_toggle = "<leader>x" theme_toggle = "<leader>x",
} },
} },
} }
return M return M

10
lua/mappings.lua
View File

@ -131,11 +131,11 @@ end
map("n", "<Esc>", ":noh<CR>", opt) map("n", "<Esc>", ":noh<CR>", opt)
-- Packer commands till because we are not loading it at startup -- Packer commands till because we are not loading it at startup
cmd("silent! command PackerCompile lua require 'pluginList' require('packer').compile()") cmd "silent! command PackerCompile lua require 'pluginList' require('packer').compile()"
cmd("silent! command PackerInstall lua require 'pluginList' require('packer').install()") cmd "silent! command PackerInstall lua require 'pluginList' require('packer').install()"
cmd("silent! command PackerStatus lua require 'pluginList' require('packer').status()") cmd "silent! command PackerStatus lua require 'pluginList' require('packer').status()"
cmd("silent! command PackerSync lua require 'pluginList' require('packer').sync()") cmd "silent! command PackerSync lua require 'pluginList' require('packer').sync()"
cmd("silent! command PackerUpdate lua require 'pluginList' require('packer').update()") cmd "silent! command PackerUpdate lua require 'pluginList' require('packer').update()"
M.fugitive = function() M.fugitive = function()
local m = user_map.fugitive local m = user_map.fugitive

6
lua/options.lua
View File

@ -19,7 +19,7 @@ opt.timeoutlen = options.timeoutlen
opt.clipboard = options.clipboard opt.clipboard = options.clipboard
-- disable nvim intro -- disable nvim intro
opt.shortmess:append("sI") opt.shortmess:append "sI"
-- disable tilde on end of buffer: https://github.com/ neovim/neovim/pull/8546#issuecomment-643643758 -- disable tilde on end of buffer: https://github.com/ neovim/neovim/pull/8546#issuecomment-643643758
opt.fillchars = { eob = " " } opt.fillchars = { eob = " " }
@ -36,7 +36,7 @@ opt.smartindent = options.smartindent
-- go to previous/next line with h,l,left arrow and right arrow -- go to previous/next line with h,l,left arrow and right arrow
-- when cursor reaches end/beginning of line -- when cursor reaches end/beginning of line
opt.whichwrap:append("<>hl") opt.whichwrap:append "<>hl"
g.mapleader = options.mapleader g.mapleader = options.mapleader
g.auto_save = options.autosave g.auto_save = options.autosave
@ -60,7 +60,7 @@ local disabled_built_ins = {
"logipat", "logipat",
"rrhelper", "rrhelper",
"spellfile_plugin", "spellfile_plugin",
"matchit" "matchit",
} }
for _, plugin in pairs(disabled_built_ins) do for _, plugin in pairs(disabled_built_ins) do

22
lua/packerInit.lua
View File

@ -1,31 +1,29 @@
local cmd = vim.cmd local cmd = vim.cmd
cmd("packadd packer.nvim") cmd "packadd packer.nvim"
local present, packer = pcall(require, "packer") local present, packer = pcall(require, "packer")
if not present then if not present then
local packer_path = vim.fn.stdpath("data") .. "/site/pack/packer/opt/packer.nvim" local packer_path = vim.fn.stdpath "data" .. "/site/pack/packer/opt/packer.nvim"
print("Cloning packer..") print "Cloning packer.."
-- remove the dir before cloning -- remove the dir before cloning
vim.fn.delete(packer_path, "rf") vim.fn.delete(packer_path, "rf")
vim.fn.system( vim.fn.system {
{
"git", "git",
"clone", "clone",
"https://github.com/wbthomason/packer.nvim", "https://github.com/wbthomason/packer.nvim",
"--depth", "--depth",
"20", "20",
packer_path packer_path,
} }
)
cmd("packadd packer.nvim") cmd "packadd packer.nvim"
present, packer = pcall(require, "packer") present, packer = pcall(require, "packer")
if present then if present then
print("Packer cloned successfully.") print "Packer cloned successfully."
else else
error("Couldn't clone packer !\nPacker path: " .. packer_path) error("Couldn't clone packer !\nPacker path: " .. packer_path)
end end
@ -36,12 +34,12 @@ return packer.init {
open_fn = function() open_fn = function()
return require("packer.util").float { border = "single" } return require("packer.util").float { border = "single" }
end, end,
prompt_border = "single" prompt_border = "single",
}, },
git = { git = {
clone_timeout = 600 -- Timeout, in seconds, for git clones clone_timeout = 600, -- Timeout, in seconds, for git clones
}, },
auto_clean = true, auto_clean = true,
compile_on_sync = true compile_on_sync = true,
-- auto_reload_compiled = true -- auto_reload_compiled = true
} }

104
lua/pluginList.lua
View File

@ -11,11 +11,10 @@ end
local use = packer.use local use = packer.use
return packer.startup( return packer.startup(function()
function()
use { use {
"wbthomason/packer.nvim", "wbthomason/packer.nvim",
event = "VimEnter" event = "VimEnter",
} }
use { use {
@ -23,8 +22,8 @@ return packer.startup(
disable = not plugin_status.better_esc, disable = not plugin_status.better_esc,
event = "InsertEnter", event = "InsertEnter",
config = function() config = function()
require "plugins.others".escape() require("plugins.others").escape()
end end,
} }
use { use {
@ -35,8 +34,8 @@ return packer.startup(
require "plugins.bufferline" require "plugins.bufferline"
end, end,
setup = function() setup = function()
require "mappings".bufferline() require("mappings").bufferline()
end end,
} }
use { use {
@ -45,7 +44,7 @@ return packer.startup(
after = "nvim-base16.lua", after = "nvim-base16.lua",
config = function() config = function()
require "plugins.statusline" require "plugins.statusline"
end end,
} }
-- color related stuff -- color related stuff
@ -54,7 +53,7 @@ return packer.startup(
after = "packer.nvim", after = "packer.nvim",
config = function() config = function()
require "theme" require "theme"
end end,
} }
use { use {
@ -63,7 +62,7 @@ return packer.startup(
event = "BufRead", event = "BufRead",
config = function() config = function()
require("plugins.others").colorizer() require("plugins.others").colorizer()
end end,
} }
-- lsp stuff -- lsp stuff
@ -72,12 +71,12 @@ return packer.startup(
event = "BufRead", event = "BufRead",
config = function() config = function()
require "plugins.treesitter" require "plugins.treesitter"
end end,
} }
use { use {
"kabouzeid/nvim-lspinstall", "kabouzeid/nvim-lspinstall",
event = "BufRead" event = "BufRead",
} }
use { use {
@ -85,7 +84,7 @@ return packer.startup(
after = "nvim-lspinstall", after = "nvim-lspinstall",
config = function() config = function()
require "plugins.lspconfig" require "plugins.lspconfig"
end end,
} }
use { use {
@ -94,7 +93,7 @@ return packer.startup(
event = "BufEnter", event = "BufEnter",
config = function() config = function()
require("plugins.others").lspkind() require("plugins.others").lspkind()
end end,
} }
use { use {
@ -103,7 +102,7 @@ return packer.startup(
after = "nvim-lspconfig", after = "nvim-lspconfig",
config = function() config = function()
require("plugins.others").signature() require("plugins.others").signature()
end end,
} }
-- load compe in insert mode only -- load compe in insert mode only
@ -121,13 +120,13 @@ return packer.startup(
event = "InsertCharPre", event = "InsertCharPre",
config = function() config = function()
require "plugins.luasnip" require "plugins.luasnip"
end end,
}, },
{ {
"rafamadriz/friendly-snippets", "rafamadriz/friendly-snippets",
event = "InsertCharPre" event = "InsertCharPre",
} },
} },
} }
use { use {
@ -135,8 +134,8 @@ return packer.startup(
disable = not plugin_status.neoformat, disable = not plugin_status.neoformat,
cmd = "Neoformat", cmd = "Neoformat",
setup = function() setup = function()
require "mappings".neoformat() require("mappings").neoformat()
end end,
} }
-- file managing , picker etc -- file managing , picker etc
@ -147,8 +146,8 @@ return packer.startup(
require "plugins.nvimtree" require "plugins.nvimtree"
end, end,
setup = function() setup = function()
require "mappings".nvimtree() require("mappings").nvimtree()
end end,
} }
use { use {
@ -156,16 +155,16 @@ return packer.startup(
after = "nvim-base16.lua", after = "nvim-base16.lua",
config = function() config = function()
require "plugins.icons" require "plugins.icons"
end end,
} }
use { use {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
event = "BufRead" event = "BufRead",
} }
use { use {
"nvim-lua/popup.nvim", "nvim-lua/popup.nvim",
after = "plenary.nvim" after = "plenary.nvim",
} }
use { use {
@ -174,22 +173,22 @@ return packer.startup(
requires = { requires = {
{ {
"nvim-telescope/telescope-fzf-native.nvim", "nvim-telescope/telescope-fzf-native.nvim",
run = "make" run = "make",
}, },
{ {
"nvim-telescope/telescope-media-files.nvim", "nvim-telescope/telescope-media-files.nvim",
disable = not plugin_status.telescope_media, disable = not plugin_status.telescope_media,
setup = function() setup = function()
require "mappings".telescope_media() require("mappings").telescope_media()
end end,
} },
}, },
config = function() config = function()
require "plugins.telescope" require "plugins.telescope"
end, end,
setup = function() setup = function()
require "mappings".telescope() require("mappings").telescope()
end end,
} }
-- git stuff -- git stuff
@ -199,7 +198,7 @@ return packer.startup(
after = "plenary.nvim", after = "plenary.nvim",
config = function() config = function()
require "plugins.gitsigns" require "plugins.gitsigns"
end end,
} }
-- misc plugins -- misc plugins
@ -210,21 +209,21 @@ return packer.startup(
require "plugins.toggleterm" require "plugins.toggleterm"
end, end,
setup = function() setup = function()
require "mappings".toggleterm() require("mappings").toggleterm()
end end,
} }
use { use {
"windwp/nvim-autopairs", "windwp/nvim-autopairs",
after = "nvim-compe", after = "nvim-compe",
config = function() config = function()
require "plugins.autopairs" require "plugins.autopairs"
end end,
} }
use { use {
"andymass/vim-matchup", "andymass/vim-matchup",
disable = not plugin_status.vim_matchup, disable = not plugin_status.vim_matchup,
event = "CursorMoved" event = "CursorMoved",
} }
use { use {
@ -235,8 +234,8 @@ return packer.startup(
require("plugins.others").comment() require("plugins.others").comment()
end, end,
setup = function() setup = function()
require "mappings".comment_nvim() require("mappings").comment_nvim()
end end,
} }
use { use {
@ -247,12 +246,12 @@ return packer.startup(
"DashboardNewFile", "DashboardNewFile",
"DashboardJumpMarks", "DashboardJumpMarks",
"SessionLoad", "SessionLoad",
"SessionSave" "SessionSave",
}, },
setup = function() setup = function()
require "plugins.dashboard" require "plugins.dashboard"
require "mappings".dashboard() require("mappings").dashboard()
end end,
} }
-- load autosave only if its globally enabled -- load autosave only if its globally enabled
@ -264,7 +263,7 @@ return packer.startup(
end, end,
cond = function() cond = function()
return vim.g.auto_save == true return vim.g.auto_save == true
end end,
} }
-- smooth scroll -- smooth scroll
@ -274,7 +273,7 @@ return packer.startup(
event = "WinScrolled", event = "WinScrolled",
config = function() config = function()
require("plugins.others").neoscroll() require("plugins.others").neoscroll()
end end,
} }
use { use {
@ -283,14 +282,14 @@ return packer.startup(
cmd = { cmd = {
"TZAtaraxis", "TZAtaraxis",
"TZMinimalist", "TZMinimalist",
"TZFocus" "TZFocus",
}, },
config = function() config = function()
require "plugins.zenmode" require "plugins.zenmode"
end, end,
setup = function() setup = function()
require "mappings".truezen() require("mappings").truezen()
end end,
} }
-- use "alvan/vim-closetag" -- for html autoclosing tag -- use "alvan/vim-closetag" -- for html autoclosing tag
@ -301,18 +300,17 @@ return packer.startup(
event = "BufRead", event = "BufRead",
setup = function() setup = function()
require("plugins.others").blankline() require("plugins.others").blankline()
end end,
} }
use { use {
"tpope/vim-fugitive", "tpope/vim-fugitive",
disable = not plugin_status.vim_fugitive, disable = not plugin_status.vim_fugitive,
cmd = { cmd = {
"Git" "Git",
}, },
setup = function() setup = function()
require "mappings".fugitive() require("mappings").fugitive()
end end,
} }
end end)
)

6
lua/plugins/autopairs.lua
View File

@ -6,9 +6,7 @@ if not (present1 or present2) then
end end
autopairs.setup() autopairs.setup()
autopairs_completion.setup( autopairs_completion.setup {
{
map_cr = true, map_cr = true,
map_complete = true -- insert () func completion map_complete = true, -- insert () func completion
} }
)

10
lua/plugins/autosave.lua
View File

@ -4,18 +4,16 @@ if not present then
return return
end end
autosave.setup( autosave.setup {
{
enabled = vim.g.auto_save, -- takes boolean value from init.lua enabled = vim.g.auto_save, -- takes boolean value from init.lua
execution_message = "autosaved at : " .. vim.fn.strftime("%H:%M:%S"), execution_message = "autosaved at : " .. vim.fn.strftime "%H:%M:%S",
events = { "InsertLeave", "TextChanged" }, events = { "InsertLeave", "TextChanged" },
conditions = { conditions = {
exists = true, exists = true,
filetype_is_not = {}, filetype_is_not = {},
modifiable = true modifiable = true,
}, },
write_all_buffers = false, write_all_buffers = false,
on_off_commands = true, on_off_commands = true,
clean_command_line_interval = 2500 clean_command_line_interval = 2500,
} }
)

40
lua/plugins/bufferline.lua
View File

@ -23,83 +23,83 @@ bufferline.setup {
show_buffer_close_icons = true, show_buffer_close_icons = true,
separator_style = "thin", separator_style = "thin",
mappings = true, mappings = true,
always_show_bufferline = true always_show_bufferline = true,
}, },
highlights = { highlights = {
fill = { fill = {
guifg = colors.grey_fg, guifg = colors.grey_fg,
guibg = colors.black2 guibg = colors.black2,
}, },
background = { background = {
guifg = colors.grey_fg, guifg = colors.grey_fg,
guibg = colors.black2 guibg = colors.black2,
}, },
-- buffers -- buffers
buffer_visible = { buffer_visible = {
guifg = colors.light_grey, guifg = colors.light_grey,
guibg = colors.black2 guibg = colors.black2,
}, },
buffer_selected = { buffer_selected = {
guifg = colors.white, guifg = colors.white,
guibg = colors.black, guibg = colors.black,
gui = "bold" gui = "bold",
}, },
-- tabs -- tabs
tab = { tab = {
guifg = colors.light_grey, guifg = colors.light_grey,
guibg = colors.one_bg3 guibg = colors.one_bg3,
}, },
tab_selected = { tab_selected = {
guifg = colors.black2, guifg = colors.black2,
guibg = colors.nord_blue guibg = colors.nord_blue,
}, },
tab_close = { tab_close = {
guifg = colors.red, guifg = colors.red,
guibg = colors.black guibg = colors.black,
}, },
indicator_selected = { indicator_selected = {
guifg = colors.black, guifg = colors.black,
guibg = colors.black guibg = colors.black,
}, },
-- separators -- separators
separator = { separator = {
guifg = colors.black2, guifg = colors.black2,
guibg = colors.black2 guibg = colors.black2,
}, },
separator_visible = { separator_visible = {
guifg = colors.black2, guifg = colors.black2,
guibg = colors.black2 guibg = colors.black2,
}, },
separator_selected = { separator_selected = {
guifg = colors.black2, guifg = colors.black2,
guibg = colors.black2 guibg = colors.black2,
}, },
-- modified -- modified
modified = { modified = {
guifg = colors.red, guifg = colors.red,
guibg = colors.black2 guibg = colors.black2,
}, },
modified_visible = { modified_visible = {
guifg = colors.red, guifg = colors.red,
guibg = colors.black2 guibg = colors.black2,
}, },
modified_selected = { modified_selected = {
guifg = colors.green, guifg = colors.green,
guibg = colors.black guibg = colors.black,
}, },
-- close buttons -- close buttons
close_button = { close_button = {
guifg = colors.light_grey, guifg = colors.light_grey,
guibg = colors.black2 guibg = colors.black2,
}, },
close_button_visible = { close_button_visible = {
guifg = colors.light_grey, guifg = colors.light_grey,
guibg = colors.black2 guibg = colors.black2,
}, },
close_button_selected = { close_button_selected = {
guifg = colors.red, guifg = colors.red,
guibg = colors.black guibg = colors.black,
} },
} },
} }

4
lua/plugins/compe.lua
View File

@ -20,6 +20,6 @@ compe.setup {
buffer = { kind = "﬘", true }, buffer = { kind = "﬘", true },
luasnip = { kind = "﬌", true }, luasnip = { kind = "﬌", true },
nvim_lsp = true, nvim_lsp = true,
nvim_lua = true nvim_lua = true,
} },
} }

6
lua/plugins/dashboard.lua
View File

@ -21,7 +21,7 @@ g.dashboard_custom_header = {
" ⠙⠃ ⣼⣿⡟ ⠈⠻⣿⣿⣦⣌⡇⠻⣿⣿⣷⣿⣿⣿ ⣿⣿⡇ ⠛⠻⢷⣄ ", " ⠙⠃ ⣼⣿⡟ ⠈⠻⣿⣿⣦⣌⡇⠻⣿⣿⣷⣿⣿⣿ ⣿⣿⡇ ⠛⠻⢷⣄ ",
" ⢻⣿⣿⣄ ⠈⠻⣿⣿⣿⣷⣿⣿⣿⣿⣿⡟ ⠫⢿⣿⡆ ", " ⢻⣿⣿⣄ ⠈⠻⣿⣿⣿⣷⣿⣿⣿⣿⣿⡟ ⠫⢿⣿⡆ ",
" ⠻⣿⣿⣿⣿⣶⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⡟⢀⣀⣤⣾⡿⠃ ", " ⠻⣿⣿⣿⣿⣶⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⡟⢀⣀⣤⣾⡿⠃ ",
" " " ",
} }
g.dashboard_custom_section = { g.dashboard_custom_section = {
@ -30,11 +30,11 @@ g.dashboard_custom_section = {
c = { description = { " Find Word SPC f w" }, command = "Telescope live_grep" }, c = { description = { " Find Word SPC f w" }, command = "Telescope live_grep" },
d = { description = { "洛 New File SPC f n" }, command = "DashboardNewFile" }, d = { description = { "洛 New File SPC f n" }, command = "DashboardNewFile" },
e = { description = { " Bookmarks SPC b m" }, command = "Telescope marks" }, e = { description = { " Bookmarks SPC b m" }, command = "Telescope marks" },
f = {description = {" Load Last Session SPC s l"}, command = "SessionLoad"} f = { description = { " Load Last Session SPC s l" }, command = "SessionLoad" },
} }
g.dashboard_custom_footer = { g.dashboard_custom_footer = {
" ", " ",
-- "NvChad Loaded " .. plugins_count .. " plugins", -- "NvChad Loaded " .. plugins_count .. " plugins",
"NvChad v0.5" "NvChad v0.5",
} }

12
lua/plugins/gitsigns.lua
View File

@ -9,24 +9,24 @@ gitsigns.setup {
change = { hl = "DiffChange", text = "│", numhl = "GitSignsChangeNr" }, change = { hl = "DiffChange", text = "│", numhl = "GitSignsChangeNr" },
delete = { hl = "DiffDelete", text = "_", numhl = "GitSignsDeleteNr" }, delete = { hl = "DiffDelete", text = "_", numhl = "GitSignsDeleteNr" },
topdelete = { hl = "DiffDelete", text = "‾", numhl = "GitSignsDeleteNr" }, topdelete = { hl = "DiffDelete", text = "‾", numhl = "GitSignsDeleteNr" },
changedelete = {hl = "DiffChange", text = "~", numhl = "GitSignsChangeNr"} changedelete = { hl = "DiffChange", text = "~", numhl = "GitSignsChangeNr" },
}, },
numhl = false, numhl = false,
keymaps = { keymaps = {
-- Default keymap options -- Default keymap options
noremap = true, noremap = true,
buffer = 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\".next_hunk()<CR>'" },
["n [c"] = {expr = true, '&diff ? \'[c\' : \'<cmd>lua require"gitsigns".prev_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>hs"] = '<cmd>lua require"gitsigns".stage_hunk()<CR>',
["n <leader>hu"] = '<cmd>lua require"gitsigns".undo_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>hr"] = '<cmd>lua require"gitsigns".reset_hunk()<CR>',
["n <leader>hp"] = '<cmd>lua require"gitsigns".preview_hunk()<CR>', ["n <leader>hp"] = '<cmd>lua require"gitsigns".preview_hunk()<CR>',
["n <leader>hb"] = '<cmd>lua require"gitsigns".blame_line()<CR>' ["n <leader>hb"] = '<cmd>lua require"gitsigns".blame_line()<CR>',
}, },
watch_index = { watch_index = {
interval = 100 interval = 100,
}, },
sign_priority = 5, sign_priority = 5,
status_formatter = nil -- Use default status_formatter = nil, -- Use default
} }

48
lua/plugins/icons.lua
View File

@ -11,112 +11,112 @@ icons.setup {
html = { html = {
icon = "", icon = "",
color = colors.baby_pink, color = colors.baby_pink,
name = "html" name = "html",
}, },
css = { css = {
icon = "", icon = "",
color = colors.blue, color = colors.blue,
name = "css" name = "css",
}, },
js = { js = {
icon = "", icon = "",
color = colors.sun, color = colors.sun,
name = "js" name = "js",
}, },
ts = { ts = {
icon = "ﯤ", icon = "ﯤ",
color = colors.teal, color = colors.teal,
name = "ts" name = "ts",
}, },
kt = { kt = {
icon = "󱈙", icon = "󱈙",
color = colors.orange, color = colors.orange,
name = "kt" name = "kt",
}, },
png = { png = {
icon = "", icon = "",
color = colors.dark_purple, color = colors.dark_purple,
name = "png" name = "png",
}, },
jpg = { jpg = {
icon = "", icon = "",
color = colors.dark_purple, color = colors.dark_purple,
name = "jpg" name = "jpg",
}, },
jpeg = { jpeg = {
icon = "", icon = "",
color = colors.dark_purple, color = colors.dark_purple,
name = "jpeg" name = "jpeg",
}, },
mp3 = { mp3 = {
icon = "", icon = "",
color = colors.white, color = colors.white,
name = "mp3" name = "mp3",
}, },
mp4 = { mp4 = {
icon = "", icon = "",
color = colors.white, color = colors.white,
name = "mp4" name = "mp4",
}, },
out = { out = {
icon = "", icon = "",
color = colors.white, color = colors.white,
name = "out" name = "out",
}, },
Dockerfile = { Dockerfile = {
icon = "", icon = "",
color = colors.cyan, color = colors.cyan,
name = "Dockerfile" name = "Dockerfile",
}, },
rb = { rb = {
icon = "", icon = "",
color = colors.pink, color = colors.pink,
name = "rb" name = "rb",
}, },
vue = { vue = {
icon = "﵂", icon = "﵂",
color = colors.vibrant_green, color = colors.vibrant_green,
name = "vue" name = "vue",
}, },
py = { py = {
icon = "", icon = "",
color = colors.cyan, color = colors.cyan,
name = "py" name = "py",
}, },
toml = { toml = {
icon = "", icon = "",
color = colors.blue, color = colors.blue,
name = "toml" name = "toml",
}, },
lock = { lock = {
icon = "", icon = "",
color = colors.red, color = colors.red,
name = "lock" name = "lock",
}, },
zip = { zip = {
icon = "", icon = "",
color = colors.sun, color = colors.sun,
name = "zip" name = "zip",
}, },
xz = { xz = {
icon = "", icon = "",
color = colors.sun, color = colors.sun,
name = "xz" name = "xz",
}, },
deb = { deb = {
icon = "", icon = "",
color = colors.cyan, color = colors.cyan,
name = "deb" name = "deb",
}, },
rpm = { rpm = {
icon = "", icon = "",
color = colors.orange, color = colors.orange,
name = "rpm" name = "rpm",
}, },
lua = { lua = {
icon = "", icon = "",
color = colors.blue, color = colors.blue,
name = "lua" name = "lua",
} },
} },
} }

34
lua/plugins/lspconfig.lua
View File

@ -53,7 +53,7 @@ local function setup_servers()
lspconfig[lang].setup { lspconfig[lang].setup {
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
root_dir = vim.loop.cwd root_dir = vim.loop.cwd,
} }
elseif lang == "lua" then elseif lang == "lua" then
lspconfig[lang].setup { lspconfig[lang].setup {
@ -61,21 +61,21 @@ local function setup_servers()
settings = { settings = {
Lua = { Lua = {
diagnostics = { diagnostics = {
globals = {"vim"} globals = { "vim" },
}, },
workspace = { workspace = {
library = { library = {
[vim.fn.expand("$VIMRUNTIME/lua")] = true, [vim.fn.expand "$VIMRUNTIME/lua"] = true,
[vim.fn.expand("$VIMRUNTIME/lua/vim/lsp")] = true [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true,
}, },
maxPreload = 100000, maxPreload = 100000,
preloadFileSize = 10000 preloadFileSize = 10000,
}, },
telemetry = { telemetry = {
enable = false enable = false,
} },
} },
} },
} }
end end
end end
@ -86,7 +86,7 @@ setup_servers()
-- Automatically reload after `:LspInstall <server>` so we don't have to restart neovim -- Automatically reload after `:LspInstall <server>` so we don't have to restart neovim
lspinstall.post_install_hook = function() lspinstall.post_install_hook = function()
setup_servers() -- reload installed servers setup_servers() -- reload installed servers
vim.cmd("bufdo e") -- triggers FileType autocmd that starts the server vim.cmd "bufdo e"
end end
-- replace the default lsp diagnostic symbols -- replace the default lsp diagnostic symbols
@ -99,24 +99,20 @@ lspSymbol("Warning", "")
lspSymbol("Information", "") lspSymbol("Information", "")
lspSymbol("Hint", "") lspSymbol("Hint", "")
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
vim.lsp.with(
vim.lsp.diagnostic.on_publish_diagnostics,
{
virtual_text = { virtual_text = {
prefix = "", prefix = "",
spacing = 0 spacing = 0,
}, },
signs = true, signs = true,
underline = true, underline = true,
-- set this to true if you want diagnostics to show in insert mode -- set this to true if you want diagnostics to show in insert mode
update_in_insert = false update_in_insert = false,
} })
)
-- suppress error messages from lang servers -- suppress error messages from lang servers
vim.notify = function(msg, log_level, _opts) vim.notify = function(msg, log_level, _opts)
if msg:match("exit code") then if msg:match "exit code" then
return return
end end
if log_level == vim.log.levels.ERROR then if log_level == vim.log.levels.ERROR then

20
lua/plugins/luasnip.lua
View File

@ -8,8 +8,8 @@ local t = function(str)
end end
local check_back_space = function() local check_back_space = function()
local col = vim.fn.col(".") - 1 local col = vim.fn.col "." - 1
if col == 0 or vim.fn.getline("."):sub(col, col):match("%s") then if col == 0 or vim.fn.getline("."):sub(col, col):match "%s" then
return true return true
else else
return false return false
@ -39,19 +39,15 @@ end
_G.completions = function() _G.completions = function()
local npairs local npairs
if if not pcall(function()
not pcall(
function()
npairs = require "nvim-autopairs" npairs = require "nvim-autopairs"
end end) then
)
then
return return
end end
if vim.fn.pumvisible() == 1 then if vim.fn.pumvisible() == 1 then
if vim.fn.complete_info()["selected"] ~= -1 then if vim.fn.complete_info()["selected"] ~= -1 then
return vim.fn["compe#confirm"]("<CR>") return vim.fn["compe#confirm"] "<CR>"
end end
end end
return npairs.check_break_line_char() return npairs.check_break_line_char()
@ -63,10 +59,8 @@ vim.api.nvim_set_keymap("i", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true})
vim.api.nvim_set_keymap("s", "<S-Tab>", "v:lua.s_tab_complete()", { expr = true }) vim.api.nvim_set_keymap("s", "<S-Tab>", "v:lua.s_tab_complete()", { expr = true })
vim.api.nvim_set_keymap("i", "<CR>", "v:lua.completions()", { expr = true }) vim.api.nvim_set_keymap("i", "<CR>", "v:lua.completions()", { expr = true })
luasnip.config.set_config( luasnip.config.set_config {
{
history = true, history = true,
updateevents = "TextChanged,TextChangedI" updateevents = "TextChanged,TextChangedI",
} }
)
require("luasnip/loaders/from_vscode").load() require("luasnip/loaders/from_vscode").load()

70
lua/plugins/nvimtree.lua
View File

@ -32,7 +32,7 @@ g.nvim_tree_update_cwd = 1
g.nvim_tree_show_icons = { g.nvim_tree_show_icons = {
git = 1, git = 1,
folders = 1, folders = 1,
files = 1 files = 1,
-- folder_arrows= 1 -- folder_arrows= 1
} }
g.nvim_tree_icons = { g.nvim_tree_icons = {
@ -45,7 +45,7 @@ g.nvim_tree_icons = {
renamed = "➜", renamed = "➜",
untracked = "★", untracked = "★",
deleted = "", deleted = "",
ignored = "◌" ignored = "◌",
}, },
folder = { folder = {
-- disable indent_markers option to get arrows working or if you want both arrows and indent then just add the arrow icons in front ofthe default and opened folders below! -- disable indent_markers option to get arrows working or if you want both arrows and indent then just add the arrow icons in front ofthe default and opened folders below!
@ -56,40 +56,40 @@ g.nvim_tree_icons = {
empty = "", --  empty = "", -- 
empty_open = "", empty_open = "",
symlink = "", symlink = "",
symlink_open = "" symlink_open = "",
} },
} }
g.nvim_tree_bindings = { g.nvim_tree_bindings = {
{key = {"<CR>", "o", "<2-LeftMouse>"}, cb = tree_cb("edit")}, { key = { "<CR>", "o", "<2-LeftMouse>" }, cb = tree_cb "edit" },
{key = {"<2-RightMouse>", "<C-]>"}, cb = tree_cb("cd")}, { key = { "<2-RightMouse>", "<C-]>" }, cb = tree_cb "cd" },
{key = "<C-v>", cb = tree_cb("vsplit")}, { key = "<C-v>", cb = tree_cb "vsplit" },
{key = "<C-x>", cb = tree_cb("split")}, { key = "<C-x>", cb = tree_cb "split" },
{key = "<C-t>", cb = tree_cb("tabnew")}, { key = "<C-t>", cb = tree_cb "tabnew" },
{key = "<", cb = tree_cb("prev_sibling")}, { key = "<", cb = tree_cb "prev_sibling" },
{key = ">", cb = tree_cb("next_sibling")}, { key = ">", cb = tree_cb "next_sibling" },
{key = "P", cb = tree_cb("parent_node")}, { key = "P", cb = tree_cb "parent_node" },
{key = "<BS>", cb = tree_cb("close_node")}, { key = "<BS>", cb = tree_cb "close_node" },
{key = "<S-CR>", cb = tree_cb("close_node")}, { key = "<S-CR>", cb = tree_cb "close_node" },
{key = "<Tab>", cb = tree_cb("preview")}, { key = "<Tab>", cb = tree_cb "preview" },
{key = "K", cb = tree_cb("first_sibling")}, { key = "K", cb = tree_cb "first_sibling" },
{key = "J", cb = tree_cb("last_sibling")}, { key = "J", cb = tree_cb "last_sibling" },
{key = "I", cb = tree_cb("toggle_ignored")}, { key = "I", cb = tree_cb "toggle_ignored" },
{key = "H", cb = tree_cb("toggle_dotfiles")}, { key = "H", cb = tree_cb "toggle_dotfiles" },
{key = "R", cb = tree_cb("refresh")}, { key = "R", cb = tree_cb "refresh" },
{key = "a", cb = tree_cb("create")}, { key = "a", cb = tree_cb "create" },
{key = "d", cb = tree_cb("remove")}, { key = "d", cb = tree_cb "remove" },
{key = "r", cb = tree_cb("rename")}, { key = "r", cb = tree_cb "rename" },
{key = "<C->", cb = tree_cb("full_rename")}, { key = "<C->", cb = tree_cb "full_rename" },
{key = "x", cb = tree_cb("cut")}, { key = "x", cb = tree_cb "cut" },
{key = "c", cb = tree_cb("copy")}, { key = "c", cb = tree_cb "copy" },
{key = "p", cb = tree_cb("paste")}, { key = "p", cb = tree_cb "paste" },
{key = "y", cb = tree_cb("copy_name")}, { key = "y", cb = tree_cb "copy_name" },
{key = "Y", cb = tree_cb("copy_path")}, { key = "Y", cb = tree_cb "copy_path" },
{key = "gy", cb = tree_cb("copy_absolute_path")}, { key = "gy", cb = tree_cb "copy_absolute_path" },
{key = "[c", cb = tree_cb("prev_git_item")}, { key = "[c", cb = tree_cb "prev_git_item" },
{key = "}c", cb = tree_cb("next_git_item")}, { key = "}c", cb = tree_cb "next_git_item" },
{key = "-", cb = tree_cb("dir_up")}, { key = "-", cb = tree_cb "dir_up" },
{key = "q", cb = tree_cb("close")}, { key = "q", cb = tree_cb "close" },
{key = "g?", cb = tree_cb("toggle_help")} { key = "g?", cb = tree_cb "toggle_help" },
} }

16
lua/plugins/others.lua
View File

@ -4,7 +4,7 @@ M.colorizer = function()
local present, colorizer = pcall(require, "colorizer") local present, colorizer = pcall(require, "colorizer")
if present then if present then
colorizer.setup() colorizer.setup()
vim.cmd("ColorizerReloadAllBuffers") vim.cmd "ColorizerReloadAllBuffers"
end end
end end
@ -28,11 +28,9 @@ M.lspkind = function()
end end
M.neoscroll = function() M.neoscroll = function()
pcall( pcall(function()
function()
require("neoscroll").setup() require("neoscroll").setup()
end end)
)
end end
M.blankline = function() M.blankline = function()
@ -49,8 +47,7 @@ end
M.signature = function() M.signature = function()
local present, lspsignature = pcall(require, "lsp_signature") local present, lspsignature = pcall(require, "lsp_signature")
if present then if present then
lspsignature.setup( lspsignature.setup {
{
bind = true, bind = true,
doc_lines = 2, doc_lines = 2,
floating_window = true, floating_window = true,
@ -63,12 +60,11 @@ M.signature = function()
max_height = 22, max_height = 22,
max_width = 120, -- max_width of signature floating_window, line will be wrapped if exceed max_width max_width = 120, -- max_width of signature floating_window, line will be wrapped if exceed max_width
handler_opts = { handler_opts = {
border = "single" -- double, single, shadow, none border = "single", -- double, single, shadow, none
}, },
zindex = 200, -- by default it will be on top of all floating windows, set to 50 send it to bottom zindex = 200, -- by default it will be on top of all floating windows, set to 50 send it to bottom
padding = "" -- character to pad on left and right of signature can be ' ', or '|' etc padding = "", -- character to pad on left and right of signature can be ' ', or '|' etc
} }
)
end end
end end

82
lua/plugins/statusline.lua
View File

@ -19,8 +19,8 @@ gls.left[1] = {
provider = function() provider = function()
return "▋" return "▋"
end, end,
highlight = {colors.nord_blue, colors.nord_blue} highlight = { colors.nord_blue, colors.nord_blue },
} },
} }
gls.left[2] = { gls.left[2] = {
@ -30,29 +30,29 @@ gls.left[2] = {
end, end,
highlight = { colors.statusline_bg, colors.nord_blue }, highlight = { colors.statusline_bg, colors.nord_blue },
separator = right_separator .. " ", separator = right_separator .. " ",
separator_highlight = {colors.nord_blue, colors.lightbg} separator_highlight = { colors.nord_blue, colors.lightbg },
} },
} }
gls.left[3] = { gls.left[3] = {
FileIcon = { FileIcon = {
provider = "FileIcon", provider = "FileIcon",
condition = condition.buffer_not_empty, condition = condition.buffer_not_empty,
highlight = {colors.white, colors.lightbg} highlight = { colors.white, colors.lightbg },
} },
} }
gls.left[4] = { gls.left[4] = {
FileName = { FileName = {
provider = function() provider = function()
local fileinfo = require('galaxyline.provider_fileinfo') local fileinfo = require "galaxyline.provider_fileinfo"
return fileinfo.get_current_file_name("", "") return fileinfo.get_current_file_name("", "")
end, end,
condition = condition.buffer_not_empty, condition = condition.buffer_not_empty,
highlight = { colors.white, colors.lightbg }, highlight = { colors.white, colors.lightbg },
separator = right_separator, separator = right_separator,
separator_highlight = {colors.lightbg, colors.lightbg2} separator_highlight = { colors.lightbg, colors.lightbg2 },
} },
} }
gls.left[5] = { gls.left[5] = {
@ -63,8 +63,8 @@ gls.left[5] = {
end, end,
highlight = { colors.grey_fg2, colors.lightbg2 }, highlight = { colors.grey_fg2, colors.lightbg2 },
separator = right_separator, separator = right_separator,
separator_highlight = {colors.lightbg2, colors.statusline_bg} separator_highlight = { colors.lightbg2, colors.statusline_bg },
} },
} }
local checkwidth = function() local checkwidth = function()
@ -80,8 +80,8 @@ gls.left[6] = {
provider = "DiffAdd", provider = "DiffAdd",
condition = checkwidth, condition = checkwidth,
icon = "", icon = "",
highlight = {colors.white, colors.statusline_bg} highlight = { colors.white, colors.statusline_bg },
} },
} }
gls.left[7] = { gls.left[7] = {
@ -89,8 +89,8 @@ gls.left[7] = {
provider = "DiffModified", provider = "DiffModified",
condition = checkwidth, condition = checkwidth,
icon = "", icon = "",
highlight = {colors.grey_fg2, colors.statusline_bg} highlight = { colors.grey_fg2, colors.statusline_bg },
} },
} }
gls.left[8] = { gls.left[8] = {
@ -98,24 +98,24 @@ gls.left[8] = {
provider = "DiffRemove", provider = "DiffRemove",
condition = checkwidth, condition = checkwidth,
icon = "", icon = "",
highlight = {colors.grey_fg2, colors.statusline_bg} highlight = { colors.grey_fg2, colors.statusline_bg },
} },
} }
gls.left[9] = { gls.left[9] = {
DiagnosticError = { DiagnosticError = {
provider = "DiagnosticError", provider = "DiagnosticError",
icon = "", icon = "",
highlight = {colors.red, colors.statusline_bg} highlight = { colors.red, colors.statusline_bg },
} },
} }
gls.left[10] = { gls.left[10] = {
DiagnosticWarn = { DiagnosticWarn = {
provider = "DiagnosticWarn", provider = "DiagnosticWarn",
icon = "", icon = "",
highlight = {colors.yellow, colors.statusline_bg} highlight = { colors.yellow, colors.statusline_bg },
} },
} }
gls.right[1] = { gls.right[1] = {
@ -135,8 +135,8 @@ gls.right[1] = {
return "" return ""
end end
end, end,
highlight = {colors.grey_fg2, colors.statusline_bg} highlight = { colors.grey_fg2, colors.statusline_bg },
} },
} }
gls.right[2] = { gls.right[2] = {
@ -147,16 +147,16 @@ gls.right[2] = {
condition = require("galaxyline.condition").check_git_workspace, condition = require("galaxyline.condition").check_git_workspace,
highlight = { colors.grey_fg2, colors.statusline_bg }, highlight = { colors.grey_fg2, colors.statusline_bg },
separator = " ", separator = " ",
separator_highlight = {colors.statusline_bg, colors.statusline_bg} separator_highlight = { colors.statusline_bg, colors.statusline_bg },
} },
} }
gls.right[3] = { gls.right[3] = {
GitBranch = { GitBranch = {
provider = "GitBranch", provider = "GitBranch",
condition = require("galaxyline.condition").check_git_workspace, condition = require("galaxyline.condition").check_git_workspace,
highlight = {colors.grey_fg2, colors.statusline_bg} highlight = { colors.grey_fg2, colors.statusline_bg },
} },
} }
local mode_colors = { local mode_colors = {
@ -169,7 +169,7 @@ local mode_colors = {
[86] = { "V_LINE", colors.cyan }, [86] = { "V_LINE", colors.cyan },
[82] = { "REPLACE", colors.orange }, [82] = { "REPLACE", colors.orange },
[115] = { "SELECT", colors.nord_blue }, [115] = { "SELECT", colors.nord_blue },
[83] = {"S-LINE", colors.nord_blue} [83] = { "S-LINE", colors.nord_blue },
} }
local mode = function(n) local mode = function(n)
@ -184,8 +184,8 @@ gls.right[4] = {
end, end,
separator = " ", separator = " ",
separator_highlight = { colors.statusline_bg, colors.statusline_bg }, separator_highlight = { colors.statusline_bg, colors.statusline_bg },
highlight = {"GalaxyViMode", colors.statusline_bg} highlight = { "GalaxyViMode", colors.statusline_bg },
} },
} }
gls.right[5] = { gls.right[5] = {
@ -194,8 +194,8 @@ gls.right[5] = {
vim.cmd("hi GalaxyviMode_icon guibg=" .. mode(2)) vim.cmd("hi GalaxyviMode_icon guibg=" .. mode(2))
return "" return ""
end, end,
highlight = {colors.statusline_bg, colors.red} highlight = { colors.statusline_bg, colors.red },
} },
} }
gls.right[6] = { gls.right[6] = {
@ -204,8 +204,8 @@ gls.right[6] = {
vim.cmd("hi GalaxyViMode guifg=" .. mode(2)) vim.cmd("hi GalaxyViMode guifg=" .. mode(2))
return " " .. mode(1) .. " " return " " .. mode(1) .. " "
end, end,
highlight = {"GalaxyViMode", colors.lightbg} highlight = { "GalaxyViMode", colors.lightbg },
} },
} }
gls.right[7] = { gls.right[7] = {
@ -215,24 +215,24 @@ gls.right[7] = {
end, end,
separator = left_separator, separator = left_separator,
separator_highlight = { colors.green, colors.lightbg }, separator_highlight = { colors.green, colors.lightbg },
highlight = {colors.lightbg, colors.green} highlight = { colors.lightbg, colors.green },
} },
} }
gls.right[8] = { gls.right[8] = {
line_percentage = { line_percentage = {
provider = function() provider = function()
local current_line = vim.fn.line(".") local current_line = vim.fn.line "."
local total_line = vim.fn.line("$") local total_line = vim.fn.line "$"
if current_line == 1 then if current_line == 1 then
return " Top " return " Top "
elseif current_line == vim.fn.line("$") then elseif current_line == vim.fn.line "$" then
return " Bot " return " Bot "
end end
local result, _ = math.modf((current_line / total_line) * 100) local result, _ = math.modf((current_line / total_line) * 100)
return " " .. result .. "% " return " " .. result .. "% "
end, end,
highlight = {colors.green, colors.lightbg} highlight = { colors.green, colors.lightbg },
} },
} }

38
lua/plugins/telescope.lua
View File

@ -3,8 +3,7 @@ if not present then
return return
end end
telescope.setup( telescope.setup {
{
defaults = { defaults = {
vimgrep_arguments = { vimgrep_arguments = {
"rg", "rg",
@ -13,7 +12,7 @@ telescope.setup(
"--with-filename", "--with-filename",
"--line-number", "--line-number",
"--column", "--column",
"--smart-case" "--smart-case",
}, },
prompt_prefix = "", prompt_prefix = "",
selection_caret = " ", selection_caret = " ",
@ -26,14 +25,14 @@ telescope.setup(
horizontal = { horizontal = {
prompt_position = "top", prompt_position = "top",
preview_width = 0.55, preview_width = 0.55,
results_width = 0.8 results_width = 0.8,
}, },
vertical = { vertical = {
mirror = false mirror = false,
}, },
width = 0.87, width = 0.87,
height = 0.80, height = 0.80,
preview_cutoff = 120 preview_cutoff = 120,
}, },
file_sorter = require("telescope.sorters").get_fuzzy_file, file_sorter = require("telescope.sorters").get_fuzzy_file,
file_ignore_patterns = {}, file_ignore_patterns = {},
@ -49,37 +48,32 @@ telescope.setup(
grep_previewer = require("telescope.previewers").vim_buffer_vimgrep.new, grep_previewer = require("telescope.previewers").vim_buffer_vimgrep.new,
qflist_previewer = require("telescope.previewers").vim_buffer_qflist.new, qflist_previewer = require("telescope.previewers").vim_buffer_qflist.new,
-- Developer configurations: Not meant for general override -- 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 = { extensions = {
fzf = { fzf = {
fuzzy = true, -- false will only do exact matching fuzzy = true, -- false will only do exact matching
override_generic_sorter = false, -- override the generic sorter override_generic_sorter = false, -- override the generic sorter
override_file_sorter = true, -- override the file sorter override_file_sorter = true, -- override the file sorter
case_mode = "smart_case" -- or "ignore_case" or "respect_case" case_mode = "smart_case", -- or "ignore_case" or "respect_case"
-- the default case_mode is "smart_case" -- the default case_mode is "smart_case"
}, },
media_files = { media_files = {
filetypes = { "png", "webp", "jpg", "jpeg" }, filetypes = { "png", "webp", "jpg", "jpeg" },
find_cmd = "rg" -- find command (defaults to `fd`) find_cmd = "rg", -- find command (defaults to `fd`)
},
},
} }
}
}
)
-- load the theme_switcher extension -- load the theme_switcher extension
require("telescope").load_extension("themes") require("telescope").load_extension "themes"
if if not pcall(function()
not pcall( telescope.load_extension "fzf"
function() telescope.load_extension "media_files"
telescope.load_extension("fzf") end) then
telescope.load_extension("media_files")
end
)
then
-- This should only trigger when in need of PackerSync, so better do it -- This should only trigger when in need of PackerSync, so better do it
print("After completion of PackerCompile, restart neovim.") print "After completion of PackerCompile, restart neovim."
-- Trigger packer compile on PackerComplete, so it properly waits for PackerSync -- Trigger packer compile on PackerComplete, so it properly waits for PackerSync
vim.cmd 'autocmd User PackerComplete ++once lua print "Waiting for PackerCompile.." require("packer").compile()' vim.cmd 'autocmd User PackerComplete ++once lua print "Waiting for PackerCompile.." require("packer").compile()'
vim.cmd 'autocmd User PackerCompileDone ++once echo "Packer Compile done, restart neovim."' vim.cmd 'autocmd User PackerCompileDone ++once echo "Packer Compile done, restart neovim."'

8
lua/plugins/toggleterm.lua
View File

@ -19,17 +19,17 @@ toggleterm.setup {
-- insert_mappings = true, -- see 'open_mapping', not set on purpose -- insert_mappings = true, -- see 'open_mapping', not set on purpose
-- whether or not the open mapping applies in insert mode -- whether or not the open mapping applies in insert mode
persist_size = true, persist_size = true,
direction = 'vertical', direction = "vertical",
close_on_exit = true, -- close the terminal window when the process exits close_on_exit = true, -- close the terminal window when the process exits
-- This field is only relevant if direction is set to 'float' -- This field is only relevant if direction is set to 'float'
float_opts = { float_opts = {
border = 'single', border = "single",
winblend = 0, winblend = 0,
highlights = { highlights = {
border = "Normal", border = "Normal",
background = "Normal", background = "Normal",
} },
} },
} }
local Terminal = require("toggleterm.terminal").Terminal local Terminal = require("toggleterm.terminal").Terminal

6
lua/plugins/treesitter.lua
View File

@ -6,10 +6,10 @@ end
ts_config.setup { ts_config.setup {
ensure_installed = { ensure_installed = {
"bash", "bash",
"lua" "lua",
}, },
highlight = { highlight = {
enable = true, enable = true,
use_languagetree = true use_languagetree = true,
} },
} }

26
lua/plugins/zenmode.lua
View File

@ -3,24 +3,23 @@ if not present then
return return
end end
true_zen.setup( true_zen.setup {
{
ui = { ui = {
bottom = { bottom = {
laststatus = 0, laststatus = 0,
ruler = false, ruler = false,
showmode = false, showmode = false,
showcmd = false, showcmd = false,
cmdheight = 1 cmdheight = 1,
}, },
top = { top = {
showtabline = 0 showtabline = 0,
}, },
left = { left = {
number = false, number = false,
relativenumber = false, relativenumber = false,
signcolumn = "no" signcolumn = "no",
} },
}, },
modes = { modes = {
ataraxis = { ataraxis = {
@ -40,13 +39,13 @@ true_zen.setup(
VertSplit = {}, VertSplit = {},
StatusLine = {}, StatusLine = {},
StatusLineNC = {}, StatusLineNC = {},
SignColumn = {} SignColumn = {},
} },
}, },
focus = { focus = {
margin_of_error = 5, margin_of_error = 5,
focus_method = "experimental" focus_method = "experimental",
} },
}, },
integrations = { integrations = {
vim_gitgutter = false, vim_gitgutter = false,
@ -59,12 +58,11 @@ true_zen.setup(
vim_powerline = false, vim_powerline = false,
vim_signify = false, vim_signify = false,
express_line = false, express_line = false,
lualine = false lualine = false,
}, },
misc = { misc = {
on_off_commands = false, on_off_commands = false,
ui_elements_commands = false, ui_elements_commands = false,
cursor_by_mode = false cursor_by_mode = false,
},
} }
}
)

23
lua/telescope/_extensions/themes.lua
View File

@ -45,8 +45,7 @@ M.theme_switcher = function(opts)
end end
end end
previewer = previewer = previewers.new {
previewers.new {
preview_fn = function(_, entry, status) preview_fn = function(_, entry, status)
if not deleted then if not deleted then
deleted = true deleted = true
@ -54,12 +53,11 @@ M.theme_switcher = function(opts)
del_win(status.preview_border_win) del_win(status.preview_border_win)
end end
reload_theme(entry.value) reload_theme(entry.value)
end end,
} }
else else
-- show current buffer content in previewer -- show current buffer content in previewer
previewer = previewer = previewers.new_buffer_previewer {
previewers.new_buffer_previewer {
get_buffer_by_name = function() get_buffer_by_name = function()
return bufname return bufname
end, end,
@ -71,13 +69,11 @@ M.theme_switcher = function(opts)
vim.api.nvim_buf_set_lines(self.state.bufnr, 0, -1, false, lines) vim.api.nvim_buf_set_lines(self.state.bufnr, 0, -1, false, lines)
end end
reload_theme(entry.value) reload_theme(entry.value)
end end,
} }
end end
local picker = local picker = pickers.new {
pickers.new(
{
prompt_title = "Set NvChad color", prompt_title = "Set NvChad color",
finder = finders.new_table(themes), finder = finders.new_table(themes),
previewer = previewer, previewer = previewer,
@ -93,9 +89,8 @@ M.theme_switcher = function(opts)
end end
) )
return true return true
end end,
} }
)
-- rewrite picker.close_windows -- rewrite picker.close_windows
local close_windows = picker.close_windows local close_windows = picker.close_windows
@ -130,7 +125,7 @@ M.theme_switcher = function(opts)
-- launch the telescope picker -- launch the telescope picker
picker:find() picker:find()
else else
print("No themes found in " .. vim.fn.stdpath("config") .. "/lua/themes") print("No themes found in " .. vim.fn.stdpath "config" .. "/lua/themes")
end end
end end
@ -139,8 +134,8 @@ local present, telescope = pcall(require, "telescope")
if present then if present then
return telescope.register_extension { return telescope.register_extension {
exports = { exports = {
themes = M.theme_switcher themes = M.theme_switcher,
} },
} }
else else
error "Cannot find telescope!" error "Cannot find telescope!"

2
lua/themes/chadracula.lua
View File

@ -27,7 +27,7 @@ local colors = {
cyan = "#8BE9FD", cyan = "#8BE9FD",
statusline_bg = "#2b2d39", statusline_bg = "#2b2d39",
lightbg = "#343642", lightbg = "#343642",
lightbg2 = "#2f313d" lightbg2 = "#2f313d",
} }
return colors return colors

2
lua/themes/everforest.lua
View File

@ -27,7 +27,7 @@ local colors = {
cyan = "#95d1c9", cyan = "#95d1c9",
statusline_bg = "#2e363c", statusline_bg = "#2e363c",
lightbg = "#3d454b", lightbg = "#3d454b",
lightbg2 = "#333b41" lightbg2 = "#333b41",
} }
return colors return colors

2
lua/themes/gruvchad.lua
View File

@ -27,7 +27,7 @@ local colors = {
cyan = "#82b3a8", cyan = "#82b3a8",
statusline_bg = "#252829", statusline_bg = "#252829",
lightbg = "#2d3139", lightbg = "#2d3139",
lightbg2 = "#262a32" lightbg2 = "#262a32",
} }
return colors return colors

2
lua/themes/javacafe.lua
View File

@ -27,7 +27,7 @@ local colors = {
cyan = "#b5c3ea", cyan = "#b5c3ea",
statusline_bg = "#181f26", statusline_bg = "#181f26",
lightbg = "#222930", lightbg = "#222930",
lightbg2 = "#1d242b" lightbg2 = "#1d242b",
} }
return colors return colors

2
lua/themes/mountaineer.lua
View File

@ -27,7 +27,7 @@ local colors = {
cyan = "#9aafe6", cyan = "#9aafe6",
statusline_bg = "#1e242a", statusline_bg = "#1e242a",
lightbg = "#2d3339", lightbg = "#2d3339",
lightbg2 = "#252b31" lightbg2 = "#252b31",
} }
return colors return colors

2
lua/themes/norchad.lua
View File

@ -27,7 +27,7 @@ local colors = {
cyan = "#9aafe6", cyan = "#9aafe6",
statusline_bg = "#333945", statusline_bg = "#333945",
lightbg = "#3f4551", lightbg = "#3f4551",
lightbg2 = "#393f4b" lightbg2 = "#393f4b",
} }
return colors return colors

2
lua/themes/onedark.lua
View File

@ -27,7 +27,7 @@ local colors = {
cyan = "#a3b8ef", cyan = "#a3b8ef",
statusline_bg = "#22262e", statusline_bg = "#22262e",
lightbg = "#2d3139", lightbg = "#2d3139",
lightbg2 = "#262a32" lightbg2 = "#262a32",
} }
return colors return colors

2
lua/themes/tokyonight.lua
View File

@ -27,7 +27,7 @@ local colors = {
cyan = "#7dcfff", cyan = "#7dcfff",
statusline_bg = "#1d1e29", statusline_bg = "#1d1e29",
lightbg = "#252631", lightbg = "#252631",
lightbg2 = "#22232e" lightbg2 = "#22232e",
} }
return colors return colors

2
lua/themes/tomorrow-night.lua
View File

@ -27,7 +27,7 @@ local colors = {
cyan = "#70c0b1", cyan = "#70c0b1",
statusline_bg = "#212326", statusline_bg = "#212326",
lightbg = "#373B41", lightbg = "#373B41",
lightbg2 = "#2D3035" lightbg2 = "#2D3035",
} }
return colors return colors

37
lua/utils.lua
View File

@ -10,7 +10,7 @@ M.change_theme = function(current_theme, new_theme)
return return
end end
local file = vim.fn.stdpath("config") .. "/lua/chadrc.lua" local file = vim.fn.stdpath "config" .. "/lua/chadrc.lua"
-- store in data variable -- store in data variable
local data = assert(M.file("r", file)) local data = assert(M.file("r", file))
-- escape characters which can be parsed as magic chars -- escape characters which can be parsed as magic chars
@ -29,12 +29,9 @@ M.change_theme = function(current_theme, new_theme)
end end
M.clear_cmdline = function() M.clear_cmdline = function()
vim.defer_fn( vim.defer_fn(function()
function() vim.cmd "echo"
vim.cmd("echo") end, 0)
end,
0
)
end end
-- 1st arg - r or w -- 1st arg - r or w
@ -63,7 +60,7 @@ end
M.list_themes = function(return_type) M.list_themes = function(return_type)
local themes = {} local themes = {}
-- folder where theme files are stored -- folder where theme files are stored
local themes_folder = vim.fn.stdpath("config") .. "/lua/themes" local themes_folder = vim.fn.stdpath "config" .. "/lua/themes"
-- list all the contents of the folder and filter out files with .lua extension, then append to themes table -- list all the contents of the folder and filter out files with .lua extension, then append to themes table
local fd = vim.loop.fs_scandir(themes_folder) local fd = vim.loop.fs_scandir(themes_folder)
if fd then if fd then
@ -117,7 +114,7 @@ M.reload_theme = function(theme_name)
local reload_plugin = require("utils").reload_plugin local reload_plugin = require("utils").reload_plugin
-- if theme name is empty or nil, then reload the current theme -- if theme name is empty or nil, then reload the current theme
if (theme_name == nil or theme_name == "") then if theme_name == nil or theme_name == "" then
theme_name = vim.g.nvchad_theme theme_name = vim.g.nvchad_theme
end end
@ -131,7 +128,7 @@ M.reload_theme = function(theme_name)
-- reload the base16 theme -- reload the base16 theme
local ok, base16 = pcall(require, "base16") local ok, base16 = pcall(require, "base16")
if not ok then if not ok then
print("Error: Cannot load base16 plugin!") print "Error: Cannot load base16 plugin!"
return false return false
end end
base16(base16.themes(theme_name), true) base16(base16.themes(theme_name), true)
@ -141,7 +138,7 @@ M.reload_theme = function(theme_name)
"highlights", "highlights",
"plugins.bufferline", "plugins.bufferline",
"galaxyline", "galaxyline",
"plugins.statusline" "plugins.statusline",
} }
then then
print "Error: Not able to reload all plugins." print "Error: Not able to reload all plugins."
@ -151,12 +148,12 @@ M.reload_theme = function(theme_name)
-- yes, this is very hacky, but due to new_async in -- yes, this is very hacky, but due to new_async in
-- https://github.com/glepnir/galaxyline.nvim/blob/main/lua/galaxyline/provider.lua#L5-L36 -- https://github.com/glepnir/galaxyline.nvim/blob/main/lua/galaxyline/provider.lua#L5-L36
-- it doesn't work properly and some statusline stuff dissapears -- it doesn't work properly and some statusline stuff dissapears
local vcs = require("galaxyline.provider_vcs") local vcs = require "galaxyline.provider_vcs"
local fileinfo = require("galaxyline.provider_fileinfo") local fileinfo = require "galaxyline.provider_fileinfo"
local buffer = require("galaxyline.provider_buffer") local buffer = require "galaxyline.provider_buffer"
local extension = require("galaxyline.provider_extensions") local extension = require "galaxyline.provider_extensions"
local whitespace = require("galaxyline.provider_whitespace") local whitespace = require "galaxyline.provider_whitespace"
local lspclient = require("galaxyline.provider_lsp") local lspclient = require "galaxyline.provider_lsp"
_G.galaxyline_providers = { _G.galaxyline_providers = {
BufferIcon = buffer.get_buffer_type_icon, BufferIcon = buffer.get_buffer_type_icon,
BufferNumber = buffer.get_buffer_number, BufferNumber = buffer.get_buffer_number,
@ -176,9 +173,9 @@ M.reload_theme = function(theme_name)
ScrollBar = extension.scrollbar_instance, ScrollBar = extension.scrollbar_instance,
VistaPlugin = extension.vista_nearest, VistaPlugin = extension.vista_nearest,
WhiteSpace = whitespace.get_item, WhiteSpace = whitespace.get_item,
GetLspClient = lspclient.get_lsp_client GetLspClient = lspclient.get_lsp_client,
} }
local diagnostic = require("galaxyline.provider_diagnostic") local diagnostic = require "galaxyline.provider_diagnostic"
_G.galaxyline_providers.DiagnosticError = diagnostic.get_diagnostic_error _G.galaxyline_providers.DiagnosticError = diagnostic.get_diagnostic_error
_G.galaxyline_providers.DiagnosticWarn = diagnostic.get_diagnostic_warn _G.galaxyline_providers.DiagnosticWarn = diagnostic.get_diagnostic_warn
_G.galaxyline_providers.DiagnosticHint = diagnostic.get_diagnostic_hint _G.galaxyline_providers.DiagnosticHint = diagnostic.get_diagnostic_hint
@ -195,7 +192,7 @@ M.toggle_theme = function(themes)
if name ~= current_theme then if name ~= current_theme then
if require("utils").reload_theme(name) then if require("utils").reload_theme(name) then
-- open a buffer and close it to reload the statusline -- open a buffer and close it to reload the statusline
vim.cmd("new|bwipeout") vim.cmd "new|bwipeout"
vim.g.current_nvchad_theme = name vim.g.current_nvchad_theme = name
if M.change_theme(vim.g.nvchad_theme, name) then if M.change_theme(vim.g.nvchad_theme, name) then
vim.g.nvchad_theme = name vim.g.nvchad_theme = name