diff options
Diffstat (limited to 'ar/.config/NvChad/lua')
31 files changed, 145 insertions, 3824 deletions
diff --git a/ar/.config/NvChad/lua/autocmds.lua b/ar/.config/NvChad/lua/autocmds.lua new file mode 100644 index 0000000..d2db0bb --- /dev/null +++ b/ar/.config/NvChad/lua/autocmds.lua @@ -0,0 +1 @@ +require "nvchad.autocmds" diff --git a/ar/.config/NvChad/lua/chadrc.lua b/ar/.config/NvChad/lua/chadrc.lua new file mode 100644 index 0000000..86cccf1 --- /dev/null +++ b/ar/.config/NvChad/lua/chadrc.lua @@ -0,0 +1,30 @@ +-- This file needs to have same structure as nvconfig.lua +-- https://github.com/NvChad/ui/blob/v3.0/lua/nvconfig.lua +-- Please read that file to know all available options :( + +---@type ChadrcConfig +local M = {} + +M.base46 = { + theme = "onedark", -- default theme + hl_add = {}, + hl_override = {}, + integrations = {}, + changed_themes = {}, + transparency = false, + theme_toggle = { "onedark", "one_light" }, + + -- hl_override = { + -- Comment = { italic = true }, + -- ["@comment"] = { italic = true }, + -- }, +} + +-- M.nvdash = { load_on_startup = true } +-- M.ui = { +-- tabufline = { +-- lazyload = false +-- } +--} + +return M diff --git a/ar/.config/NvChad/lua/configs/conform.lua b/ar/.config/NvChad/lua/configs/conform.lua new file mode 100644 index 0000000..35ba6cf --- /dev/null +++ b/ar/.config/NvChad/lua/configs/conform.lua @@ -0,0 +1,15 @@ +local options = { + formatters_by_ft = { + lua = { "stylua" }, + -- css = { "prettier" }, + -- html = { "prettier" }, + }, + + -- format_on_save = { + -- -- These options will be passed to conform.format() + -- timeout_ms = 500, + -- lsp_fallback = true, + -- }, +} + +return options diff --git a/ar/.config/NvChad/lua/plugins/configs/lazy_nvim.lua b/ar/.config/NvChad/lua/configs/lazy.lua index cd170bd..cd170bd 100644 --- a/ar/.config/NvChad/lua/plugins/configs/lazy_nvim.lua +++ b/ar/.config/NvChad/lua/configs/lazy.lua diff --git a/ar/.config/NvChad/lua/configs/lspconfig.lua b/ar/.config/NvChad/lua/configs/lspconfig.lua new file mode 100644 index 0000000..7bcabca --- /dev/null +++ b/ar/.config/NvChad/lua/configs/lspconfig.lua @@ -0,0 +1,55 @@ +require("nvchad.configs.lspconfig").defaults() + +local servers = { "html", "cssls" } +vim.lsp.enable(servers) + +-- read :h vim.lsp.config for changing options of lsp servers +vim.lsp.config("lua_ls", { + on_init = function(client) + if client.workspace_folders then + local path = client.workspace_folders[1].name + if + path ~= vim.fn.stdpath "config" + and (vim.uv.fs_stat(path .. "/.luarc.json") or vim.uv.fs_stat(path .. "/.luarc.jsonc")) + then + return + end + end + + client.config.settings.Lua = vim.tbl_deep_extend("force", client.config.settings.Lua, { + runtime = { + -- Tell the language server which version of Lua you're using (most + -- likely LuaJIT in the case of Neovim) + version = "LuaJIT", + -- Tell the language server how to find Lua modules same way as Neovim + -- (see `:h lua-module-load`) + path = { + "lua/?.lua", + "lua/?/init.lua", + }, + }, + -- Make the server aware of Neovim runtime files + workspace = { + checkThirdParty = false, + library = { + vim.env.VIMRUNTIME, + -- Depending on the usage, you might want to add additional paths + -- here. + -- '${3rd}/luv/library' + -- '${3rd}/busted/library' + }, + -- Or pull in all of 'runtimepath'. + -- NOTE: this is a lot slower and will cause issues when working on + -- your own configuration. + -- See https://github.com/neovim/nvim-lspconfig/issues/3189 + -- library = { + -- vim.api.nvim_get_runtime_file('', true), + -- } + }, + }) + end, + settings = { + Lua = {}, + }, +}) +vim.lsp.enable "lua_ls" diff --git a/ar/.config/NvChad/lua/core/bootstrap.lua b/ar/.config/NvChad/lua/core/bootstrap.lua deleted file mode 100644 index b727ba8..0000000 --- a/ar/.config/NvChad/lua/core/bootstrap.lua +++ /dev/null @@ -1,62 +0,0 @@ -local M = {} -local fn = vim.fn - -M.echo = function(str) - vim.cmd "redraw" - vim.api.nvim_echo({ { str, "Bold" } }, true, {}) -end - -local function shell_call(args) - local output = fn.system(args) - assert(vim.v.shell_error == 0, "External call failed with error code: " .. vim.v.shell_error .. "\n" .. output) -end - -M.lazy = function(install_path) - ------------- base46 --------------- - local lazy_path = fn.stdpath "data" .. "/lazy/base46" - - M.echo " Compiling base46 theme to bytecode ..." - - local base46_repo = "https://github.com/NvChad/base46" - shell_call { "git", "clone", "--depth", "1", "-b", "v2.0", base46_repo, lazy_path } - vim.opt.rtp:prepend(lazy_path) - - require("base46").compile() - - --------- lazy.nvim --------------- - M.echo " Installing lazy.nvim & plugins ..." - local repo = "https://github.com/folke/lazy.nvim.git" - shell_call { "git", "clone", "--filter=blob:none", "--branch=stable", repo, install_path } - vim.opt.rtp:prepend(install_path) - - -- install plugins - require "plugins" - - -- mason packages & show post_bootstrap screen - require "nvchad.post_install"() -end - -M.gen_chadrc_template = function() - local path = fn.stdpath "config" .. "/lua/custom" - - if fn.isdirectory(path) ~= 1 then - local input = fn.input "Do you want to install example custom config? (y/N): " - - if input:lower() == "y" then - M.echo "Cloning example custom config repo..." - shell_call { "git", "clone", "--depth", "1", "https://github.com/NvChad/example_config", path } - fn.delete(path .. "/.git", "rf") - else - -- use very minimal chadrc - fn.mkdir(path, "p") - - local file = io.open(path .. "/chadrc.lua", "w") - if file then - file:write "---@type ChadrcConfig\nlocal M = {}\n\nM.ui = { theme = 'onedark' }\n\nreturn M" - file:close() - end - end - end -end - -return M diff --git a/ar/.config/NvChad/lua/core/default_config.lua b/ar/.config/NvChad/lua/core/default_config.lua deleted file mode 100644 index 639916a..0000000 --- a/ar/.config/NvChad/lua/core/default_config.lua +++ /dev/null @@ -1,92 +0,0 @@ -local M = {} - -M.options = { - nvchad_branch = "v2.0", -} - -M.ui = { - ------------------------------- base46 ------------------------------------- - -- hl = highlights - hl_add = {}, - hl_override = {}, - changed_themes = {}, - theme_toggle = { "onedark", "one_light" }, - theme = "onedark", -- default theme - transparency = false, - lsp_semantic_tokens = false, -- needs nvim v0.9, just adds highlight groups for lsp semantic tokens - - -- https://github.com/NvChad/base46/tree/v2.0/lua/base46/extended_integrations - extended_integrations = {}, -- these aren't compiled by default, ex: "alpha", "notify" - - -- cmp themeing - cmp = { - icons = true, - lspkind_text = true, - style = "default", -- default/flat_light/flat_dark/atom/atom_colored - border_color = "grey_fg", -- only applicable for "default" style, use color names from base30 variables - selected_item_bg = "colored", -- colored / simple - }, - - telescope = { style = "borderless" }, -- borderless / bordered - - ------------------------------- nvchad_ui modules ----------------------------- - statusline = { - theme = "default", -- default/vscode/vscode_colored/minimal - -- default/round/block/arrow separators work only for default statusline theme - -- round and block will work for minimal theme only - separator_style = "default", - overriden_modules = nil, - }, - - -- lazyload it when there are 1+ buffers - tabufline = { - show_numbers = false, - enabled = true, - lazyload = true, - overriden_modules = nil, - }, - - -- nvdash (dashboard) - nvdash = { - load_on_startup = false, - - header = { - " ▄ ▄ ", - " ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ ", - " █ ▄ █▄█ ▄▄▄ █ █▄█ █ █ ", - " ▄▄ █▄█▄▄▄█ █▄█▄█▄▄█▄▄█ █ ", - " ▄ █▄▄█ ▄ ▄▄ ▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ", - " █▄▄▄▄ ▄▄▄ █ ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ █ ▄", - "▄ █ █▄█ █▄█ █ █ █▄█ █ █▄█ ▄▄▄ █ █", - "█▄█ ▄ █▄▄█▄▄█ █ ▄▄█ █ ▄ █ █▄█▄█ █", - " █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ █▄█▄▄▄█ ", - }, - - buttons = { - { " Find File", "Spc f f", "Telescope find_files" }, - { " Recent Files", "Spc f o", "Telescope oldfiles" }, - { " Find Word", "Spc f w", "Telescope live_grep" }, - { " Bookmarks", "Spc m a", "Telescope marks" }, - { " Themes", "Spc t h", "Telescope themes" }, - { " Mappings", "Spc c h", "NvCheatsheet" }, - }, - }, - - cheatsheet = { theme = "grid" }, -- simple/grid - - lsp = { - -- show function signatures i.e args as you type - signature = { - disabled = false, - silent = true, -- silences 'no signature help available' message from appearing - }, - }, -} - -M.plugins = "" -- path i.e "custom.plugins", so make custom/plugins.lua file - -M.lazy_nvim = require "plugins.configs.lazy_nvim" -- config for lazy.nvim startup options - -M.mappings = require "core.mappings" - -return M diff --git a/ar/.config/NvChad/lua/core/init.lua b/ar/.config/NvChad/lua/core/init.lua deleted file mode 100644 index 2316f1b..0000000 --- a/ar/.config/NvChad/lua/core/init.lua +++ /dev/null @@ -1,116 +0,0 @@ -local opt = vim.opt -local g = vim.g -local config = require("core.utils").load_config() - --------------------------------------- globals ----------------------------------------- -g.nvchad_theme = config.ui.theme -g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/" -g.toggle_theme_icon = " " -g.transparency = config.ui.transparency - --------------------------------------- options ------------------------------------------ -opt.laststatus = 3 -- global statusline -opt.showmode = false - -opt.clipboard = "unnamedplus" -opt.cursorline = true - --- Indenting -opt.expandtab = true -opt.shiftwidth = 2 -opt.smartindent = true -opt.tabstop = 2 -opt.softtabstop = 2 - -opt.fillchars = { eob = " " } -opt.ignorecase = true -opt.smartcase = true -opt.mouse = "a" - --- Numbers -opt.number = true -opt.numberwidth = 2 -opt.ruler = false - --- disable nvim intro -opt.shortmess:append "sI" - -opt.signcolumn = "yes" -opt.splitbelow = true -opt.splitright = true -opt.termguicolors = true -opt.timeoutlen = 400 -opt.undofile = true - --- interval for writing swap file to disk, also used by gitsigns -opt.updatetime = 250 - --- go to previous/next line with h,l,left arrow and right arrow --- when cursor reaches end/beginning of line -opt.whichwrap:append "<>[]hl" - -g.mapleader = " " - --- disable some default providers --- for _, provider in ipairs { "node", "perl", "python3", "ruby" } do -for _, provider in ipairs { "node", "perl", "ruby" } do - vim.g["loaded_" .. provider .. "_provider"] = 0 -end - --- add binaries installed by mason.nvim to path -local is_windows = vim.loop.os_uname().sysname == "Windows_NT" -vim.env.PATH = vim.fn.stdpath "data" .. "/mason/bin" .. (is_windows and ";" or ":") .. vim.env.PATH - --------------------------------------- autocmds ------------------------------------------ -local autocmd = vim.api.nvim_create_autocmd - --- dont list quickfix buffers -autocmd("FileType", { - pattern = "qf", - callback = function() - vim.opt_local.buflisted = false - end, -}) - --- reload some chadrc options on-save -autocmd("BufWritePost", { - pattern = vim.tbl_map(function(path) - return vim.fs.normalize(vim.loop.fs_realpath(path)) - end, vim.fn.glob(vim.fn.stdpath "config" .. "/lua/custom/**/*.lua", true, true, true)), - group = vim.api.nvim_create_augroup("ReloadNvChad", {}), - - callback = function(opts) - local fp = vim.fn.fnamemodify(vim.fs.normalize(vim.api.nvim_buf_get_name(opts.buf)), ":r") --[[@as string]] - local app_name = vim.env.NVIM_APPNAME and vim.env.NVIM_APPNAME or "nvim" - local module = string.gsub(fp, "^.*/" .. app_name .. "/lua/", ""):gsub("/", ".") - - require("plenary.reload").reload_module "base46" - require("plenary.reload").reload_module(module) - require("plenary.reload").reload_module "custom.chadrc" - - config = require("core.utils").load_config() - - vim.g.nvchad_theme = config.ui.theme - vim.g.transparency = config.ui.transparency - - -- statusline - require("plenary.reload").reload_module("nvchad.statusline." .. config.ui.statusline.theme) - vim.opt.statusline = "%!v:lua.require('nvchad.statusline." .. config.ui.statusline.theme .. "').run()" - - -- tabufline - if config.ui.tabufline.enabled then - require("plenary.reload").reload_module "nvchad.tabufline.modules" - vim.opt.tabline = "%!v:lua.require('nvchad.tabufline.modules').run()" - end - - require("base46").load_all_highlights() - -- vim.cmd("redraw!") - end, -}) - --------------------------------------- commands ------------------------------------------ -local new_cmd = vim.api.nvim_create_user_command - -new_cmd("NvChadUpdate", function() - require "nvchad.updater"() -end, {}) diff --git a/ar/.config/NvChad/lua/core/mappings.lua b/ar/.config/NvChad/lua/core/mappings.lua deleted file mode 100644 index 4154bde..0000000 --- a/ar/.config/NvChad/lua/core/mappings.lua +++ /dev/null @@ -1,468 +0,0 @@ --- n, v, i, t = mode names - -local M = {} - -M.general = { - i = { - -- go to beginning and end - ["<C-b>"] = { "<ESC>^i", "Beginning Of Line" }, - ["<C-e>"] = { "<End>", "End Of Line" }, - - -- navigate within insert mode - ["<C-h>"] = { "<Left>", "Move Left" }, - ["<C-l>"] = { "<Right>", "Move Right" }, - ["<C-j>"] = { "<Down>", "Move Down" }, - ["<C-k>"] = { "<Up>", "Move Up" }, - }, - - n = { - ["<Esc>"] = { "<cmd> noh <CR>", "Clear Highlights" }, - -- switch between windows - ["<C-h>"] = { "<C-w>h", "Window Left" }, - ["<C-l>"] = { "<C-w>l", "Window Right" }, - ["<C-j>"] = { "<C-w>j", "Window Down" }, - ["<C-k>"] = { "<C-w>k", "Window Up" }, - - -- save - ["<C-s>"] = { "<cmd> w <CR>", "Save File" }, - - -- Copy all - ["<C-c>"] = { "<cmd> %y+ <CR>", "Copy whole file" }, - - -- line numbers - ["<leader>n"] = { "<cmd> set nu! <CR>", "Toggle Line Number" }, - ["<leader>rn"] = { "<cmd> set rnu! <CR>", "Toggle Relative Number" }, - - -- Allow moving the cursor through wrapped lines with j, k, <Up> and <Down> - -- http://www.reddit.com/r/vim/comments/2k4cbr/problem_with_gj_and_gk/ - -- empty mode is same as using <cmd> :map - -- also don't use g[j|k] when in operator pending mode, so it doesn't alter d, y or c behaviour - ["j"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move Down", opts = { expr = true } }, - ["k"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move Up", opts = { expr = true } }, - ["<Up>"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move Up", opts = { expr = true } }, - ["<Down>"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move Down", opts = { expr = true } }, - - -- new buffer - ["<leader>b"] = { "<cmd> enew <CR>", "New Buffer" }, - ["<leader>ch"] = { "<cmd> NvCheatsheet <CR>", "Mapping Cheatsheet" }, - - ["<leader>fm"] = { - function() - vim.lsp.buf.format { async = true } - end, - "LSP Formatting", - }, - }, - - t = { - ["<C-x>"] = { vim.api.nvim_replace_termcodes("<C-\\><C-N>", true, true, true), "Escape Terminal Mode" }, - }, - - v = { - ["<Up>"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move Up", opts = { expr = true } }, - ["<Down>"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move Down", opts = { expr = true } }, - ["<"] = { "<gv", "Indent line" }, - [">"] = { ">gv", "Indent line" }, - }, - - x = { - ["j"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move Down", opts = { expr = true } }, - ["k"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move Up", opts = { expr = true } }, - -- Don't copy the replaced text after pasting in visual mode - -- https://vim.fandom.com/wiki/Replace_a_word_with_yanked_text#Alternative_mapping_for_paste - ["p"] = { 'p:let @+=@0<CR>:let @"=@0<CR>', "Dont Copy Replaced Text", opts = { silent = true } }, - }, -} - -M.tabufline = { - plugin = true, - - n = { - -- cycle through buffers - ["<tab>"] = { - function() - require("nvchad.tabufline").tabuflineNext() - end, - "Goto Next Buffer", - }, - - ["<S-tab>"] = { - function() - require("nvchad.tabufline").tabuflinePrev() - end, - "Goto Prev Buffer", - }, - - -- close buffer + hide terminal buffer - ["<leader>x"] = { - function() - require("nvchad.tabufline").close_buffer() - end, - "Close Buffer", - }, - }, -} - -M.comment = { - plugin = true, - - -- toggle comment in both modes - n = { - ["<leader>/"] = { - function() - require("Comment.api").toggle.linewise.current() - end, - "Toggle Comment", - }, - }, - - v = { - ["<leader>/"] = { - "<ESC><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>", - "Toggle Comment", - }, - }, -} - -M.lspconfig = { - plugin = true, - - -- See `<cmd> :help vim.lsp.*` for documentation on any of the below functions - - n = { - ["gD"] = { - function() - vim.lsp.buf.declaration() - end, - "LSP Declaration", - }, - - ["gd"] = { - function() - vim.lsp.buf.definition() - end, - "LSP Definition", - }, - - ["K"] = { - function() - vim.lsp.buf.hover() - end, - "LSP Hover", - }, - - ["gi"] = { - function() - vim.lsp.buf.implementation() - end, - "LSP Implementation", - }, - - ["<leader>ls"] = { - function() - vim.lsp.buf.signature_help() - end, - "LSP Signature Help", - }, - - ["<leader>D"] = { - function() - vim.lsp.buf.type_definition() - end, - "LSP Definition Type", - }, - - ["<leader>ra"] = { - function() - require("nvchad.renamer").open() - end, - "LSP Rename", - }, - - ["<leader>ca"] = { - function() - vim.lsp.buf.code_action() - end, - "LSP Code Action", - }, - - ["gr"] = { - function() - vim.lsp.buf.references() - end, - "LSP References", - }, - - ["<leader>lf"] = { - function() - vim.diagnostic.open_float { border = "rounded" } - end, - "Floating Diagnostic", - }, - - ["[d"] = { - function() - vim.diagnostic.goto_prev { float = { border = "rounded" } } - end, - "Goto Prev", - }, - - ["]d"] = { - function() - vim.diagnostic.goto_next { float = { border = "rounded" } } - end, - "Goto Next", - }, - - ["<leader>q"] = { - function() - vim.diagnostic.setloclist() - end, - "Diagnostic Setloclist", - }, - - ["<leader>wa"] = { - function() - vim.lsp.buf.add_workspace_folder() - end, - "Add Workspace Folder", - }, - - ["<leader>wr"] = { - function() - vim.lsp.buf.remove_workspace_folder() - end, - "Remove Workspace Folder", - }, - - ["<leader>wl"] = { - function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, - "List Workspace Folders", - }, - }, - - v = { - ["<leader>ca"] = { - function() - vim.lsp.buf.code_action() - end, - "LSP Code Action", - }, - }, -} - -M.nvimtree = { - plugin = true, - - n = { - -- toggle - ["<C-n>"] = { "<cmd> NvimTreeToggle <CR>", "Toggle Nvimtree" }, - - -- focus - ["<leader>e"] = { "<cmd> NvimTreeFocus <CR>", "Focus Nvimtree" }, - }, -} - -M.telescope = { - plugin = true, - - n = { - -- find - ["<leader>ff"] = { "<cmd> Telescope find_files <CR>", "Find Files" }, - ["<leader>fa"] = { "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", "Find All" }, - ["<leader>fw"] = { "<cmd> Telescope live_grep <CR>", "Live Grep" }, - ["<leader>fb"] = { "<cmd> Telescope buffers <CR>", "Find Buffers" }, - ["<leader>fh"] = { "<cmd> Telescope help_tags <CR>", "Help Page" }, - ["<leader>fo"] = { "<cmd> Telescope oldfiles <CR>", "Find Oldfiles" }, - ["<leader>fz"] = { "<cmd> Telescope current_buffer_fuzzy_find <CR>", "Find in Current Buffer" }, - - -- git - ["<leader>cm"] = { "<cmd> Telescope git_commits <CR>", "Git Commits" }, - ["<leader>gt"] = { "<cmd> Telescope git_status <CR>", "Git Status" }, - - -- pick a hidden term - ["<leader>pt"] = { "<cmd> Telescope terms <CR>", "Pick Hidden Term" }, - - -- theme switcher - ["<leader>th"] = { "<cmd> Telescope themes <CR>", "Nvchad Themes" }, - - ["<leader>ma"] = { "<cmd> Telescope marks <CR>", "Telescope Bookmarks" }, - }, -} - -M.nvterm = { - plugin = true, - - t = { - -- toggle in terminal mode - ["<A-i>"] = { - function() - require("nvterm.terminal").toggle "float" - end, - "Toggle Floating Term", - }, - - ["<A-h>"] = { - function() - require("nvterm.terminal").toggle "horizontal" - end, - "Toggle Horizontal Term", - }, - - ["<A-v>"] = { - function() - require("nvterm.terminal").toggle "vertical" - end, - "Toggle Vertical Term", - }, - }, - - n = { - -- toggle in normal mode - ["<A-i>"] = { - function() - require("nvterm.terminal").toggle "float" - end, - "Toggle Floating Term", - }, - - ["<A-h>"] = { - function() - require("nvterm.terminal").toggle "horizontal" - end, - "Toggle Horizontal Term", - }, - - ["<A-v>"] = { - function() - require("nvterm.terminal").toggle "vertical" - end, - "Toggle Vertical Term", - }, - - -- new - ["<leader>h"] = { - function() - require("nvterm.terminal").new "horizontal" - end, - "New Horizontal Term", - }, - - ["<leader>v"] = { - function() - require("nvterm.terminal").new "vertical" - end, - "New Vertical Term", - }, - }, -} - -M.whichkey = { - plugin = true, - - n = { - ["<leader>wK"] = { - function() - vim.cmd "WhichKey" - end, - "Which-key All Keymaps", - }, - ["<leader>wk"] = { - function() - local input = vim.fn.input "WhichKey: " - vim.cmd("WhichKey " .. input) - end, - "Which-key Query Lookup", - }, - }, -} - -M.blankline = { - plugin = true, - - n = { - ["<leader>cc"] = { - function() - local ok, start = require("indent_blankline.utils").get_current_context( - vim.g.indent_blankline_context_patterns, - vim.g.indent_blankline_use_treesitter_scope - ) - - if ok then - vim.api.nvim_win_set_cursor(vim.api.nvim_get_current_win(), { start, 0 }) - vim.cmd [[normal! _]] - end - end, - - "Jump To Current Context", - }, - }, -} - -M.gitsigns = { - plugin = true, - - n = { - -- Navigation through hunks - ["]c"] = { - function() - if vim.wo.diff then - return "]c" - end - vim.schedule(function() - require("gitsigns").next_hunk() - end) - return "<Ignore>" - end, - "Jump To Next Hunk", - opts = { expr = true }, - }, - - ["[c"] = { - function() - if vim.wo.diff then - return "[c" - end - vim.schedule(function() - require("gitsigns").prev_hunk() - end) - return "<Ignore>" - end, - "Jump To Prev Hunk", - opts = { expr = true }, - }, - - -- Actions - ["<leader>rh"] = { - function() - require("gitsigns").reset_hunk() - end, - "Reset Hunk", - }, - - ["<leader>ph"] = { - function() - require("gitsigns").preview_hunk() - end, - "Preview Hunk", - }, - - ["<leader>gb"] = { - function() - package.loaded.gitsigns.blame_line() - end, - "Blame Line", - }, - - ["<leader>td"] = { - function() - require("gitsigns").toggle_deleted() - end, - "Toggle Deleted", - }, - }, -} - -return M diff --git a/ar/.config/NvChad/lua/core/utils.lua b/ar/.config/NvChad/lua/core/utils.lua deleted file mode 100644 index 8b2a03d..0000000 --- a/ar/.config/NvChad/lua/core/utils.lua +++ /dev/null @@ -1,118 +0,0 @@ -local M = {} -local merge_tb = vim.tbl_deep_extend - -M.load_config = function() - local config = require "core.default_config" - local chadrc_path = vim.api.nvim_get_runtime_file("lua/custom/chadrc.lua", false)[1] - - if chadrc_path then - local chadrc = dofile(chadrc_path) - - config.mappings = M.remove_disabled_keys(chadrc.mappings, config.mappings) - config = merge_tb("force", config, chadrc) - config.mappings.disabled = nil - end - - return config -end - -M.remove_disabled_keys = function(chadrc_mappings, default_mappings) - if not chadrc_mappings then - return default_mappings - end - - -- store keys in a array with true value to compare - local keys_to_disable = {} - for _, mappings in pairs(chadrc_mappings) do - for mode, section_keys in pairs(mappings) do - if not keys_to_disable[mode] then - keys_to_disable[mode] = {} - end - section_keys = (type(section_keys) == "table" and section_keys) or {} - for k, _ in pairs(section_keys) do - keys_to_disable[mode][k] = true - end - end - end - - -- make a copy as we need to modify default_mappings - for section_name, section_mappings in pairs(default_mappings) do - for mode, mode_mappings in pairs(section_mappings) do - mode_mappings = (type(mode_mappings) == "table" and mode_mappings) or {} - for k, _ in pairs(mode_mappings) do - -- if key if found then remove from default_mappings - if keys_to_disable[mode] and keys_to_disable[mode][k] then - default_mappings[section_name][mode][k] = nil - end - end - end - end - - return default_mappings -end - -M.load_mappings = function(section, mapping_opt) - vim.schedule(function() - local function set_section_map(section_values) - if section_values.plugin then - return - end - - section_values.plugin = nil - - for mode, mode_values in pairs(section_values) do - local default_opts = merge_tb("force", { mode = mode }, mapping_opt or {}) - for keybind, mapping_info in pairs(mode_values) do - -- merge default + user opts - local opts = merge_tb("force", default_opts, mapping_info.opts or {}) - - mapping_info.opts, opts.mode = nil, nil - opts.desc = mapping_info[2] - - vim.keymap.set(mode, keybind, mapping_info[1], opts) - end - end - end - - local mappings = require("core.utils").load_config().mappings - - if type(section) == "string" then - mappings[section]["plugin"] = nil - mappings = { mappings[section] } - end - - for _, sect in pairs(mappings) do - set_section_map(sect) - end - end) -end - -M.lazy_load = function(plugin) - vim.api.nvim_create_autocmd({ "BufRead", "BufWinEnter", "BufNewFile" }, { - group = vim.api.nvim_create_augroup("BeLazyOnFileOpen" .. plugin, {}), - callback = function() - local file = vim.fn.expand "%" - local condition = file ~= "NvimTree_1" and file ~= "[lazy]" and file ~= "" - - if condition then - vim.api.nvim_del_augroup_by_name("BeLazyOnFileOpen" .. plugin) - - -- dont defer for treesitter as it will show slow highlighting - -- This deferring only happens only when we do "nvim filename" - if plugin ~= "nvim-treesitter" then - vim.schedule(function() - require("lazy").load { plugins = plugin } - - if plugin == "nvim-lspconfig" then - vim.cmd "silent! do FileType" - end - end, 0) - else - require("lazy").load { plugins = plugin } - end - end - end, - }) -end - -return M diff --git a/ar/.config/NvChad/lua/custom/README.md b/ar/.config/NvChad/lua/custom/README.md deleted file mode 100644 index 0cc616c..0000000 --- a/ar/.config/NvChad/lua/custom/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Example_config - -This can be used as an example custom config for NvChad. Do check the https://github.com/NvChad/nvcommunity diff --git a/ar/.config/NvChad/lua/custom/chadrc.lua b/ar/.config/NvChad/lua/custom/chadrc.lua deleted file mode 100644 index 598bc65..0000000 --- a/ar/.config/NvChad/lua/custom/chadrc.lua +++ /dev/null @@ -1,54 +0,0 @@ ----@type ChadrcConfig -local M = {} - --- Path to overriding theme and highlights files -local highlights = require "custom.highlights" - -M.ui = { - -- theme - theme = "catppuccin", - theme_toggle = { "catppuccin", "everblush" }, - transparency = true, - - -- highlights - hl_override = highlights.override, - hl_add = highlights.add, - - -- Nvdash - nvdash = { - load_on_startup = false, - - header = { - " ", - " ██████╗ ██████╗ ██████╗ ███████ ", - " ██╔════╝██╔═══██╗██╔══██╗██╔════╝ ", - " ██║ ██║ ██║██║ ██║█████╗ ", - " ██║ ██║ ██║██║ ██║██╔══╝ ", - " ╚██████╗╚██████╔╝██████╔╝███████╗ ", - " ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝ ", - }, - - buttons = { - { " Find File", "Spc f f", "Telescope find_files" }, - { " Recent Files", "Spc f o", "Telescope oldfiles" }, - { " Find Word", "Spc f w", "Telescope live_grep" }, - { " Bookmarks", "Spc m a", "Telescope marks" }, - { " Themes", "Spc t h", "Telescope themes" }, - { " Mappings", "Spc c h", "NvCheatsheet" }, - }, - }, - - -- status line - statusline = { - theme = "minimal", - separator_style = "block", - overriden_modules = nil, - }, -} - -M.plugins = "custom.plugins" - --- check core.mappings for table structure -M.mappings = require "custom.mappings" - -return M diff --git a/ar/.config/NvChad/lua/custom/configs/cell_marker.lua b/ar/.config/NvChad/lua/custom/configs/cell_marker.lua deleted file mode 100644 index 1d71dfb..0000000 --- a/ar/.config/NvChad/lua/custom/configs/cell_marker.lua +++ /dev/null @@ -1,159 +0,0 @@ -local M = {} - -M.get_commenter = function() - local commenter = { python = "# ", lua = "-- ", julia = "# ", fennel = ";; ", scala = "// ", r = "# " } - local bufnr = vim.api.nvim_get_current_buf() - local ft = vim.api.nvim_buf_get_option(bufnr, "filetype") - if ft == nil or ft == "" then - return commenter["python"] - elseif commenter[ft] == nil then - return commenter["python"] - end - - return commenter[ft] -end - -local CELL_MARKER = M.get_commenter() .. "%%" -vim.api.nvim_set_hl(0, "CellMarkerHl", { default = true, bg = "#c5c5c5", fg = "#111111" }) - -M.miniai_spec = function(mode) - local start_line = vim.fn.search("^" .. CELL_MARKER, "bcnW") - - if start_line == 0 then - start_line = 1 - else - if mode == "i" then - start_line = start_line + 1 - end - end - - local end_line = vim.fn.search("^" .. CELL_MARKER, "nW") - 1 - if end_line == -1 then - end_line = vim.fn.line "$" - end - - local last_col = math.max(vim.fn.getline(end_line):len(), 1) - - local from = { line = start_line, col = 1 } - local to = { line = end_line, col = last_col } - - return { from = from, to = to } -end - -M.show_cell_markers = function() - require("mini.hipatterns").enable(0, { - highlighters = { - marker = { pattern = "^" .. M.get_commenter() .. "%%%%", group = "CellMarkerHl" }, - }, - }) -end - -M.select_cell = function() - local bufnr = vim.api.nvim_get_current_buf() - local current_row = vim.api.nvim_win_get_cursor(0)[1] - local current_col = vim.api.nvim_win_get_cursor(0)[2] - - local start_line = nil - local end_line = nil - - for line = current_row, 1, -1 do - local line_content = vim.api.nvim_buf_get_lines(bufnr, line - 1, line, false)[1] - if line_content:find("^" .. CELL_MARKER) then - start_line = line - break - end - end - local line_count = vim.api.nvim_buf_line_count(bufnr) - for line = current_row + 1, line_count do - local line_content = vim.api.nvim_buf_get_lines(bufnr, line - 1, line, false)[1] - if line_content:find("^" .. CELL_MARKER) then - end_line = line - break - end - end - - if not start_line then - start_line = 1 - end - if not end_line then - end_line = line_count - end - return current_row, current_col, start_line, end_line -end - -M.execute_cell = function() - local current_row, current_col, start_line, end_line = M.select_cell() - if start_line and end_line then - vim.fn.setpos("'<", { 0, start_line + 1, 0, 0 }) - vim.fn.setpos("'>", { 0, end_line - 1, 0, 0 }) - require("iron.core").visual_send() - vim.api.nvim_win_set_cursor(0, { current_row, current_col }) - end -end - -M.delete_cell = function() - local _, _, start_line, end_line = M.select_cell() - if start_line and end_line then - local rows_to_select = end_line - start_line - 1 - vim.api.nvim_win_set_cursor(0, { start_line, 0 }) - vim.cmd("normal!V " .. rows_to_select .. "j") - vim.cmd "normal!d" - vim.cmd "normal!k" - end -end - -M.navigate_cell = function(up) - local is_up = up or false - local _, _, start_line, end_line = M.select_cell() - if is_up and start_line ~= 1 then - vim.api.nvim_win_set_cursor(0, { start_line - 1, 0 }) - elseif end_line then - local bufnr = vim.api.nvim_get_current_buf() - local line_count = vim.api.nvim_buf_line_count(bufnr) - if end_line ~= line_count then - vim.api.nvim_win_set_cursor(0, { end_line + 1, 0 }) - _, _, start_line, end_line = M.select_cell() - vim.api.nvim_win_set_cursor(0, { end_line - 1, 0 }) - end - end -end - -M.move_cell = function(dir) - local search_res - local result - if dir == "d" then - search_res = vim.fn.search("^" .. CELL_MARKER, "W") - if search_res == 0 then - result = "last" - end - else - search_res = vim.fn.search("^" .. CELL_MARKER, "bW") - if search_res == 0 then - result = "first" - vim.api.nvim_win_set_cursor(0, { 1, 0 }) - end - end - - return result -end - -M.insert_cell_before = function(content) - content = content or CELL_MARKER - local cell_object = M.miniai_spec "a" - vim.api.nvim_buf_set_lines(0, cell_object.from.line - 1, cell_object.from.line - 1, false, { content, "" }) - M.move_cell "u" -end - -M.insert_cell_after = function(content) - content = content or CELL_MARKER - vim.print(content) - local cell_object = M.miniai_spec "a" - vim.api.nvim_buf_set_lines(0, cell_object.to.line, cell_object.to.line, false, { content, "" }) - M.move_cell "d" -end - -M.insert_markdown_cell = function() - M.insert_cell_after(CELL_MARKER .. " [markdown]") -end - -return M diff --git a/ar/.config/NvChad/lua/custom/configs/dadbod.lua b/ar/.config/NvChad/lua/custom/configs/dadbod.lua deleted file mode 100644 index 90c13fb..0000000 --- a/ar/.config/NvChad/lua/custom/configs/dadbod.lua +++ /dev/null @@ -1,29 +0,0 @@ -local M = {} - -local function db_completion() - require("cmp").setup.buffer { sources = { { name = "vim-dadbod-completion" } } } -end - -function M.setup() - vim.g.db_ui_save_location = vim.fn.stdpath "config" .. require("plenary.path").path.sep .. "db_ui" - - vim.api.nvim_create_autocmd("FileType", { - pattern = { - "sql", - }, - command = [[setlocal omnifunc=vim_dadbod_completion#omni]], - }) - - vim.api.nvim_create_autocmd("FileType", { - pattern = { - "sql", - "mysql", - "plsql", - }, - callback = function() - vim.schedule(db_completion) - end, - }) -end - -return M diff --git a/ar/.config/NvChad/lua/custom/configs/lspconfig.lua b/ar/.config/NvChad/lua/custom/configs/lspconfig.lua deleted file mode 100644 index c4fd1db..0000000 --- a/ar/.config/NvChad/lua/custom/configs/lspconfig.lua +++ /dev/null @@ -1,71 +0,0 @@ -local on_attach = require("plugins.configs.lspconfig").on_attach -local capabilities = require("plugins.configs.lspconfig").capabilities - -local lspconfig = require "lspconfig" - --- if you just want default config for the servers then put them in a table -local servers = { "clangd", "cssls", "emmet_language_server", "html", "julials", "sqlls", "tsserver" } - -for _, lsp in ipairs(servers) do - lspconfig[lsp].setup { - on_attach = on_attach, - capabilities = capabilities, - } -end - --- --- lspconfig.pyright.setup { blabla} -local on_attach_qmd = function(client, bufnr) - local function buf_set_keymap(...) - vim.api.nvim_buf_set_keymap(bufnr, ...) - end - local function buf_set_option(...) - vim.api.nvim_buf_set_option(bufnr, ...) - end - - buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc") - local opts = { noremap = true, silent = true } -end - -local lsp_flags = { - allow_incremental_sync = true, - debounce_text_changes = 150, -} - -local cmp_nvim_lsp = require "cmp_nvim_lsp" -local util = require "lspconfig.util" - -lspconfig.marksman.setup { - on_attach = on_attach_qmd, - capabilities = capabilities, - filetypes = { "markdown", "quarto" }, - root_dir = util.root_pattern(".git", ".marksman.toml", "_quarto.yml"), -} - --- lspconfig.r_language_server.setup { --- on_attach = on_attach, --- capabilities = capabilities, --- flags = lsp_flags, --- settings = { --- r = { --- lsp = { --- rich_documentation = false, --- }, --- }, --- }, --- } - -lspconfig.yamlls.setup { - on_attach = on_attach, - capabilities = capabilities, - flags = lsp_flags, - settings = { - yaml = { - schemas = { - -- add custom schemas here - -- e.g. - ["https://raw.githubusercontent.com/hits-mbm-dev/kimmdy/main/src/kimmdy/kimmdy-yaml-schema.json"] = "kimmdy.yml", - }, - }, - }, -} diff --git a/ar/.config/NvChad/lua/custom/configs/null-ls.lua b/ar/.config/NvChad/lua/custom/configs/null-ls.lua deleted file mode 100644 index d703736..0000000 --- a/ar/.config/NvChad/lua/custom/configs/null-ls.lua +++ /dev/null @@ -1,45 +0,0 @@ -local null_ls = require "null-ls" -local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) - -local b = null_ls.builtins - -local sources = { - -- cpp - b.formatting.clang_format, - - -- Lua - b.formatting.stylua, - - -- python - b.code_actions.refactoring, - b.diagnostics.mypy, - b.diagnostics.ruff, - b.diagnostics.vulture, - b.formatting.black, - -- b.formatting.pyflyby, - -- b.formatting.reorder_python_imports, - - -- webdev stuff - b.formatting.deno_fmt, -- choosed deno for ts/js files cuz its very fast! - b.formatting.prettier.with { filetypes = { "html", "markdown", "css" } }, -- so prettier works only on these filetypes -} - -null_ls.setup { - debug = true, - sources = sources, - on_attach = function(client, bufnr) - if client.supports_method "textDocument/formatting" then - vim.api.nvim_clear_autocmds { - group = augroup, - buffer = bufnr, - } - vim.api.nvim_create_autocmd("BufWritePre", { - group = augroup, - buffer = bufnr, - callback = function() - vim.lsp.buf.format { bufnr = bufnr } - end, - }) - end - end, -} diff --git a/ar/.config/NvChad/lua/custom/configs/overrides.lua b/ar/.config/NvChad/lua/custom/configs/overrides.lua deleted file mode 100644 index 13a0aa1..0000000 --- a/ar/.config/NvChad/lua/custom/configs/overrides.lua +++ /dev/null @@ -1,247 +0,0 @@ -local M = {} - -M.blankline = { - -- show_trailing_blankline_indent = true, - -- show_first_indent_level = true, - context_patterns = { - "block", - "else_clause", - "catch_clause", - "class", - "function", - "import_statement", - "jsx_element", - "jsx_self_closing_element", - "method", - "return", - "try_statement", - "^for", - "^if", - "^object", - "^table", - "^while", - }, -} - -M.treesitter = { - dependencies = { - "nvim-treesitter/nvim-treesitter-textobjects", - "nvim-treesitter/nvim-treesitter-context", - }, - - ensure_installed = { - "bash", - "c", - "css", - "html", - "javascript", - "julia", - "latex", - "lua", - "markdown", - "markdown_inline", - "python", - "query", - -- "r", - "scala", - "tsx", - "typescript", - "vim", - "vimdoc", - "yaml", - }, - - highlight = { enable = true }, - - indent = { - enable = true, - -- disable = { - -- "python" - -- }, - }, -} - -M.mason = { - ensure_installed = { - -- c/cpp stuff - "clangd", - "clang-format", - - -- julia - "julia-lsp", - - -- lua stuff - "lua-language-server", - "stylua", - - -- markdown - "markdownlint", - "markdown-toc", - "marksman", - - -- -- python - "black", - "debugpy", - "mypy", - "ruff", - "pyright", - "vulture", - - -- R - -- "r-languageserver", - - -- -- solidity - -- "solidity", - - -- SQL - "sqlls", - "sqlfluff", - "sql-formatter", - - -- web dev stuff - "css-lsp", - "html-lsp", - "typescript-language-server", - "deno", - "prettier", - }, -} - --- git support in nvimtree -M.nvimtree = { - git = { - enable = true, - }, - - renderer = { - highlight_git = true, - icons = { - show = { - git = true, - }, - }, - }, -} - -M.cmp = { - branch = "main", - dependencies = { - "hrsh7th/cmp-nvim-lsp-signature-help", - "hrsh7th/cmp-calc", - "hrsh7th/cmp-emoji", - "f3fora/cmp-spell", - "ray-x/cmp-treesitter", - "kdheepak/cmp-latex-symbols", - "jmbuhr/cmp-pandoc-references", - "rafamadriz/friendly-snippets", - "onsails/lspkind-nvim", - }, - config = function() - local cmp = require "cmp" - local luasnip = require "luasnip" - local lspkind = require "lspkind" - lspkind.init() - - local has_words_before = function() - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match "%s" == nil - end - - cmp.setup { - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - mapping = { - ["<C-f>"] = cmp.mapping.scroll_docs(-4), - ["<C-b>"] = cmp.mapping.scroll_docs(4), - ["<C-m>"] = cmp.mapping(function(fallback) - if luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - fallback() - end - end, { "i", "s" }), - ["<C-p>"] = cmp.mapping(function(fallback) - if luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - ["<C-e>"] = cmp.mapping.abort(), - ["<CR>"] = cmp.mapping.confirm { - select = true, - }, - ["<Tab><Tab>"] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { "i", "s" }), - ["<S-Tab><S-Tab>"] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - else - fallback() - end - end, { "i", "s" }), - }, - autocomplete = false, - formatting = { - format = lspkind.cmp_format { - with_text = true, - menu = { - otter = "[🦦]", - nvim_lsp = "[LSP]", - luasnip = "[snip]", - buffer = "[buf]", - path = "[path]", - spell = "[spell]", - pandoc_references = "[ref]", - tags = "[tag]", - treesitter = "[TS]", - calc = "[calc]", - latex_symbols = "[tex]", - emoji = "[emoji]", - }, - }, - }, - sources = { - { name = "otter" }, -- for code chunks in quarto - { name = "path" }, - { name = "nvim_lsp" }, - { name = "nvim_lsp_signature_help" }, - { name = "luasnip", keyword_length = 3, max_item_count = 3 }, - { name = "pandoc_references" }, - { name = "buffer", keyword_length = 5, max_item_count = 3 }, - { name = "spell" }, - { name = "treesitter", keyword_length = 5, max_item_count = 3 }, - { name = "calc" }, - { name = "latex_symbols" }, - { name = "emoji" }, - }, - view = { - entries = "native", - }, - window = { - documentation = { - border = require("misc.style").border, - }, - }, - } - - -- for friendly snippets - require("luasnip.loaders.from_vscode").lazy_load() - -- for custom snippets - require("luasnip.loaders.from_vscode").lazy_load { paths = { vim.fn.stdpath "config" .. "/snips" } } - -- link quarto and rmarkdown to markdown snippets - luasnip.filetype_extend("quarto", { "markdown" }) - luasnip.filetype_extend("rmarkdown", { "markdown" }) - end, -} - -return M diff --git a/ar/.config/NvChad/lua/custom/highlights.lua b/ar/.config/NvChad/lua/custom/highlights.lua deleted file mode 100644 index efe8be1..0000000 --- a/ar/.config/NvChad/lua/custom/highlights.lua +++ /dev/null @@ -1,21 +0,0 @@ --- To find any highlight groups: "<cmd> Telescope highlights" --- Each highlight group can take a table with variables fg, bg, bold, italic, etc --- base30 variable names can also be used as colors - -local M = {} - ----@type Base46HLGroupsList -M.override = { - Comment = { - italic = true, - }, -} - ----@type HLTable -M.add = { - NvimTreeOpenedFolderName = { fg = "green", bold = true }, - HarpoonHl = { fg = "cyan", bg = "statusline_bg" }, - HarpoonBorder = { fg = "cyan" }, -} - -return M diff --git a/ar/.config/NvChad/lua/custom/init.lua b/ar/.config/NvChad/lua/custom/init.lua deleted file mode 100644 index 3dea148..0000000 --- a/ar/.config/NvChad/lua/custom/init.lua +++ /dev/null @@ -1,55 +0,0 @@ --- local autocmd = vim.api.nvim_create_autocmd - --- Auto resize panes when resizing nvim window --- autocmd("VimResized", { --- pattern = "*", --- command = "tabdo wincmd =", --- }) - --- Visual Studio Code -if vim.g.vscode then - -- Plug 'asvetliakov/vim-easymotion', has('nvim') ? {} : { 'on': [] } - vim.cmd [[source $HOME/.config/nvim/vscode/settings.vim]] - vim.cmd [[source $HOME/.config/nvim/vscode/easymotion-config.vim]] -end - -vim.g.python3_host_prog = "/usr/bin/python3" --- vim.g.loaded_python3_provider = 1 - -local opt = vim.opt -local api = vim.api - --- Background --- opt.background = "dark" - --- Backspace -opt.backspace = "indent,eol,start" - --- Clipboard -opt.clipboard:append "unnamedplus" - --- Column -opt.colorcolumn = "110" - --- Disable persistent undo for files in /private directory -api.nvim_create_autocmd("BufReadPre", { pattern = "/private/*", command = "set noundofile" }) - --- Indenting -opt.autoindent = true - --- line numbers -opt.number = true -- shows absolute line number on cursor line (when relative number is on)local -opt.relativenumber = true -- show relative line numbers -opt.scrolloff = 9 - --- Swap file disable -opt.swapfile = false - --- Words --- opt.iskeyword:append "-" -- consider string-string as whole word - --- Wrap -opt.wrap = false - --- Undo persistent enable for other files -opt.undofile = true diff --git a/ar/.config/NvChad/lua/custom/mappings.lua b/ar/.config/NvChad/lua/custom/mappings.lua deleted file mode 100644 index 6ae8646..0000000 --- a/ar/.config/NvChad/lua/custom/mappings.lua +++ /dev/null @@ -1,740 +0,0 @@ ----@type MappingsTable -local M = {} -local opts = { noremap = false, expr = true, buffer = true } - -M.disabled = { - n = { - ["<A-i>"] = "", - ["<C-a>"] = "", - ["<C-b>"] = "", - ["<C-c>"] = "", - ["<leader>b"] = "", - ["<leader>ca"] = "", - ["<leader>fm"] = "", - ["<leader>n"] = "", - ["<leader>rn"] = "", - ["<leader>td"] = "", - ["<tab>"] = "", - ["<S-tab>"] = "", - }, - - t = { - ["<A-i>"] = "", - }, -} - -M.general = { - i = { - -- ESC - ["jk"] = { "<ESC>", "Exit Insert Mode" }, - - -- Navigation - ["<C-i>"] = { "<ESC>^i", "Beginning Of Line" }, - - -- Lines - ["<C-a>"] = { "<ESC>o", "Next Line", opts = { nowait = true } }, - ["<C-b>"] = { "<ESC>O", "Previous Line", opts = { nowait = true } }, - ["<leader>ln"] = { "<cmd> set nu! <CR>", "Toggle Line Number" }, - ["<leader>lrn"] = { "<cmd> set rnu! <CR>", "Toggle Relative Number" }, - }, - - n = { - -- General - ["<C-c>"] = { ":", "Enter Command Mode", opts = { nowait = true } }, - -- ["x"] = { "_x", "No Register x" }, - ["Q"] = { "<nop>", "Nothing" }, - - -- Copy & Paste - ["<leader>cpa"] = { "<cmd> %y+ <CR>", "Copy Whole File" }, - ["<leader>y"] = { '"+y', "yank in Vim" }, - ["<leader>Y"] = { '"+Y', "Yank in Clipboard" }, - -- ["<leader>s"] = { [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]], "Replace char on cursor" }, - - -- Formatting - ["<leader>lfm"] = { - function() - vim.lsp.buf.format { async = true } - end, - "LSP Formatting", - }, - - -- Line - -- ["<C-a>"] = { "o<ESC>", "Blank line after", opts = { nowait = true } }, - -- ["<C-b>"] = { "O<ESC>", "Blank line before", opts = { nowait = true } }, - - -- Navigation - ["J"] = { "mzJ`z", "Join A Line To Pre-line" }, - ["n"] = { "nzzzv", "Down Search with Mid Cursor" }, - ["N"] = { "Nzzzv", "Up Search with Mid Cursor" }, - ["<C-d>"] = { "<C-d>zz", "Jump 1/2 Page with Mid Cursor" }, - ["<C-u>"] = { "<C-u>zz", "Up 1/2 Page with Mid Cursor" }, - ["<C-f>"] = { "<C-f>zz", "Page Down with Mid Cursor" }, - ["<C-b>"] = { "<C-b>zz", "Page Up with Mid Cursor" }, - -- ["<C-k>"] = { "<cmd>cnext<CR>zz", "reset cursor" }, - -- ["<C-j>"] = { "<cmd>cprev<CR>zz", "reset cursor" }, - ["<C-h>"] = { "<cmd> TmuxNavigateLeft <CR>", "Window Left" }, - ["<C-l>"] = { "<cmd> TmuxNavigateRight <CR>", "Window Right" }, - ["<C-j>"] = { "<cmd> TmuxNavigateDown <CR>", "Window Down" }, - ["<C-k>"] = { "<cmd> TmuxNavigateUp <CR>", "Window Up" }, - ["<leader>tg"] = { - function() - require("base46").toggle_theme() - end, - "Theme Toggle", - }, - - -- New Buffer - ["<leader>bf"] = { "<cmd> enew <CR>", "New Buffer" }, - - -- Split - ["<leader>sv"] = { "<C-w>v", "Split Vertically" }, - ["<leader>sh"] = { "<C-w>h", "Split Horizontally" }, - ["<leader>se"] = { "<C-w>=", "Equal Width" }, - ["<leader>sx"] = { "<cmd> close <CR>", "Close Split Window" }, - }, - v = { - [";"] = { ":", "Enter Command Mode", opts = { nowait = true } }, - [">"] = { ">gv", "Indent" }, - ["<C-n>"] = { "<ESC> ", "Exit Visual Mode" }, - ["J"] = { ":m '>+1<CR>gv=gv", "Move A Line To Bottom" }, - ["K"] = { ":m '<-2<CR>gv=gv", "Move A Line To Up" }, - ["<leader>y"] = { '"+y', "yank in Vim" }, - }, -} - --- more keybinds! -M.browse = { - n = { - ["<leader>bs"] = { - function() - require("browse").input_search() - end, - "Search Bookmarks", - }, - - ["<leader>bm"] = { - function() - require("browse").open_bookmarks() - end, - "Browse Bookmarks", - }, - - ["<leader>bb"] = { - function() - require("browse").browse() - end, - "Browse Bookmarks", - }, - - ["<leader>bd"] = { - function() - require("browse.devdocs").search() - end, - "Search Devdocs", - }, - - ["<leader>bn"] = { - function() - require("browse.mdn").search() - end, - "Search MDN", - }, - }, -} - -M.chatgpt = { - n = { - ["<leader>cg<CR>"] = { "<cmd> ChatGPT <CR>", "ChatGPT" }, - ["<leader>cgc"] = { "<cmd> ChatGPTCompleteCode <CR>", "ChatGPT Complete Code" }, - ["<leader>cgt"] = { "<cmd> ChatGPTRun add_tests <CR>", "ChatGPT Add Test" }, - ["<leader>cgf"] = { "<cmd> ChatGPTRun fix_bugs <CR>", "ChatGPT Fix Bugs" }, - ["<leader>cga"] = { "<cmd> ChatGPTActAs <CR>", "ChatGPT Act As" }, - ["<leader>cgi"] = { "<cmd> ChatGPTEditWithInstructions <CR>", "ChatGPT Edit" }, - }, - - v = { - ["<leader>cge"] = { "<cmd> ChatGPTRun explain_code <CR>", "ChatGPT Explain Code" }, - }, -} - -M.dadbod = { - n = { - ["<leader>db"] = { "<cmd> DBUI <CR>", "DB UI" }, - ["<leader>du"] = { "<cmd> DBUIToggle <CR>", "Toggle UI" }, - ["<leader>da"] = { "<cmd> DBUIAddConnection <CR>", "Add Connection" }, - ["<leader>df"] = { "<cmd> DBUIFindBuffer <CR>", "Find buffer" }, - ["<leader>dr"] = { "<cmd> DBUIRenameBuffer <CR>", "Rename buffer" }, - ["<leader>dl"] = { "<cmd> DBUILastQueryInfo <CR>", "Last query info" }, - }, -} - -M.gitsigns = { - n = { - ["<leader>gd"] = { - function() - require("gitsigns").toggle_deleted() - end, - "Toggle Deleted", - }, - }, -} - -M.harpoon = { - n = { - ["<leader>a"] = { - function() - require("harpoon.mark").add_file() - end, - "Harpoon Add File", - }, - ["<leader>ta"] = { "<cmd> Telescope harpoon marks <CR>", "Toggle Quick Menu" }, - ["<leader><tab>"] = { - function() - require("harpoon.ui").toggle_quick_menu() - end, - "Harpoon Menu", - }, - ["<leader>1"] = { - function() - require("harpoon.ui").nav_file(1) - end, - "Navigate to File 1", - }, - ["<leader>2"] = { - function() - require("harpoon.ui").nav_file(2) - end, - "Navigate to File 2", - }, - ["<leader>3"] = { - function() - require("harpoon.ui").nav_file(3) - end, - "Navigate to File 3", - }, - ["<leader>4"] = { - function() - require("harpoon.ui").nav_file(4) - end, - "Navigate to File 4", - }, - }, -} - -M.iron = { - n = { - ["<leader>ir"] = { "<cmd> IronRepl <CR>", "REPL" }, - ["<leader>iS"] = { "<cmd> IronRestart <CR>", "Restart" }, - ["<leader>iF"] = { "<cmd> IronFocus <CR>", "Focus" }, - ["<leader>iH"] = { "<cmd> IronHide <CR>", "Hide" }, - ["<leader>ism"] = { - function() - require("iron.core").run_motion "send_motion" - end, - "Send Motion", - }, - ["<leader>isl"] = { - function() - require("iron.core").send_line() - end, - "Send Line", - }, - ["<leader>ist"] = { - function() - require("iron.core").send_until_cursor() - end, - "Send Until Cursor", - }, - ["<leader>isf"] = { - function() - require("iron.core").send_file() - end, - "Send File", - }, - ["<leader>i<cr>"] = { - function() - require("iron.core").send(nil, string.char(13)) - end, - "ENTER", - }, - ["<leader>ii"] = { - function() - require("iron.core").send(nil, string.char(03)) - end, - "Interrupt", - }, - ["<leader>id"] = { - function() - require("iron.core").close_repl() - end, - "Close REPL", - }, - ["<leader>ic"] = { - function() - require("iron.core").send(nil, string.char(12)) - end, - "Clear", - }, - ["<leader>ims"] = { - function() - require("iron.core").send_mark() - end, - "Send Mark", - }, - ["<leader>imm"] = { - function() - require("iron.core").run_motion "mark_motion" - end, - "Mark Motion", - }, - ["<leader>imr"] = { - function() - require("iron.marks").drop_last() - end, - "Remove Mark", - }, - -- ["<leader>iar"] = { - -- function() end, - -- "+ REPL", - -- }, - -- ["<leader>iam"] = { - -- function() end, - -- "+ Mark", - -- }, - - -- cell - ["<leader>ca"] = { - function() - require("custom.configs.cell_marker").insert_cell_after() - end, - "Insert Cell After", - }, - ["<leader>cb"] = { - function() - require("custom.configs.cell_marker").insert_cell_before() - end, - "Insert Cell Before", - }, - ["<leader>cm"] = { - function() - require("custom.configs.cell_marker").insert_markdown_cell() - end, - "Insert Markdown Cell", - }, - ["<leader>cd"] = { - function() - require("custom.configs.cell_marker").delete_cell() - end, - "Delete Cell", - }, - ["<leader>cj"] = { - function() - require("custom.configs.cell_marker").navigate_cell() - end, - "Next Cell", - }, - ["<leader>ck"] = { - function() - require("custom.configs.cell_marker").navigate_cell(true) - end, - "Previous Cell", - }, - ["<leader>cr"] = { - function() - require("custom.configs.cell_marker").execute_cell() - end, - "Cell Run", - }, - }, - - v = { - ["<leader>ihc"] = { - function() - require("iron.marks").clear_hl() - end, - "Clear Highlight", - }, - ["<leader>imv"] = { - function() - require("iron.core").mark_visual() - end, - "Mark Visual", - }, - ["<leader>is"] = { - function() - require("iron.core").visual_send() - end, - "Send", - }, - }, -} - -M.lspconfig = { - v = { - ["<leader>ca"] = { - function() - vim.lsp.buf.code_action() - end, - "LSP code action", - }, - }, -} - -M.markdown = { - n = { - ["<leader>mp"] = { "<cmd> MarkdownPreview <CR>", "Markdown Preview" }, - ["<leader>ms"] = { "<cmd> MarkdownPreviewStop <CR>", "Markdown Stop" }, - ["<leader>mt"] = { "<cmd> MarkdownPreviewToggle <CR>", "Markdown Toggle" }, - }, -} - -M.media = { - n = { - ["<leader>fm"] = { "<cmd> Telescope media_files <CR>", "Media Files" }, - }, -} - -M.nvterm = { - t = { - ["<A-t>"] = { - function() - require("nvterm.terminal").toggle "float" - end, - "Toggle Floating Term", - }, - }, -} - -M.playground = { - n = { - ["<leader>pg"] = { "<cmd> TSPlaygroundToggle <CR>", "Toggle Playground" }, - ["<leader>pc"] = { "<cmd> TSHighlightCapturesUnderCurso <CR>", "Highlight Captures" }, - ["<leader>pn"] = { "<cmd> TSNodeUnderCursor <CR>", "Node Under Cursor" }, - }, -} - -M.portal = { - n = { - ["<leader>pj"] = { "<cmd> Portal jumplist backward <CR>", "Portal Jumplist" }, - ["<leader>ph"] = { - function() - require("portal.builtin").harpoon.tunnel() - end, - "Portal Harpoon", - }, - }, -} - -M.project = { - n = { - ["<leader>fp"] = { "<cmd> Telescope projects <CR>", "Find Project" }, - }, -} - -M.refactoring = { - n = { - -- refactoring - ["<leader>ri"] = { "<cmd> Refactor inline_var <CR>", "Refactor Inline Var" }, - ["<leader>rI"] = { "<cmd> Refactor inline_func <CR>", "Refactor Inline Function" }, - - ["<leader>rb"] = { "<cmd> Refactor extract_block <CR>", "Refactor Extract Block" }, - ["<leader>rbf"] = { "<cmd> Refactor extract_block_to_file <CR>", "Refactor Extrack Block To File" }, - }, - - x = { - -- copy & paste - -- ["<leader>p"] = { '"_dp', "preserve cut" }, - - -- refactoring - ["<leader>re"] = { "<cmd> Refactor extract <CR>", "Refactor Extract" }, - ["<leader>rf"] = { "<cmd> Refactor extract_to_file <CR>", "Refactor Extract To File" }, - ["<leader>rv"] = { "<cmd> Refactor extract_var <CR>", "Refactor Extract Var" }, - ["<leader>ri"] = { "<cmd> Refactor inline_var <CR>", "Refactor Inline Var" }, - }, -} - -M.sniprun = { - n = { - ["<leader>sr"] = { - "<cmd>lua require('sniprun').run()<CR>", - "Run Code", - }, - - ["<leader>ss"] = { - "<cmd>lua require('sniprun').reset()<CR>", - "Reset Code", - }, - - ["<leader>sc"] = { - "<cmd>lua require('sniprun').clear_repl()<CR>", - "Clean Repl Meomory", - }, - - ["<leader>sd"] = { - "<cmd>lua require('sniprun.display').close_all()<CR>", - "Close Display", - }, - }, - - v = { - ["<C-,>"] = { - "<cmd>lua require('sniprun').run('v')<CR>", - "Run Code", - }, - }, -} - -M.tagbar = { - n = { - ["<leader>tb"] = { "<cmd> TagbarToggle <CR>", "Toggle Tagbar" }, - }, -} - -M.telescope = { - n = { - ["<leader>u"] = { - function() - require("telescope").extensions.undo.undo() - end, - "Undo Tree", - }, - - ["<leader>fc"] = { "<Cmd> Telescope frecency <CR>", "Frequent Files" }, - }, -} - -M.todo = { - n = { - ["<leader>tdo"] = { "<cmd> Todo <CR>", "Todo" }, - ["<leader>tds"] = { "<cmd> TodoTelescope <CR>", "Todo Telescope" }, - ["<leader>tdt"] = { "<cmd> TodoTrouble <CR>", "Todo Trouble" }, - ["<leader>tdl"] = { "<cmd> TodoLocList <CR>", "Todo Loclist" }, - ["<leader>tdf"] = { "<cmd> TodoQuickFix <CR>", "Todo Fix" }, - }, -} - -M.treesitter = { - n = { - -- ["<leader>tc"] = { "<cmd> TSContextEnable <CR>", "Toggle treesitter context" }, - ["<leader>gc"] = { - function() - require("treesitter-context").go_to_context() - end, - "Go To Context", - }, - }, -} - -M.trouble = { - n = { - ["<leader>trb"] = { - function() - require("trouble").toggle() - end, - "Trouble", - }, - ["<leader>trw"] = { - function() - require("trouble").toggle "workspace_diagnostics" - end, - "Trouble Workspace Diagnostics", - }, - ["<leader>trd"] = { - function() - require("trouble").toggle "document_diagnostics" - end, - "Trouble Document Diagnostics", - }, - ["<leader>trq"] = { - function() - require("trouble").toggle "quickfix" - end, - "Trouble Quickfix", - }, - ["<leader>trl"] = { - function() - require("trouble").toggle "loclist" - end, - "Trouble Loclist", - }, - ["gR"] = { - function() - require("trouble").toggle "lsp_references" - end, - "Trouble Lsp References", - }, - ["<leader>trc"] = { - function() - require("trouble").close() - end, - "Trouble Close", - }, - ["<leader>tro"] = { - function() - require("trouble").next { skip_groups = true, jump = true } - end, - "Trouble Next", - }, - ["<leader>tri"] = { - function() - require("trouble").previous { skip_groups = true, jump = true } - end, - "Trouble Previous", - }, - ["<leader>trf"] = { - function() - require("trouble").first { skip_groups = true, jump = true } - end, - "Trouble First", - }, - ["<leader>tre"] = { - function() - require("trouble").last { skip_groups = true, jump = true } - end, - "Trouble Last", - }, - -- ["<leader>trt"] = { - -- function() - -- require("trouble.providers.telescope").open_with_trouble() - -- end, - -- "Trouble Telescope", - -- }, - }, -} - -M.obsidian = { - i = { - ["gf"] = { - function() - require("obsidian").util.gf_passthrough() - end, - "gf", - opts, - }, - }, - - n = { - ["gf"] = { - function() - require("obsidian").util.gf_passthrough() - end, - "gf", - opts, - }, - ["<leader>op"] = { - function() - local query = vim.fn.input "Enter query: " - if query and #query > 0 then - vim.cmd("ObsidianOpen " .. query) - end - end, - "Open Notes", - }, - ["<leader>on"] = { - function() - local title = vim.fn.input "Enter title: " - if title and #title > 0 then - vim.cmd("ObsidianNew " .. title) - end - end, - "New Notes", - }, - ["<leader>ot"] = { - function() - local offset = vim.fn.input "Enter offset: " - if offset and #offset > 0 then - vim.cmd("ObsidianToday " .. offset) - else - vim.cmd "ObsidianToday" - end - end, - "Today Note", - }, - ["<leader>of"] = { - function() - local note = vim.fn.input "Enter note: " - if note and #note > 0 then - vim.cmd("ObsidianSearch " .. note) - end - end, - "Search Note", - }, - ["<leader>ow"] = { - function() - local name = vim.fn.input "Enter name: " - if name and #name > 0 then - vim.cmd("ObsidianWorkspace " .. name) - end - end, - "Workspace Name", - }, - ["<leader>oi"] = { - function() - local image = vim.fn.input "Enter image: " - if image and #image > 0 then - vim.cmd("ObsidianPasteImg " .. image) - end - end, - "Paste Image", - }, - ["<leader>or"] = { - function() - local name = vim.fn.input "Enter name: " - if name and #name > 0 then - vim.cmd("ObsidianRename " .. name) - end - end, - "Rename", - }, - ["<leader>o["] = { "<cmd> ObsidianBacklinks <CR>", "Back Link" }, - ["<leader>o]"] = { "<cmd> ObsidianFollowLink <CR>", "Follow Link" }, - ["<leader>os"] = { "<cmd> ObsidianQuickSwitch <CR>", "Quick Switch" }, - ["<leader>ol"] = { "<cmd> ObsidianTomorrow <CR>", "Tomorrow Note" }, - ["<leader>oh"] = { "<cmd> ObsidianYesterday <CR>", "Yesterday Note" }, - }, - - v = { - ["<leader>ol"] = { - function() - local query = vim.fn.input "Enter query: " - if query and #query > 0 then - vim.cmd("ObsidianLink " .. query) - else - vim.cmd "ObsidianLink" - end - end, - "Link Query", - }, - ["<leader>on"] = { - function() - local note = vim.fn.input "Enter note: " - if note and #note > 0 then - vim.cmd("ObsidianLinkNew " .. note) - else - vim.cmd "ObsidianLinkNew" - end - end, - "New Link Note", - }, - }, -} - -M.tabufline = { - n = { - ["L"] = { - function() - require("nvchad.tabufline").tabuflineNext() - end, - "Goto next buffer", - }, - - ["H"] = { - function() - require("nvchad.tabufline").tabuflinePrev() - end, - "Goto prev buffer", - }, - }, -} - -return M diff --git a/ar/.config/NvChad/lua/custom/plugins.lua b/ar/.config/NvChad/lua/custom/plugins.lua deleted file mode 100644 index 38a8880..0000000 --- a/ar/.config/NvChad/lua/custom/plugins.lua +++ /dev/null @@ -1,862 +0,0 @@ -local overrides = require "custom.configs.overrides" - ----@type NvPluginSpec[] -local plugins = { - - -- Override plugin definition options - - { - "neovim/nvim-lspconfig", - dependencies = { - -- format & linting - { - "jose-elias-alvarez/null-ls.nvim", - config = function() - require "custom.configs.null-ls" - end, - }, - }, - config = function() - require "plugins.configs.lspconfig" - require "custom.configs.lspconfig" - end, -- Override to setup mason-lspconfig - }, - - -- override plugin configs - { - "lukas-reineke/indent-blankline.nvim", - opts = overrides.blankline, - }, - { - "williamboman/mason.nvim", - opts = overrides.mason, - }, - - { - "nvim-treesitter/nvim-treesitter", - opts = overrides.treesitter, - }, - - { - "nvim-tree/nvim-tree.lua", - opts = overrides.nvimtree, - }, - - { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-calc", - "hrsh7th/cmp-cmdline", - "rafamadriz/friendly-snippets", - "honza/vim-snippets", - "jmbuhr/otter.nvim", - }, - opts = function(_, opts) - -- -@param opts cmp.ConfigSchema - local cmp = require "cmp" - opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { { name = "otter" } })) - end, - }, - - ---------------------- - -- Install a plugin - ---------------------- - - -- better-escape - { - "max397574/better-escape.nvim", - event = "InsertEnter", - config = function() - require("better_escape").setup() - end, - }, - - -- better quick fix - { - "kevinhwang91/nvim-bqf", - config = function() - require("bqf").setup() - end, - }, - - -- browse - { - "lalitmee/browse.nvim", - dependencies = { "nvim-telescope/telescope.nvim" }, - config = function() - require("browse").setup { - -- search provider you want to use - provider = "google", -- duckduckgo, bing - - -- either pass it here or just pass the table to the functions - -- see below for more - bookmarks = { - ["github"] = { - ["name"] = "search github from neovim", - ["code_search"] = "https://github.com/search?q=%s&type=code", - ["repo_search"] = "https://github.com/search?q=%s&type=repositories", - ["issues_search"] = "https://github.com/search?q=%s&type=issues", - ["pulls_search"] = "https://github.com/search?q=%s&type=pullrequests", - }, - }, - } - end, - }, - - -- bullets - { - "dkarter/bullets.vim", - }, - - -- chafa - { - "princejoogie/chafa.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - "m00qek/baleia.nvim", - }, - cmd = "ViewImage", - config = function() - require("chafa").setup { - render = { - min_padding = 5, - show_label = true, - }, - events = { - update_on_nvim_resize = true, - }, - } - end, - }, - - -- chatGPT - { - "dreamsofcode-io/ChatGPT.nvim", - event = "VeryLazy", - dependencies = { - "MunifTanjim/nui.nvim", - "nvim-lua/plenary.nvim", - "nvim-telescope/telescope.nvim", - }, - config = function() - require("chatgpt").setup { - async_api_key_cmd = "pass show api/chatGPT/nvim", - } - end, - }, - - -- cinnamon - { - "declancm/cinnamon.nvim", - config = function() - require("cinnamon").setup() - end, - }, - - -- diff - { - "sindrets/diffview.nvim", - dependencies = "nvim-lua/plenary.nvim", - }, - - -- doge - { - "kkoomen/vim-doge", - }, - - -- fzf - { - "junegunn/fzf", - }, - - -- hardhat-vscode - { - "NomicFoundation/hardhat-vscode", - }, - - -- harpoon - { - "ThePrimeagen/harpoon", - cmd = "Harpoon", - }, - - -- hologram - { - "edluffy/hologram.nvim", - config = function() - require("hologram").setup { - auto_display = true, - } - end, - }, - - -- impatient - { - "lewis6991/impatient.nvim", - config = function() - require "impatient" - end, - }, - - -- iron - { - "hkupty/iron.nvim", - event = "VeryLazy", - opts = function() - return { - config = { - scratch_repl = true, - repl_definition = { - sh = { command = { "zsh" } }, - python = require("iron.fts.python").ipython, - }, - repl_open_cmd = require("iron.view").right "40%", - }, - highlight = { - italic = true, - }, - ignore_blank_lines = true, -- ignore blank lines when sending visual select lines - } - end, - config = function(_, opts) - local iron = require "iron.core" - iron.setup(opts) - end, - }, - - -- glow - { - "ellisonleao/glow.nvim", - config = true, - cmd = "Glow", - }, - - -- -- jukit - -- { - -- "luk400/vim-jukit", - -- config = function() - -- require("jukit").setup() - -- -- vim.cmd "source /Users/si/.local/nvim/lazy/vim-jukit/autoload/jukit.vim" - -- end, - -- }, - - -- jupytext - { - "GCBallesteros/jupytext.nvim", - config = true, - lazy = false, - -- event = "VeryLazy", - }, - - -- jupytext - { - "goerz/jupytext.vim", - build = "pip3 install jupytext", - -- lazy = false, - event = "VeryLazy", - dependencies = { "neovim/nvim-lspconfig" }, - opts = {}, - config = function() - vim.g.jupytext_fmt = "py:percent" - - -- Autocmd to set cell markers - vim.api.nvim_create_autocmd({ "BufEnter" }, { -- "BufWriteCmd" - group = vim.api.nvim_create_augroup("au_show_cell_markers", { clear = true }), - pattern = { "*.py", "*.r", "*.ipynb", "*.jl", "*.scala", "*.lua", "*.fnl" }, - callback = function(event) - require("custom.configs.cell_marker").show_cell_markers() - end, - }) - end, - }, - - -- latex - { - "lervag/vimtex", - ft = { "tex" }, - opts = { patterns = { "*.tex" } }, - config = function(_, opts) - vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { - pattern = opts.patterns, - callback = function() - vim.cmd [[VimtexCompile]] - end, - }) - - -- Live compilation - vim.g.vimtex_compiler_latexmk = { - build_dir = ".out", - options = { - "-shell-escape", - "-verbose", - "-file-line-error", - "-interaction=nonstopmode", - "-synctex=1", - }, - } - vim.g.vimtex_view_method = "zathura" - vim.g.vimtex_fold_enabled = true - vim.g.vimtex_syntax_conceal = { - accents = 1, - ligatures = 1, - cites = 1, - fancy = 1, - spacing = 0, -- default: 1 - greek = 1, - math_bounds = 1, - math_delimiters = 1, - math_fracs = 1, - math_super_sub = 1, - math_symbols = 1, - sections = 0, - styles = 1, - } - end, - }, - - -- leap - { - "ggandor/leap.nvim", - config = function() - require("leap").add_default_mappings() - end, - }, - - -- markdown - { - "preservim/vim-markdown", - branch = "master", - dependencies = { "godlygeek/tabular" }, - config = function() - vim.g.vim_markdown_folding_style_pythonic = 1 - vim.g.vim_markdown_folding_level = 6 - end, - }, - - -- markdown preview - { - "iamcco/markdown-preview.nvim", - cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, - build = "cd app && yarn install", - init = function() - vim.g.mkdp_filetypes = { "markdown" } - end, - ft = { "markdown" }, - }, - - -- marksman - -- { - -- "artempyanykh/marksman", - -- }, - - -- magma - -- { - -- "dccsillag/magma-nvim", - -- }, - - -- media - { - "nvim-telescope/telescope-media-files.nvim", - dependencies = { - "nvim-lua/popup.nvim", - "nvim-lua/plenary.nvim", - "nvim-telescope/telescope.nvim", - "nvim-telescope/telescope-media-files.nvim", - }, - config = function() - require("telescope").setup { - extensions = { - media_files = { - filetypes = { "png", "webp", "jpg", "jpeg" }, - find_cmd = "rg", - }, - }, - } - end, - }, - - -- metals - { - "scalameta/nvim-metals", - dependencies = { "nvim-lua/plenary.nvim" }, - ft = { "scala" }, - opts = {}, - config = function(_, opts) - local nvim_metals_group = vim.api.nvim_create_augroup("nvim-metals", { clear = true }) - vim.api.nvim_create_autocmd({ "BufEnter", "BufWinEnter" }, { - pattern = { "*.scala", "*.sbt", "*.sc" }, - callback = function() - local metals_config = require("metals").bare_config() - metals_config.on_attach = function(client, bufnr) - require("metals").setup_dap() - end - metals_config.init_options.statusBarProvider = "on" - metals_config.settings = { - showImplicitArguments = false, - showInferredType = true, - excludedPackages = {}, - } - require("metals").initialize_or_attach(metals_config) - end, - group = nvim_metals_group, - }) - end, - }, - - -- mini - { "echasnovski/mini.nvim" }, - - -- mini ai - { - "echasnovski/mini.ai", - opts = function(_, opts) - opts.custom_textobjects = - vim.tbl_extend("force", opts.custom_textobjects, { h = require("custom.configs.cell_marker").miniai_spec }) - end, - }, - - -- neotest - { - "nvim-neotest/neotest", - dependencies = { - "stevanmilic/neotest-scala", - }, - opts = function(_, opts) - vim.list_extend(opts.adapters, { - require "neotest-scala", - }) - end, - }, - - -- obisidian - { - "epwalsh/obsidian.nvim", - version = "*", -- recommended, use latest release instead of latest commit - lazy = true, - ft = "markdown", - dependencies = { - "nvim-lua/plenary.nvim", - "hrsh7th/nvim-cmp", - "nvim-telescope/telescope.nvim", - "epwalsh/pomo.nvim", - }, - config = function() - require("obsidian").setup { - workspaces = { - { - name = "SI", - path = "~/Obsidian/SI", - }, - }, - detect_cwd = false, - notes_subdir = "Area/Journal", - log_level = vim.log.levels.INFO, - daily_notes = { - folder = "Area/Journal/Daily", - date_format = "%Y-%m-%d", - alias_format = "%B %-d, %Y", - template = nil, - }, - completion = { - nvim_cmp = true, - min_chars = 2, - new_notes_location = "current_dir", - prepend_note_id = true, - prepend_note_path = false, - use_path_only = false, - }, - note_id_func = function(title) - local suffix = "" - if title ~= nil then - suffix = title:gsub(" ", "-"):gsub("[^A-Za-z0-9-]", ""):lower() - else - for _ = 1, 4 do - suffix = suffix .. string.char(math.random(65, 90)) - end - end - return tostring(os.time()) .. "-" .. suffix - end, - disable_frontmatter = false, - note_frontmatter_func = function(note) - local out = { id = note.id, aliases = note.aliases, tags = note.tags } - if note.metadata ~= nil and not vim.tbl_isempty(note.metadata) then - for k, v in pairs(note.metadata) do - out[k] = v - end - end - return out - end, - templates = { - subdir = "templates", - date_format = "%Y-%m-%d", - time_format = "%H:%M", - substitutions = {}, - }, - backlinks = { - height = 10, - wrap = true, - }, - follow_url_func = function(url) - vim.fn.jobstart { "open", url } -- Mac OS - -- vim.fn.jobstart({"xdg-open", url}) -- linux - end, - use_advanced_uri = false, - open_app_foreground = false, - finder = "telescope.nvim", - sort_by = "modified", - sort_reversed = true, - open_notes_in = "current", - ui = { - enable = true, -- set to false to disable all additional syntax features - update_debounce = 200, -- update delay after a text change (in milliseconds) - checkboxes = { - [" "] = { char = "", hl_group = "ObsidianTodo" }, - ["x"] = { char = "", hl_group = "ObsidianDone" }, - [">"] = { char = "", hl_group = "ObsidianRightArrow" }, - ["~"] = { char = "", hl_group = "ObsidianTilde" }, - }, - external_link_icon = { char = "", hl_group = "ObsidianExtLinkIcon" }, - reference_text = { hl_group = "ObsidianRefText" }, - highlight_text = { hl_group = "ObsidianHighlightText" }, - tags = { hl_group = "ObsidianTag" }, - hl_groups = { - ObsidianTodo = { bold = true, fg = "#f78c6c" }, - ObsidianDone = { bold = true, fg = "#89ddff" }, - ObsidianRightArrow = { bold = true, fg = "#f78c6c" }, - ObsidianTilde = { bold = true, fg = "#ff5370" }, - ObsidianRefText = { underline = true, fg = "#c792ea" }, - ObsidianExtLinkIcon = { fg = "#c792ea" }, - ObsidianTag = { italic = true, fg = "#89ddff" }, - ObsidianHighlightText = { bg = "#75662e" }, - }, - }, - attachments = { - img_folder = "assets/imgs", -- This is the default - ---@param client obsidian.Client - ---@param path Path the absolute path to the image file - ---@return string - img_text_func = function(client, path) - local link_path - local vault_relative_path = client:vault_relative_path(path) - if vault_relative_path ~= nil then - link_path = vault_relative_path - else - link_path = tostring(path) - end - local display_name = vim.fs.basename(link_path) - return string.format("", display_name, link_path) - end, - }, - yaml_parser = "native", - } - end, - }, - - -- otter - { - "jmbuhr/otter.nvim", - opts = { - buffers = { - set_filetype = true, - }, - }, - }, - - -- playground - { - "nvim-treesitter/playground", - dependencies = { "nvim-treesitter/nvim-treesitter" }, - cmd = { "TSPlaygroundToggle" }, - config = function() - require("nvim-treesitter.configs").setup { - playground = { - enable = true, - disable = {}, - updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code - persist_queries = false, -- Whether the query persists across vim sessions - keybindings = { - toggle_query_editor = "o", - toggle_hl_groups = "i", - toggle_injected_languages = "t", - toggle_anonymous_nodes = "a", - toggle_language_display = "I", - focus_language = "f", - unfocus_language = "F", - update = "R", - goto_node = "<cr>", - show_help = "?", - }, - }, - - query_linter = { - enable = true, - use_virtual_text = true, - lint_events = { "BufWrite", "CursorHold" }, - }, - } - end, - }, - - -- portal - -- { - -- "cbochs/portal.nvim", - -- keys = { "<leader>pj", "<leader>ph" }, - -- }, - - -- project - { - "ahmedkhalf/project.nvim", - config = function() - require("project_nvim").setup() - require("nvim-tree").setup { - sync_root_with_cwd = true, - respect_buf_cwd = true, - update_focused_file = { - enable = true, - update_root = true, - }, - } - end, - }, - - -- refactoring - { - "ThePrimeagen/refactoring.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-treesitter/nvim-treesitter", - }, - config = function() - require("refactoring").setup() - end, - }, - - -- slime - -- { - -- "jpalardy/vim-slime", - -- init = function() - -- vim.b["quarto_is_" .. "python" .. "_chunk"] = false - -- Quarto_is_in_python_chunk = function() - -- require("otter.tools.functions").is_otter_language_context "python" - -- end - -- - -- vim.cmd [[ - -- let g:slime_dispatch_ipython_pause = 100 - -- function SlimeOverride_EscapeText_quarto(text) - -- call v:lua.Quarto_is_in_python_chunk() - -- if exists('g:slime_python_ipython') && len(split(a:text,"\n")) > 1 && b:quarto_is_python_chunk - -- return ["%cpaste -q\n", g:slime_dispatch_ipython_pause, a:text, "--", "\n"] - -- else - -- return a:text - -- end - -- endfunction - -- ]] - -- - -- local function mark_terminal() - -- vim.g.slime_last_channel = vim.b.terminal_job_id - -- vim.print(vim.g.slime_last_channel) - -- end - -- - -- local function set_terminal() - -- vim.b.slime_config = { jobid = vim.g.slime_last_channel } - -- end - -- - -- -- slime, neovvim terminal - -- vim.g.slime_target = "neovim" - -- vim.g.slime_python_ipython = 1 - -- - -- require("which-key").register { - -- ["<leader>cm"] = { mark_terminal, "mark terminal" }, - -- ["<leader>cs"] = { set_terminal, "set terminal" }, - -- } - -- end, - -- }, - - -- sniprun - { - "michaelb/sniprun", - -- run = "sh ./install.sh 1", - config = function() - require("sniprun").setup { - -- repl_enable = { "Python3_original" }, --# enable REPL-like behavior for the given interpreters - -- repl_disable = {}, --# disable REPL-like behavior for the given interpretersepl_enable = { "Python3_original" }, - -- interpreter_options = { --# interpreter-specific options, see doc / :SnipInfo <name> - -- - -- --# use the interpreter name as key - -- GFM_original = { - -- use_on_filetypes = { "markdown.pandoc" }, --# the 'use_on_filetypes' configuration key is - -- --# available for every interpreter - -- }, - -- Python3_original = { - -- error_truncate = "auto", --# Truncate runtime errors 'long', 'short' or 'auto' # the hint is available for every interpreter # but may not be always respected - -- interpreter = "python3.9", - -- venv = { "" }, - -- }, - -- }, - borders = "single", - } - end, - }, - - -- surround - { - "kylechui/nvim-surround", - version = "*", -- Use for stability; omit to use `main` branch for the latest features - event = "VeryLazy", - config = function() - require("nvim-surround").setup { - -- Configuration here, or leave empty to use defaults - } - end, - }, - - -- SQL - { - "tpope/vim-dadbod", - lazy = true, - dependencies = { - "kristijanhusak/vim-dadbod-ui", - { "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true }, - }, - opts = {}, - config = function() - require("custom.configs.dadbod").setup() - end, - cmd = { "DBUI", "DBUIToggle", "DBUIAddConnection", "DBUIFindBuffer", "DBUIRenameBuffer", "DBUILastQueryInfo" }, - }, - -- { - -- "kristijanhusak/vim-dadbod-ui", - -- dependencies = { - -- { "tpope/vim-dadbod", lazy = true }, - -- { "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true }, - -- }, - -- cmd = { - -- "DBUI", - -- "DBUIToggle", - -- "DBUIAddConnection", - -- "DBUIFindBuffer", - -- }, - -- init = function() - -- -- Your DBUI configuration - -- vim.g.db_ui_use_nerd_fonts = 1 - -- end, - -- }, - - -- tagbar - { - "preservim/tagbar", - dependencies = { "nvim-telescope/telescope.nvim" }, - cmd = "TagbarToggle", - }, - - -- telescope-frecency - { - "nvim-telescope/telescope-frecency.nvim", - dependencies = { - "nvim-telescope/telescope.nvim", - }, - config = function() - require("telescope").load_extension "frecency" - end, - }, - - -- telescope-fzf-native - -- { - -- "nvim-telescope/telescope-fzf-native.nvim", - -- build = "cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build", - -- }, - - -- telescope-undo - { - "debugloop/telescope-undo.nvim", - dependencies = { -- note how they're inverted to above example - { - "nvim-telescope/telescope.nvim", - dependencies = { "nvim-lua/plenary.nvim" }, - }, - }, - keys = { - { -- lazy style key map - "<leader>u", - "<cmd>Telescope undo<cr>", - desc = "undo history", - }, - }, - opts = { - -- don't use `defaults = { }` here, do this in the main telescope spec - extensions = { - undo = { - -- telescope-undo.nvim config, see below - }, - -- no other extensions here, they can have their own spec too - }, - }, - config = function(_, opts) - -- Calling telescope's setup from multiple specs does not hurt, it will happily merge the - -- configs for us. We won't use data, as everything is in it's own namespace (telescope - -- defaults, as well as each extension). - require("telescope").setup(opts) - require("telescope").load_extension "undo" - end, - }, - - -- tmux - { - "christoomey/vim-tmux-navigator", - lazy = false, - }, - - -- todo - { - "folke/todo-comments.nvim", - dependencies = { "nvim-lua/plenary.nvim" }, - opts = {}, - config = function() - require("todo-comments").setup() - end, - cmd = { - "Todo", - "TodoTrouble", - "TodoTelescope", - "TodoLocList", - "TodoQuickFix", - }, - }, - - -- trouble - { - "folke/trouble.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - opts = {}, - config = function() - require("trouble").setup() - end, - }, - - -- visual multi - { "mg979/vim-visual-multi" }, - - -- quarto - -- { - -- "quarto-dev/quarto-nvim", - -- dependencies = { - -- "jmbuhr/otter.nvim", - -- "neovim/nvim-lspconfig", - -- }, - -- opts = { - -- lspFeatures = { - -- languages = { "r", "python", "julia", "bash", "html", "lua" }, - -- }, - -- }, - -- ft = "quarto", - -- cmd = { - -- "QuartoPreview", - -- "QuartoClosePreview", - -- "QuartoActivate", - -- "QuartoHelp", - -- "QuartoHover", - -- }, - -- }, -} - -return plugins diff --git a/ar/.config/NvChad/lua/mappings.lua b/ar/.config/NvChad/lua/mappings.lua new file mode 100644 index 0000000..783b78f --- /dev/null +++ b/ar/.config/NvChad/lua/mappings.lua @@ -0,0 +1,10 @@ +require "nvchad.mappings" + +-- add yours here + +local map = vim.keymap.set + +map("n", ";", ":", { desc = "CMD enter command mode" }) +map("i", "jk", "<ESC>") + +-- map({ "n", "i", "v" }, "<C-s>", "<cmd> w <cr>") diff --git a/ar/.config/NvChad/lua/options.lua b/ar/.config/NvChad/lua/options.lua new file mode 100644 index 0000000..738f20b --- /dev/null +++ b/ar/.config/NvChad/lua/options.lua @@ -0,0 +1,6 @@ +require "nvchad.options" + +-- add yours here! + +-- local o = vim.o +-- o.cursorlineopt ='both' -- to enable cursorline! diff --git a/ar/.config/NvChad/lua/plugins/configs/cmp.lua b/ar/.config/NvChad/lua/plugins/configs/cmp.lua deleted file mode 100644 index 444da73..0000000 --- a/ar/.config/NvChad/lua/plugins/configs/cmp.lua +++ /dev/null @@ -1,120 +0,0 @@ -local cmp = require "cmp" - -dofile(vim.g.base46_cache .. "cmp") - -local cmp_ui = require("core.utils").load_config().ui.cmp -local cmp_style = cmp_ui.style - -local field_arrangement = { - atom = { "kind", "abbr", "menu" }, - atom_colored = { "kind", "abbr", "menu" }, -} - -local formatting_style = { - -- default fields order i.e completion word + item.kind + item.kind icons - fields = field_arrangement[cmp_style] or { "abbr", "kind", "menu" }, - - format = function(_, item) - local icons = require "nvchad.icons.lspkind" - local icon = (cmp_ui.icons and icons[item.kind]) or "" - - if cmp_style == "atom" or cmp_style == "atom_colored" then - icon = " " .. icon .. " " - item.menu = cmp_ui.lspkind_text and " (" .. item.kind .. ")" or "" - item.kind = icon - else - icon = cmp_ui.lspkind_text and (" " .. icon .. " ") or icon - item.kind = string.format("%s %s", icon, cmp_ui.lspkind_text and item.kind or "") - end - - return item - end, -} - -local function border(hl_name) - return { - { "╭", hl_name }, - { "─", hl_name }, - { "╮", hl_name }, - { "│", hl_name }, - { "╯", hl_name }, - { "─", hl_name }, - { "╰", hl_name }, - { "│", hl_name }, - } -end - -local options = { - completion = { - completeopt = "menu,menuone", - }, - - window = { - completion = { - side_padding = (cmp_style ~= "atom" and cmp_style ~= "atom_colored") and 1 or 0, - winhighlight = "Normal:CmpPmenu,CursorLine:CmpSel,Search:None", - scrollbar = false, - }, - documentation = { - border = border "CmpDocBorder", - winhighlight = "Normal:CmpDoc", - }, - }, - snippet = { - expand = function(args) - require("luasnip").lsp_expand(args.body) - end, - }, - - formatting = formatting_style, - - mapping = { - ["<C-p>"] = cmp.mapping.select_prev_item(), - ["<C-n>"] = cmp.mapping.select_next_item(), - ["<C-d>"] = cmp.mapping.scroll_docs(-4), - ["<C-f>"] = cmp.mapping.scroll_docs(4), - ["<C-Space>"] = cmp.mapping.complete(), - ["<C-e>"] = cmp.mapping.close(), - ["<CR>"] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Insert, - select = true, - }, - ["<Tab>"] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif require("luasnip").expand_or_jumpable() then - vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-expand-or-jump", true, true, true), "") - else - fallback() - end - end, { - "i", - "s", - }), - ["<S-Tab>"] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif require("luasnip").jumpable(-1) then - vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-jump-prev", true, true, true), "") - else - fallback() - end - end, { - "i", - "s", - }), - }, - sources = { - { name = "nvim_lsp" }, - { name = "luasnip" }, - { name = "buffer" }, - { name = "nvim_lua" }, - { name = "path" }, - }, -} - -if cmp_style ~= "atom" and cmp_style ~= "atom_colored" then - options.window.completion.border = border "CmpBorder" -end - -return options diff --git a/ar/.config/NvChad/lua/plugins/configs/lspconfig.lua b/ar/.config/NvChad/lua/plugins/configs/lspconfig.lua deleted file mode 100644 index 18e84ad..0000000 --- a/ar/.config/NvChad/lua/plugins/configs/lspconfig.lua +++ /dev/null @@ -1,67 +0,0 @@ -dofile(vim.g.base46_cache .. "lsp") -require "nvchad.lsp" - -local M = {} -local utils = require "core.utils" - --- export on_attach & capabilities for custom lspconfigs - -M.on_attach = function(client, bufnr) - client.server_capabilities.documentFormattingProvider = false - client.server_capabilities.documentRangeFormattingProvider = false - - utils.load_mappings("lspconfig", { buffer = bufnr }) - - if client.server_capabilities.signatureHelpProvider then - require("nvchad.signature").setup(client) - end - - if not utils.load_config().ui.lsp_semantic_tokens and client.supports_method "textDocument/semanticTokens" then - client.server_capabilities.semanticTokensProvider = nil - end -end - -M.capabilities = vim.lsp.protocol.make_client_capabilities() - -M.capabilities.textDocument.completion.completionItem = { - documentationFormat = { "markdown", "plaintext" }, - snippetSupport = true, - preselectSupport = true, - insertReplaceSupport = true, - labelDetailsSupport = true, - deprecatedSupport = true, - commitCharactersSupport = true, - tagSupport = { valueSet = { 1 } }, - resolveSupport = { - properties = { - "documentation", - "detail", - "additionalTextEdits", - }, - }, -} - -require("lspconfig").lua_ls.setup { - on_attach = M.on_attach, - capabilities = M.capabilities, - - settings = { - Lua = { - diagnostics = { - globals = { "vim" }, - }, - workspace = { - library = { - [vim.fn.expand "$VIMRUNTIME/lua"] = true, - [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true, - [vim.fn.stdpath "data" .. "/lazy/ui/nvchad_types"] = true, - [vim.fn.stdpath "data" .. "/lazy/lazy.nvim/lua/lazy"] = true, - }, - maxPreload = 100000, - preloadFileSize = 10000, - }, - }, - }, -} - -return M diff --git a/ar/.config/NvChad/lua/plugins/configs/mason.lua b/ar/.config/NvChad/lua/plugins/configs/mason.lua deleted file mode 100644 index 3692a15..0000000 --- a/ar/.config/NvChad/lua/plugins/configs/mason.lua +++ /dev/null @@ -1,28 +0,0 @@ -local options = { - ensure_installed = { "lua-language-server" }, -- not an option from mason.nvim - - PATH = "skip", - - ui = { - icons = { - package_pending = " ", - package_installed = " ", - package_uninstalled = " ", - }, - - keymaps = { - toggle_server_expand = "<CR>", - install_server = "i", - update_server = "u", - check_server_version = "c", - update_all_servers = "U", - check_outdated_servers = "C", - uninstall_server = "X", - cancel_installation = "<C-c>", - }, - }, - - max_concurrent_installers = 10, -} - -return options diff --git a/ar/.config/NvChad/lua/plugins/configs/nvimtree.lua b/ar/.config/NvChad/lua/plugins/configs/nvimtree.lua deleted file mode 100644 index b4a8aee..0000000 --- a/ar/.config/NvChad/lua/plugins/configs/nvimtree.lua +++ /dev/null @@ -1,77 +0,0 @@ -local options = { - filters = { - dotfiles = false, - exclude = { vim.fn.stdpath "config" .. "/lua/custom" }, - }, - disable_netrw = true, - hijack_netrw = true, - hijack_cursor = true, - hijack_unnamed_buffer_when_opening = false, - sync_root_with_cwd = true, - update_focused_file = { - enable = true, - update_root = false, - }, - view = { - adaptive_size = false, - side = "left", - width = 30, - preserve_window_proportions = true, - }, - git = { - enable = false, - ignore = true, - }, - filesystem_watchers = { - enable = true, - }, - actions = { - open_file = { - resize_window = true, - }, - }, - renderer = { - root_folder_label = false, - highlight_git = false, - highlight_opened_files = "none", - - indent_markers = { - enable = false, - }, - - icons = { - show = { - file = true, - folder = true, - folder_arrow = true, - git = false, - }, - - glyphs = { - default = "", - symlink = "", - folder = { - default = "", - empty = "", - empty_open = "", - open = "", - symlink = "", - symlink_open = "", - arrow_open = "", - arrow_closed = "", - }, - git = { - unstaged = "✗", - staged = "✓", - unmerged = "", - renamed = "➜", - untracked = "★", - deleted = "", - ignored = "◌", - }, - }, - }, - }, -} - -return options diff --git a/ar/.config/NvChad/lua/plugins/configs/others.lua b/ar/.config/NvChad/lua/plugins/configs/others.lua deleted file mode 100644 index dafd5a4..0000000 --- a/ar/.config/NvChad/lua/plugins/configs/others.lua +++ /dev/null @@ -1,66 +0,0 @@ -local M = {} -local utils = require "core.utils" - -M.blankline = { - indentLine_enabled = 1, - filetype_exclude = { - "help", - "terminal", - "lazy", - "lspinfo", - "TelescopePrompt", - "TelescopeResults", - "mason", - "nvdash", - "nvcheatsheet", - "", - }, - buftype_exclude = { "terminal" }, - show_trailing_blankline_indent = false, - show_first_indent_level = false, - show_current_context = true, - show_current_context_start = true, -} - -M.luasnip = function(opts) - require("luasnip").config.set_config(opts) - - -- vscode format - require("luasnip.loaders.from_vscode").lazy_load() - require("luasnip.loaders.from_vscode").lazy_load { paths = vim.g.vscode_snippets_path or "" } - - -- snipmate format - require("luasnip.loaders.from_snipmate").load() - require("luasnip.loaders.from_snipmate").lazy_load { paths = vim.g.snipmate_snippets_path or "" } - - -- lua format - require("luasnip.loaders.from_lua").load() - require("luasnip.loaders.from_lua").lazy_load { paths = vim.g.lua_snippets_path or "" } - - vim.api.nvim_create_autocmd("InsertLeave", { - callback = function() - if - require("luasnip").session.current_nodes[vim.api.nvim_get_current_buf()] - and not require("luasnip").session.jump_active - then - require("luasnip").unlink_current() - end - end, - }) -end - -M.gitsigns = { - signs = { - add = { text = "│" }, - change = { text = "│" }, - delete = { text = "" }, - topdelete = { text = "‾" }, - changedelete = { text = "~" }, - untracked = { text = "│" }, - }, - on_attach = function(bufnr) - utils.load_mappings("gitsigns", { buffer = bufnr }) - end, -} - -return M diff --git a/ar/.config/NvChad/lua/plugins/configs/telescope.lua b/ar/.config/NvChad/lua/plugins/configs/telescope.lua deleted file mode 100644 index 91c1d3a..0000000 --- a/ar/.config/NvChad/lua/plugins/configs/telescope.lua +++ /dev/null @@ -1,63 +0,0 @@ -local options = { - defaults = { - vimgrep_arguments = { - "rg", - "-L", - "--color=never", - "--no-heading", - "--with-filename", - "--line-number", - "--column", - "--smart-case", - }, - prompt_prefix = " ", - selection_caret = " ", - entry_prefix = " ", - initial_mode = "insert", - selection_strategy = "reset", - sorting_strategy = "ascending", - layout_strategy = "horizontal", - layout_config = { - horizontal = { - prompt_position = "top", - preview_width = 0.55, - results_width = 0.8, - }, - vertical = { - mirror = false, - }, - width = 0.87, - height = 0.80, - preview_cutoff = 120, - }, - file_sorter = require("telescope.sorters").get_fuzzy_file, - file_ignore_patterns = { "node_modules" }, - generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter, - path_display = { "truncate" }, - winblend = 0, - border = {}, - borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" }, - color_devicons = 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, - -- Developer configurations: Not meant for general override - buffer_previewer_maker = require("telescope.previewers").buffer_previewer_maker, - mappings = { - n = { ["q"] = require("telescope.actions").close }, - }, - }, - - extensions_list = { "themes", "terms", "fzf" }, - extensions = { - fzf = { - fuzzy = true, - override_generic_sorter = true, - override_file_sorter = true, - case_mode = "smart_case", - }, - }, -} - -return options diff --git a/ar/.config/NvChad/lua/plugins/configs/treesitter.lua b/ar/.config/NvChad/lua/plugins/configs/treesitter.lua deleted file mode 100644 index b21b55d..0000000 --- a/ar/.config/NvChad/lua/plugins/configs/treesitter.lua +++ /dev/null @@ -1,12 +0,0 @@ -local options = { - ensure_installed = { "lua" }, - - highlight = { - enable = true, - use_languagetree = true, - }, - - indent = { enable = true }, -} - -return options diff --git a/ar/.config/NvChad/lua/plugins/init.lua b/ar/.config/NvChad/lua/plugins/init.lua index a97e753..e67fc7e 100644 --- a/ar/.config/NvChad/lua/plugins/init.lua +++ b/ar/.config/NvChad/lua/plugins/init.lua @@ -1,273 +1,52 @@ --- All plugins have lazy=true by default,to load a plugin on startup just lazy=false --- List of all default plugins & their definitions -local default_plugins = { - - "nvim-lua/plenary.nvim", - - { - "NvChad/base46", - branch = "v2.0", - build = function() - require("base46").load_all_highlights() - end, - }, - - { - "NvChad/ui", - branch = "v2.0", - lazy = false, - }, - - { - "NvChad/nvterm", - init = function() - require("core.utils").load_mappings "nvterm" - end, - config = function(_, opts) - require "base46.term" - require("nvterm").setup(opts) - end, - }, - - { - "NvChad/nvim-colorizer.lua", - init = function() - require("core.utils").lazy_load "nvim-colorizer.lua" - end, - config = function(_, opts) - require("colorizer").setup(opts) - - -- execute colorizer as soon as possible - vim.defer_fn(function() - require("colorizer").attach_to_buffer(0) - end, 0) - end, - }, - - { - "nvim-tree/nvim-web-devicons", - opts = function() - return { override = require "nvchad.icons.devicons" } - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "devicons") - require("nvim-web-devicons").setup(opts) - end, - }, - - { - "lukas-reineke/indent-blankline.nvim", - version = "3.5.1", - init = function() - require("core.utils").lazy_load "indent-blankline.nvim" - end, - opts = function() - return require("plugins.configs.others").blankline - end, - config = function(_, opts) - require("core.utils").load_mappings "blankline" - dofile(vim.g.base46_cache .. "blankline") - require("indent_blankline").setup(opts) - end, - }, - - { - "nvim-treesitter/nvim-treesitter", - init = function() - require("core.utils").lazy_load "nvim-treesitter" - end, - cmd = { "TSInstall", "TSBufEnable", "TSBufDisable", "TSModuleInfo" }, - build = ":TSUpdate", - opts = function() - return require "plugins.configs.treesitter" - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "syntax") - require("nvim-treesitter.configs").setup(opts) - end, - }, - - -- git stuff +return { { - "lewis6991/gitsigns.nvim", - ft = { "gitcommit", "diff" }, - init = function() - -- load gitsigns only when a git file is opened - vim.api.nvim_create_autocmd({ "BufRead" }, { - group = vim.api.nvim_create_augroup("GitSignsLazyLoad", { clear = true }), - callback = function() - vim.fn.system("git -C " .. '"' .. vim.fn.expand "%:p:h" .. '"' .. " rev-parse") - if vim.v.shell_error == 0 then - vim.api.nvim_del_augroup_by_name "GitSignsLazyLoad" - vim.schedule(function() - require("lazy").load { plugins = { "gitsigns.nvim" } } - end) - end - end, - }) - end, - opts = function() - return require("plugins.configs.others").gitsigns - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "git") - require("gitsigns").setup(opts) - end, - }, - - -- lsp stuff - { - "williamboman/mason.nvim", - cmd = { "Mason", "MasonInstall", "MasonInstallAll", "MasonUpdate" }, - opts = function() - return require "plugins.configs.mason" - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "mason") - require("mason").setup(opts) - - -- custom nvchad cmd to install all mason binaries listed - vim.api.nvim_create_user_command("MasonInstallAll", function() - vim.cmd("MasonInstall " .. table.concat(opts.ensure_installed, " ")) - end, {}) - - vim.g.mason_binaries_list = opts.ensure_installed - end, + "stevearc/conform.nvim", + -- event = 'BufWritePre', -- uncomment for format on save + opts = require "configs.conform", }, + -- These are some examples, uncomment them if you want to see them work! { "neovim/nvim-lspconfig", - init = function() - require("core.utils").lazy_load "nvim-lspconfig" - end, config = function() - require "plugins.configs.lspconfig" + require "configs.lspconfig" end, }, - -- load luasnips + cmp related in insert mode only - { - "hrsh7th/nvim-cmp", - event = "InsertEnter", - dependencies = { - { - -- snippet plugin - "L3MON4D3/LuaSnip", - dependencies = "rafamadriz/friendly-snippets", - opts = { history = true, updateevents = "TextChanged,TextChangedI" }, - config = function(_, opts) - require("plugins.configs.others").luasnip(opts) - end, - }, - - -- autopairing of (){}[] etc - { - "windwp/nvim-autopairs", - opts = { - fast_wrap = {}, - disable_filetype = { "TelescopePrompt", "vim" }, - }, - config = function(_, opts) - require("nvim-autopairs").setup(opts) - - -- setup cmp for autopairs - local cmp_autopairs = require "nvim-autopairs.completion.cmp" - require("cmp").event:on("confirm_done", cmp_autopairs.on_confirm_done()) - end, - }, + -- test new blink + { import = "nvchad.blink.lazyspec" }, - -- cmp sources plugins - { - "saadparwaiz1/cmp_luasnip", - "hrsh7th/cmp-nvim-lua", - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { + "vim", + "lua", + "vimdoc", + "html", + "css", }, }, - opts = function() - return require "plugins.configs.cmp" - end, - config = function(_, opts) - require("cmp").setup(opts) - end, }, - { - "numToStr/Comment.nvim", - keys = { - { "gcc", mode = "n", desc = "Comment toggle current line" }, - { "gc", mode = { "n", "o" }, desc = "Comment toggle linewise" }, - { "gc", mode = "x", desc = "Comment toggle linewise (visual)" }, - { "gbc", mode = "n", desc = "Comment toggle current block" }, - { "gb", mode = { "n", "o" }, desc = "Comment toggle blockwise" }, - { "gb", mode = "x", desc = "Comment toggle blockwise (visual)" }, - }, - init = function() - require("core.utils").load_mappings "comment" - end, - config = function(_, opts) - require("Comment").setup(opts) - end, - }, + "nvim-lua/plenary.nvim", + { "nvim-tree/nvim-web-devicons", lazy = true }, - -- file managing , picker etc { - "nvim-tree/nvim-tree.lua", - cmd = { "NvimTreeToggle", "NvimTreeFocus" }, - init = function() - require("core.utils").load_mappings "nvimtree" - end, - opts = function() - return require "plugins.configs.nvimtree" - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "nvimtree") - require("nvim-tree").setup(opts) + "nvchad/ui", + config = function() + require "nvchad" end, }, { - "nvim-telescope/telescope.nvim", - dependencies = { "nvim-treesitter/nvim-treesitter", { "nvim-telescope/telescope-fzf-native.nvim", build = "make" } }, - cmd = "Telescope", - init = function() - require("core.utils").load_mappings "telescope" - end, - opts = function() - return require "plugins.configs.telescope" - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "telescope") - local telescope = require "telescope" - telescope.setup(opts) - - -- load extensions - for _, ext in ipairs(opts.extensions_list) do - telescope.load_extension(ext) - end + "nvchad/base46", + lazy = true, + build = function() + require("base46").load_all_highlights() end, }, - -- Only load whichkey after all the gui - { - "folke/which-key.nvim", - keys = { "<leader>", "<c-r>", "<c-w>", '"', "'", "`", "c", "v", "g" }, - init = function() - require("core.utils").load_mappings "whichkey" - end, - cmd = "WhichKey", - config = function(_, opts) - dofile(vim.g.base46_cache .. "whichkey") - require("which-key").setup(opts) - end, - }, + "nvchad/volt", -- optional, needed for theme switcher + -- or just use Telescope themes } - -local config = require("core.utils").load_config() - -if #config.plugins > 0 then - table.insert(default_plugins, { import = config.plugins }) -end - -require("lazy").setup(default_plugins, config.lazy_nvim) |