diff options
96 files changed, 249 insertions, 7502 deletions
diff --git a/ar/.config/AstroNvim b/ar/.config/AstroNvim new file mode 160000 +Subproject 89ebfd35d6415634d82cc6f2991bf66c842872d diff --git a/ar/.config/LazyVim/db_ui/connections.json b/ar/.config/LazyVim/db_ui/connections.json deleted file mode 100644 index e80cf62..0000000 --- a/ar/.config/LazyVim/db_ui/connections.json +++ /dev/null @@ -1 +0,0 @@ -[{"url": "mysql://si@localhost:3306/si", "name": "si"}, {"url": "mysql://root@localhost/test", "name": "test"}] diff --git a/ar/.config/LazyVim/init.lua b/ar/.config/LazyVim/init.lua index bf21bdc..2514f9e 100644 --- a/ar/.config/LazyVim/init.lua +++ b/ar/.config/LazyVim/init.lua @@ -1,3 +1,2 @@ -- bootstrap lazy.nvim, LazyVim and your plugins --- In init.lua require("config.lazy") diff --git a/ar/.config/LazyVim/lua/config/autocmds.lua b/ar/.config/LazyVim/lua/config/autocmds.lua index 6550daf..4221e75 100644 --- a/ar/.config/LazyVim/lua/config/autocmds.lua +++ b/ar/.config/LazyVim/lua/config/autocmds.lua @@ -1,157 +1,8 @@ --------------------------------------------------------------- --- ######################################################## -- --- ################## Custom #################### -- --- ######################################################## -- --------------------------------------------------------------- - --- Save file as sudo on files that require root permission -vim.api.nvim_create_user_command("SudoWrite", function() - vim.cmd("write !sudo tee % >/dev/null") - vim.cmd("edit!") -end, {}) - --- Enable Goyo by default for mutt writing -local goyo_group = vim.api.nvim_create_augroup("GoyoForMutt", { clear = true }) -vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { - pattern = "/tmp/neomutt*", - group = goyo_group, - callback = function() - vim.g.goyo_width = 80 - vim.cmd("Goyo") - vim.cmd("set bg=light") - vim.cmd("set linebreak") - vim.cmd("set wrap") - vim.cmd("set textwidth=0") - vim.cmd("set wrapmargin=0") - vim.cmd("colorscheme seoul256") - vim.api.nvim_buf_set_keymap( - 0, - "n", - "<leader>gx", - ":Goyo|x!<CR>", - { noremap = true, silent = true, desc = "Goyo Quit" } - ) - vim.api.nvim_buf_set_keymap( - 0, - "n", - "<leader>gq", - ":Goyo|q!<CR>", - { noremap = true, silent = true, desc = "Goyo Abort" } - ) - end, -}) - --- Vimwiki --- Ensure files are read with the desired filetype -vim.g.vimwiki_ext2syntax = { - [".Rmd"] = "markdown", - [".rmd"] = "markdown", - [".md"] = "markdown", - [".markdown"] = "markdown", - [".mdown"] = "markdown", -} --- Set up Vimwiki list -vim.g.vimwiki_list = { { - path = vim.fn.expand("~/.local/share/vimwiki"), - syntax = "markdown", - ext = ".md", -} } --- Markdown for specific files and directories -vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { - pattern = { "/tmp/calcurse*", "~/.calcurse/notes/*" }, - command = "set filetype=markdown", -}) - --- Groff for specific file extensions -vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { - pattern = { "*.ms", "*.me", "*.mom", "*.man" }, - command = "set filetype=groff", -}) - --- TeX for .tex files -vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { - pattern = { "*.tex" }, - command = "set filetype=tex", -}) - --- When shortcut files are updated, renew bash and lf configs with new material: -local config_group = vim.api.nvim_create_augroup("ConfigUpdate", { clear = true }) -vim.api.nvim_create_autocmd("BufWritePost", { - pattern = { "bm-files", "bm-dirs" }, - group = config_group, - callback = function() - -- Execute the 'shortcuts' shell command - vim.fn.system("shortcuts") - - -- Check if the 'shortcuts' command was successful - if vim.v.shell_error == 0 then - -- Display a message in Neovim - vim.api.nvim_echo({ { "shortcuts updated", "None" } }, true, {}) - else - -- Optional: Display an error message if the 'shortcuts' command fails - vim.api.nvim_echo({ { "failed to update shortcuts", "ErrorMsg" } }, true, {}) - end - end, -}) - --- Run xrdb whenever Xdefaults or Xresources are updated. -vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { - pattern = { "Xresources", "Xdefaults", "xresources", "xdefaults" }, - group = config_group, - callback = function() - vim.bo.filetype = "xdefaults" - end, -}) -vim.api.nvim_create_autocmd("BufWritePost", { - pattern = { "Xresources", "Xdefaults", "xresources", "xdefaults" }, - group = config_group, - callback = function() - vim.cmd("!xrdb %") - end, -}) - --- Recompile dwmblocks on config edit. -local home = os.getenv("HOME") -- Gets the home directory -local dwmblocks_path = home .. "/.local/src/suckless/dwmblocks/config.h" -vim.api.nvim_create_autocmd("BufWritePost", { - pattern = dwmblocks_path, - group = vim.api.nvim_create_augroup("DwmblocksConfigGroup", { clear = true }), - callback = function() - vim.cmd( - "!cd " - .. home - .. "/.local/src/suckless/dwmblocks/ && sudo make install && { killall -q dwmblocks; setsid -f dwmblocks; }" - ) - end, -}) - --- Autocommand group for DWM -vim.api.nvim_create_augroup("DwmConfigGroup", { clear = true }) -vim.api.nvim_create_autocmd("BufWritePost", { - pattern = home .. "/.local/src/suckless/dwm/config.h", - group = "DwmConfigGroup", - callback = function() - vim.cmd("!extractkeys") - end, -}) - --- Autocommand group for ST -vim.api.nvim_create_augroup("StConfigGroup", { clear = true }) -vim.api.nvim_create_autocmd("BufWritePost", { - pattern = home .. "/.local/src/suckless/st/config.h", - group = "StConfigGroup", - callback = function() - vim.cmd("!extractkeys") - end, -}) - -vim.api.nvim_create_autocmd({ "BufRead", "BufEnter" }, { - pattern = { "*.c", "*.cpp", "*.h", "*.hpp" }, - callback = function() - local suckless_path = vim.fn.expand("~/.local/src"):gsub("/+$", "") - local file_path = vim.fn.expand("%:p"):gsub("/+$", "") - if file_path == suckless_path or file_path:find("^" .. suckless_path .. "/") then - vim.b.autoformat = false - end - end, -}) +-- Autocmds are automatically loaded on the VeryLazy event +-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua +-- +-- Add any additional autocmds here +-- with `vim.api.nvim_create_autocmd` +-- +-- Or remove existing autocmds by their group name (which is prefixed with `lazyvim_` for the defaults) +-- e.g. vim.api.nvim_del_augroup_by_name("lazyvim_wrap_spell") diff --git a/ar/.config/LazyVim/lua/config/keymaps.lua b/ar/.config/LazyVim/lua/config/keymaps.lua index e985c9d..2c134f7 100644 --- a/ar/.config/LazyVim/lua/config/keymaps.lua +++ b/ar/.config/LazyVim/lua/config/keymaps.lua @@ -1,275 +1,3 @@ -local function word_definition(input) - if input == "" then - input = vim.fn.getreg(vim.fn.visualmode(), 1, 1) - end - - local escaped_input = vim.fn.shellescape(input) - local output = vim.fn.system("dict " .. escaped_input) - - vim.api.nvim_out_write(output) -end - --- source shortcuts from bm-files and bm-folders -local shortcuts_file = vim.fn.expand("~/.config/nvim/shortcuts.lua") -local file = io.open(shortcuts_file, "r") -if file then - file:close() -- It's important to close the file after opening it. - vim.cmd("silent! source " .. shortcuts_file) -end - --- word definition -vim.api.nvim_set_keymap( - "n", - "<leader>fd", - ":lua word_definition(vim.fn.expand('<cword>'))<CR>", - { noremap = true, silent = true, desc = "Word Definition" } -) -vim.api.nvim_set_keymap( - "x", - "<leader>fd", - ":lua word_definition(vim.fn.getreg('v', 1, 1))<CR>", - { noremap = true, silent = true, desc = "Word Definition in Visual Mode" } -) - --------------------------------------- --- Disable -vim.keymap.del("n", "<C-F>") -vim.keymap.del("n", "<leader><tab>]") -vim.keymap.del("n", "<leader><tab>d") -vim.keymap.del("n", "<leader><tab>[") -vim.keymap.del("n", "<leader>wd") -vim.keymap.del("n", "<leader>ww") - --- vim.keymap.set( "n", "J", "<Nop>", { noremap = true, silent = true }) -vim.keymap.set("n", "Q", "<nop>") - --- ESC -vim.keymap.set("i", "jk", "<ESC>", { desc = "<ESC>" }) - --- : -vim.keymap.set("n", "<C-c>", ":", { desc = "Enter Command Mode", nowait = true }) - --- Check Health -vim.keymap.set("n", "<leader>ch", ":checkhealth<cr>", { desc = "Check Health" }) - --- Copy & Cut & Paste -vim.keymap.set("n", "x", '"_x') --- vim.keymap.set("n", "d", '"_d') --- vim.keymap.set("n", "D", '"_D') --- vim.keymap.set("v", "d", '"_d') --- vim.keymap.set("n", "<leader>d", '""d') --- vim.keymap.set("n", "<leader>D", '""D') --- vim.keymap.set("v", "<leader>d", '""d') -vim.keymap.set("n", "<leader>a", "ggVG", { desc = "Select Whole File" }) -vim.keymap.set("n", "<leader>cpa", "<cmd>%y+<cr>", { desc = "Copy Whole File" }) -vim.keymap.set("x", "p", 'p:let @+=@0<CR>:let @"=@0<CR>', { silent = true }) - --- Lines -vim.keymap.set("i", "<C-cr>", "<Esc>$o", { nowait = true, silent = true }) -vim.keymap.set("i", "<C-f>", "<ESC>o", { noremap = true, nowait = true, silent = true, desc = "Next Line" }) -vim.keymap.set("i", "<C-b>", "<ESC>O", { noremap = true, nowait = true, silent = true, desc = "Previous Line" }) --- vim.keymap.set( --- "v", --- "<C-j>", --- ":m '>+1<CR>gv=gv", --- { noremap = true, nowait = true, silent = true, desc = "Move A Line To Bottom" } --- ) --- vim.keymap.set( --- "v", --- "<C-k>", --- ":m '<-2<CR>gv=gv", --- { noremap = true, nowait = true, silent = true, desc = "Move A Line To Up" } --- ) - --- Navigation -vim.keymap.set("i", "<C-i>", "<ESC>I", { desc = "Beginning of Line" }) -vim.keymap.set("i", "<C-a>", "<End>", { desc = "End of Line" }) -vim.keymap.set("i", "<C-h>", "<Left>", { desc = "Move Left" }) -vim.keymap.set("i", "<C-l>", "<Right>", { desc = "Move Right" }) -vim.keymap.set("i", "<C-j>", "<Down>", { desc = "Move Down" }) -vim.keymap.set("i", "<C-k>", "<Up>", { desc = "Move Up" }) - --- better up/down -vim.keymap.set({ "n", "x" }, "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true, desc = "Better Down" }) -vim.keymap.set( - { "n", "x" }, - "<Down>", - "v:count == 0 ? 'gj' : 'j'", - { expr = true, silent = true, desc = "Better Down" } -) -vim.keymap.set({ "n", "x" }, "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true, desc = "Better Up" }) -vim.keymap.set({ "n", "x" }, "<Up>", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true, desc = "Better Up" }) - --- -- Move to window using the <ctrl> hjkl keys --- vim.keymap.set("n", "<C-h>", "<C-w>h", { desc = "Go to left window", remap = true }) --- vim.keymap.set("n", "<C-j>", "<C-w>j", { desc = "Go to lower window", remap = true }) --- vim.keymap.set("n", "<C-k>", "<C-w>k", { desc = "Go to upper window", remap = true }) --- vim.keymap.set("n", "<C-l>", "<C-w>l", { desc = "Go to right window", remap = true }) --- --- -- Resize window using <ctrl> arrow keys --- vim.keymap.set("n", "<C-Up>", "<cmd>resize +2<cr>", { desc = "Increase window height" }) --- vim.keymap.set("n", "<C-Down>", "<cmd>resize -2<cr>", { desc = "Decrease window height" }) --- vim.keymap.set("n", "<C-Left>", "<cmd>vertical resize -2<cr>", { desc = "Decrease window width" }) --- vim.keymap.set("n", "<C-Right>", "<cmd>vertical resize +2<cr>", { desc = "Increase window width" }) --- --- -- Move Lines --- vim.keymap.set("n", "<A-J>", "<cmd>m .+1<cr>==", { desc = "Move down" }) --- vim.keymap.set("n", "<A-K>", "<cmd>m .-2<cr>==", { desc = "Move up" }) --- vim.keymap.set("i", "<A-J>", "<esc><cmd>m .+1<cr>==gi", { desc = "Move down" }) --- vim.keymap.set("i", "<A-K>", "<esc><cmd>m .-2<cr>==gi", { desc = "Move up" }) --- vim.keymap.set("v", "<A-J>", ":m '>+1<cr>gv=gv", { desc = "Move down" }) --- vim.keymap.set("v", "<A-K>", ":m '<-2<cr>gv=gv", { desc = "Move up" }) --- vim.keymap.set("n", "<C-A-n>", "<cmd>m .+1<cr>==", { desc = "Move down" }) --- vim.keymap.set("n", "<C-A-p>", "<cmd>m .-2<cr>==", { desc = "Move up" }) --- vim.keymap.set("i", "<C-A-n>", "<esc><cmd>m .+1<cr>==gi", { desc = "Move down" }) --- vim.keymap.set("i", "<C-A-p>", "<esc><cmd>m .-2<cr>==gi", { desc = "Move up" }) --- vim.keymap.set("v", "<C-A-n>", ":m '>+1<cr>gv=gv", { desc = "Move down" }) --- vim.keymap.set("v", "<C-A-p>", ":m '<-2<cr>gv=gv", { desc = "Move up" }) -vim.keymap.set("n", "<A-,>", "<cmd>m .+1<cr>==", { desc = "Move down" }) -vim.keymap.set("n", "<A-.>", "<cmd>m .-2<cr>==", { desc = "Move up" }) -vim.keymap.set("i", "<A-,>", "<esc><cmd>m .+1<cr>==gi", { desc = "Move down" }) -vim.keymap.set("i", "<A-.>", "<esc><cmd>m .-2<cr>==gi", { desc = "Move up" }) -vim.keymap.set("v", "<A-,>", ":m '>+1<cr>gv=gv", { desc = "Move down" }) -vim.keymap.set("v", "<A-.>", ":m '<-2<cr>gv=gv", { desc = "Move up" }) -vim.keymap.set("n", "<C-b>", "<C-b>zz") -vim.keymap.set("n", "<C-f>", "<C-f>zz") --- --- -- buffers --- vim.keymap.set("n", "<S-h>", "<cmd>bprevious<cr>", { desc = "Prev buffer" }) --- vim.keymap.set("n", "<S-l>", "<cmd>bnext<cr>", { desc = "Next buffer" }) --- vim.keymap.set("n", "[b", "<cmd>bprevious<cr>", { desc = "Prev buffer" }) --- vim.keymap.set("n", "]b", "<cmd>bnext<cr>", { desc = "Next buffer" }) --- vim.keymap.set("n", "<leader>bb", "<cmd>e #<cr>", { desc = "Switch to Other Buffer" }) --- vim.keymap.set("n", "<leader>`", "<cmd>e #<cr>", { desc = "Switch to Other Buffer" }) --- --- -- Clear search with <esc> --- vim.keymap.set({ "i", "n" }, "<esc>", "<cmd>noh<cr><esc>", { desc = "Escape and clear hlsearch" }) --- --- -- Clear search, diff update and redraw --- -- taken from runtime/lua/_editor.lua --- vim.keymap.set( --- "n", --- "<leader>ur", --- "<Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>", --- { desc = "Redraw / clear hlsearch / diff update" } --- ) --- --- -- https://github.com/mhinz/vim-galore#saner-behavior-of-n-and-n --- vim.keymap.set("n", "n", "'Nn'[v:searchforward].'zv'", { expr = true, desc = "Next search result" }) --- vim.keymap.set("x", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" }) --- vim.keymap.set("o", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" }) --- vim.keymap.set("n", "N", "'nN'[v:searchforward].'zv'", { expr = true, desc = "Prev search result" }) --- vim.keymap.set("x", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" }) --- vim.keymap.set("o", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" }) --- --- -- Add undo break-points --- vim.keymap.set("i", ",", ",<c-g>u") --- vim.keymap.set("i", ".", ".<c-g>u") --- vim.keymap.set("i", ";", ";<c-g>u") --- --- -- save file --- vim.keymap.set({ "i", "x", "n", "s" }, "<C-s>", "<cmd>w<cr><esc>", { desc = "Save file" }) -vim.keymap.set({ "n" }, "<leader>W", "<cmd>SudoWrite<cr><esc>", { desc = "Save readonly file" }) --- --- --keywordprg --- vim.keymap.set("n", "<leader>K", "<cmd>norm! K<cr>", { desc = "Keywordprg" }) --- --- -- better indenting --- vim.keymap.set("v", "<", "<gv") --- vim.keymap.set("v", ">", ">gv") --- --- -- lazy --- vim.keymap.set("n", "<leader>l", "<cmd>Lazy<cr>", { desc = "Lazy" }) --- --- -- new file --- vim.keymap.set("n", "<leader>fn", "<cmd>enew<cr>", { desc = "New File" }) --- --- vim.keymap.set("n", "<leader>xl", "<cmd>lopen<cr>", { desc = "Location List" }) --- vim.keymap.set("n", "<leader>xq", "<cmd>copen<cr>", { desc = "Quickfix List" }) --- --- vim.keymap.set("n", "[q", vim.cmd.cprev, { desc = "Previous quickfix" }) --- vim.keymap.set("n", "]q", vim.cmd.cnext, { desc = "Next quickfix" }) --- --- -- formatting --- vim.keymap.set({ "n", "v" }, "<leader>cf", function() --- Util.format({ force = true }) --- end, { desc = "Format" }) --- --- -- diagnostic --- local diagnostic_goto = function(next, severity) --- local go = next and vim.diagnostic.goto_next or vim.diagnostic.goto_prev --- severity = severity and vim.diagnostic.severity[severity] or nil --- return function() --- go({ severity = severity }) --- end --- end --- vim.keymap.set("n", "<leader>cd", vim.diagnostic.open_float, { desc = "Line Diagnostics" }) --- vim.keymap.set("n", "]d", diagnostic_goto(true), { desc = "Next Diagnostic" }) --- vim.keymap.set("n", "[d", diagnostic_goto(false), { desc = "Prev Diagnostic" }) --- vim.keymap.set("n", "]e", diagnostic_goto(true, "ERROR"), { desc = "Next Error" }) --- vim.keymap.set("n", "[e", diagnostic_goto(false, "ERROR"), { desc = "Prev Error" }) --- vim.keymap.set("n", "]w", diagnostic_goto(true, "WARN"), { desc = "Next Warning" }) --- vim.keymap.set("n", "[w", diagnostic_goto(false, "WARN"), { desc = "Prev Warning" }) --- --- -- stylua: ignore start --- --- -- toggle options --- vim.keymap.set("n", "<leader>uf", function() Util.format.toggle() end, { desc = "Toggle auto format (global)" }) --- vim.keymap.set("n", "<leader>uF", function() Util.format.toggle(true) end, { desc = "Toggle auto format (buffer)" }) --- vim.keymap.set("n", "<leader>us", function() Util.toggle("spell") end, { desc = "Toggle Spelling" }) --- vim.keymap.set("n", "<leader>uw", function() Util.toggle("wrap") end, { desc = "Toggle Word Wrap" }) --- vim.keymap.set("n", "<leader>uL", function() Util.toggle("relativenumber") end, { desc = "Toggle Relative Line Numbers" }) --- vim.keymap.set("n", "<leader>ul", function() Util.toggle.number() end, { desc = "Toggle Line Numbers" }) --- vim.keymap.set("n", "<leader>ud", function() Util.toggle.diagnostics() end, { desc = "Toggle Diagnostics" }) --- local conceallevel = vim.o.conceallevel > 0 and vim.o.conceallevel or 3 --- vim.keymap.set("n", "<leader>uc", function() Util.toggle("conceallevel", false, {0, conceallevel}) end, { desc = "Toggle Conceal" }) --- if vim.lsp.buf.inlay_hint or vim.lsp.inlay_hint then --- map( "n", "<leader>uh", function() Util.toggle.inlay_hints() end, { desc = "Toggle Inlay Hints" }) --- end --- vim.keymap.set("n", "<leader>uT", function() if vim.b.ts_highlight then vim.treesitter.stop() else vim.treesitter.start() end end, { desc = "Toggle Treesitter Highlight" }) --- --- -- lazygit --- vim.keymap.set("n", "<leader>gg", function() Util.terminal({ "lazygit" }, { cwd = Util.root(), esc_esc = false, ctrl_hjkl = false }) end, { desc = "Lazygit (root dir)" }) --- vim.keymap.set("n", "<leader>gG", function() Util.terminal({ "lazygit" }, {esc_esc = false, ctrl_hjkl = false}) end, { desc = "Lazygit (cwd)" }) --- --- -- quit --- vim.keymap.set("n", "<leader>qq", "<cmd>qa<cr>", { desc = "Quit all" }) --- --- -- highlights under cursor --- vim.keymap.set("n", "<leader>ui", vim.show_pos, { desc = "Inspect Pos" }) --- --- -- LazyVim Changelog --- vim.keymap.set("n", "<leader>L", function() Util.news.changelog() end, { desc = "LazyVim Changelog" }) --- --- -- floating terminal --- local lazyterm = function() Util.terminal(nil, { cwd = Util.root() }) end --- vim.keymap.set("n", "<leader>ft", lazyterm, { desc = "Terminal (root dir)" }) --- vim.keymap.set("n", "<leader>fT", function() Util.terminal() end, { desc = "Terminal (cwd)" }) --- vim.keymap.set("n", "<c-/>", lazyterm, { desc = "Terminal (root dir)" }) --- vim.keymap.set("n", "<c-_>", lazyterm, { desc = "which_key_ignore" }) --- --- -- Terminal Mappings --- vim.keymap.set("t", "<esc><esc>", "<c-\\><c-n>", { desc = "Enter Normal Mode" }) --- vim.keymap.set("t", "<C-h>", "<cmd>wincmd h<cr>", { desc = "Go to left window" }) --- vim.keymap.set("t", "<C-j>", "<cmd>wincmd j<cr>", { desc = "Go to lower window" }) --- vim.keymap.set("t", "<C-k>", "<cmd>wincmd k<cr>", { desc = "Go to upper window" }) --- vim.keymap.set("t", "<C-l>", "<cmd>wincmd l<cr>", { desc = "Go to right window" }) --- vim.keymap.set("t", "<C-/>", "<cmd>close<cr>", { desc = "Hide Terminal" }) --- vim.keymap.set("t", "<c-_>", "<cmd>close<cr>", { desc = "which_key_ignore" }) --- --- -- windows -vim.keymap.set("n", "<leader>w=", "<C-W>=", { desc = "Equal window", remap = true }) -vim.keymap.set("n", "<leader>wo", "<C-W>p", { desc = "Other window", remap = true }) -vim.keymap.set("n", "<leader>wx", "<C-W>c", { desc = "Close window", remap = true }) --- vim.keymap.set("n", "<leader>w-", "<C-W>s", { desc = "Split window below", remap = true }) --- vim.keymap.set("n", "<leader>w|", "<C-W>v", { desc = "Split window right", remap = true }) --- vim.keymap.set("n", "<leader>-", "<C-W>s", { desc = "Split window below", remap = true }) --- vim.keymap.set("n", "<leader>|", "<C-W>v", { desc = "Split window right", remap = true }) --- --- -- tabs --- vim.keymap.set("n", "<leader><tab>l", "<cmd>tablast<cr>", { desc = "Last Tab" }) --- vim.keymap.set("n", "<leader><tab>f", "<cmd>tabfirst<cr>", { desc = "First Tab" }) --- vim.keymap.set("n", "<leader><tab><tab>", "<cmd>tabnew<cr>", { desc = "New Tab" }) -vim.keymap.set("n", "<leader><tab>n", "<cmd>tabnext<cr>", { desc = "Next Tab" }) -vim.keymap.set("n", "<leader><tab>x", "<cmd>tabclose<cr>", { desc = "Close Tab" }) -vim.keymap.set("n", "<leader><tab>p", "<cmd>tabprevious<cr>", { desc = "Previous Tab" }) +-- Keymaps are automatically loaded on the VeryLazy event +-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua +-- Add any additional keymaps here diff --git a/ar/.config/LazyVim/lua/config/lazy.lua b/ar/.config/LazyVim/lua/config/lazy.lua index b52de86..d73bfa1 100644 --- a/ar/.config/LazyVim/lua/config/lazy.lua +++ b/ar/.config/LazyVim/lua/config/lazy.lua @@ -1,78 +1,23 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - -- bootstrap lazy.nvim - -- stylua: ignore - vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath }) +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end end -vim.opt.rtp:prepend(vim.env.LAZY or lazypath) +vim.opt.rtp:prepend(lazypath) require("lazy").setup({ spec = { -- add LazyVim and import its plugins { "LazyVim/LazyVim", import = "lazyvim.plugins" }, - -- import any extras modules here - -- coding - -- { import = "lazyvim.plugins.extras.coding.codeium" }, - -- { import = "lazyvim.plugins.extras.coding.copilot" }, - -- { import = "lazyvim.plugins.extras.coding.native_snippets" }, - -- { import = "lazyvim.plugins.extras.coding.tabnine" }, - -- { import = "lazyvim.plugins.extras.coding.yanky" }, - -- dap - { import = "lazyvim.plugins.extras.dap.core" }, - { import = "lazyvim.plugins.extras.dap.nlua" }, - -- editor - -- { import = "lazyvim.plugins.extras.editor.aerial" }, - { import = "lazyvim.plugins.extras.editor.harpoon2" }, - { import = "lazyvim.plugins.extras.editor.leap" }, - { import = "lazyvim.plugins.extras.editor.mini-files" }, - -- { import = "lazyvim.plugins.extras.editor.navic" }, - -- { import = "lazyvim.plugins.extras.editor.outline" }, - -- formatting - { import = "lazyvim.plugins.extras.formatting.black" }, - { import = "lazyvim.plugins.extras.formatting.prettier" }, - -- lang - { import = "lazyvim.plugins.extras.lang.ansible" }, - { import = "lazyvim.plugins.extras.lang.clangd" }, - -- { import = "lazyvim.plugins.extras.lang.cmake" }, - { import = "lazyvim.plugins.extras.lang.docker" }, - -- { import = "lazyvim.plugins.extras.lang.elixir" }, - -- { import = "lazyvim.plugins.extras.lang.go" }, - -- { import = "lazyvim.plugins.extras.lang.haskell" }, - -- { import = "lazyvim.plugins.extras.lang.helm" }, - { import = "lazyvim.plugins.extras.lang.java" }, - { import = "lazyvim.plugins.extras.lang.json" }, - { import = "lazyvim.plugins.extras.lang.markdown" }, - -- { import = "lazyvim.plugins.extras.lang.omnisharp" }, - -- { import = "lazyvim.plugins.extras.lang.python-semshi" }, - { import = "lazyvim.plugins.extras.lang.python" }, - -- { import = "lazyvim.plugins.extras.lang.ruby" }, - -- { import = "lazyvim.plugins.extras.lang.rust" }, - -- { import = "lazyvim.plugins.extras.lang.scala" }, - -- { import = "lazyvim.plugins.extras.lang.tailwind" }, - -- { import = "lazyvim.plugins.extras.lang.terraform" }, - -- { import = "lazyvim.plugins.extras.lang.tex" }, - -- { import = "lazyvim.plugins.extras.lang.typescript" }, - { import = "lazyvim.plugins.extras.lang.yaml" }, - -- linting - { import = "lazyvim.plugins.extras.linting.eslint" }, - -- lsp - { import = "lazyvim.plugins.extras.lsp.none-ls" }, - -- test - { import = "lazyvim.plugins.extras.test.core" }, - -- ui - -- { import = "lazyvim.plugins.extras.ui.alpha" }, - { import = "lazyvim.plugins.extras.ui.edgy" }, - -- { import = "lazyvim.plugins.extras.ui.mini-animate" }, - -- { import = "lazyvim.plugins.extras.ui.mini-starter" }, - -- util - -- { import = "lazyvim.plugins.extras.util.dot" }, - -- { import = "lazyvim.plugins.extras.util.gitui" }, - { import = "lazyvim.plugins.extras.util.mini-hipatterns" }, - { import = "lazyvim.plugins.extras.util.project" }, - -- extras - { import = "lazyvim.plugins.extras.lazyrc" }, - { import = "lazyvim.plugins.extras.vscode" }, - -- import/override with your plugins { import = "plugins" }, }, @@ -86,7 +31,10 @@ require("lazy").setup({ -- version = "*", -- try installing the latest stable version for plugins that support semver }, install = { colorscheme = { "tokyonight", "habamax" } }, - checker = { enabled = true }, -- automatically check for plugin updates + checker = { + enabled = true, -- check for plugin updates periodically + notify = false, -- notify on update + }, -- automatically check for plugin updates performance = { rtp = { -- disable some rtp plugins diff --git a/ar/.config/LazyVim/lua/config/options.lua b/ar/.config/LazyVim/lua/config/options.lua index 1172763..3ea1454 100644 --- a/ar/.config/LazyVim/lua/config/options.lua +++ b/ar/.config/LazyVim/lua/config/options.lua @@ -1,105 +1,3 @@ -- Options are automatically loaded before lazy.nvim startup -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua -- Add any additional options here - --- vim.g.mapleader = " " -vim.g.maplocalleader = "\\" --- vim.g.autoformat = true --- vim.g.root_spec = { "lsp", { ".git", "lua" }, "cwd" } --- vim.g.netrw_banner = 0 --- vim.g.netrw_mouse = 2 - --- vim.opt.autowrite = true -- Enable auto write -vim.opt.backup = false -- creates a backup file --- vim.opt.clipboard = "" -- "unnamedplus" -- Sync with system clipboard -vim.opt.cmdheight = 1 -vim.opt.colorcolumn = "85" --- vim.opt.completeopt = "menu,menuone,noselect" -vim.opt.conceallevel = 1 -- default = 3, Hide * markup for bold and italic --- vim.opt.confirm = true -- Confirm to save changes before exiting modified buffer --- vim.opt.cursorline = true -- Enable highlighting of the current line --- vim.opt.expandtab = true -- Use spaces instead of tabs --- vim.opt.fileencoding = "utf-8" -vim.opt.hlsearch = true --- vim.opt.formatoptions = "jcroqlnt" -- tcqj --- vim.opt.grepformat = "%f:%l:%c:%m" --- vim.opt.grepprg = "rg --vimgrep" --- vim.opt.guifont = "monospace:h17" --- vim.opt.ignorecase = true -- Ignore case --- vim.opt.inccommand = "nosplit" -- preview incremental substitute --- vim.opt.laststatus = 3 -- global statusline --- vim.opt.list = true -- Show some invisible characters (tabs... --- vim.opt.mouse = "a" -- Enable mouse mode --- vim.opt.number = true -- Print line number --- vim.opt.numberwidth = 4 --- vim.opt.pumblend = 10 -- Popup blend --- vim.opt.pumheight = 10 -- Maximum number of entries in a popup --- vim.opt.relativenumber = true -- Relative line numbers -vim.opt.ruler = false -vim.opt.scrolloff = 8 -- Lines of context --- vim.opt.sessionoptions = { "buffers", "curdir", "tabpages", "winsize", "help", "globals", "skiprtp", "folds" } --- vim.opt.shiftround = true -- Round indent --- vim.opt.shiftwidth = 2 -- Size of an indent --- vim.opt.shortmess:append({ W = true, I = true, c = true, C = true }) -vim.opt.showcmd = false --- vim.opt.showmode = false -- Dont show mode since we have a statusline -vim.opt.showtabline = 1 --- vim.opt.sidescrolloff = 8 -- Columns of context --- vim.opt.signcolumn = "yes" -- Always show the signcolumn, otherwise it would shift the text each time --- vim.opt.smartcase = true -- Don't ignore case with capitals --- vim.opt.smartindent = true -- Insert indents automatically --- vim.opt.spelllang = { "en" } --- vim.opt.splitbelow = true -- Put new windows below current --- vim.opt.splitkeep = "screen" --- vim.opt.splitright = true -- Put new windows right of current -vim.opt.swapfile = false -vim.opt.tabstop = 4 -- Number of spaces tabs count for --- vim.opt.termguicolors = true -- True color support --- vim.opt.timeoutlen = 300 -vim.opt.title = false --- vim.opt.undofile = true --- vim.opt.undolevels = 10000 --- vim.opt.updatetime = 200 -- Save swap file and trigger CursorHold --- vim.opt.virtualedit = "block" -- Allow cursor to move where there is no text in visual block mode --- vim.opt.wildmode = "longest:full,full" -- Command-line completion mode --- vim.opt.winminwidth = 5 -- Minimum window width --- vim.opt.wrap = false -- Disable line wrap -vim.opt.writebackup = false - -vim.cmd("set whichwrap+=<,>,[,],h,l") -vim.cmd([[set iskeyword+=-]]) - --- vim.opt.fillchars = { --- foldopen = "", --- foldclose = "", --- -- fold = "⸱", --- fold = " ", --- foldsep = " ", --- diff = "╱", --- eob = " ", --- } --- --- if vim.fn.has("nvim-0.10") == 1 then --- vim.opt.smoothscroll = true --- end --- --- -- Folding --- vim.opt.foldlevel = 99 --- vim.opt.foldtext = "v:lua.require'lazyvim.util'.ui.foldtext()" --- --- if vim.fn.has("nvim-0.9.0") == 1 then --- vim.opt.statuscolumn = [[%!v:lua.require'lazyvim.util'.ui.statuscolumn()]] --- end --- --- -- HACK: causes freezes on <= 0.9, so only enable on >= 0.10 for now --- if vim.fn.has("nvim-0.10") == 1 then --- vim.opt.foldmethod = "expr" --- vim.opt.foldexpr = "v:lua.require'lazyvim.util'.ui.foldexpr()" --- else --- vim.opt.foldmethod = "indent" --- end --- --- vim.o.formatexpr = "v:lua.require'lazyvim.util'.format.formatexpr()" --- --- -- Fix markdown indentation settings --- vim.g.markdown_recommended_style = 0 diff --git a/ar/.config/LazyVim/lua/plugins/better-escape.lua b/ar/.config/LazyVim/lua/plugins/better-escape.lua deleted file mode 100644 index 8980a09..0000000 --- a/ar/.config/LazyVim/lua/plugins/better-escape.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "max397574/better-escape.nvim", - config = function() - require("better_escape").setup() - end, -} diff --git a/ar/.config/LazyVim/lua/plugins/bqf.lua b/ar/.config/LazyVim/lua/plugins/bqf.lua deleted file mode 100644 index 529c06d..0000000 --- a/ar/.config/LazyVim/lua/plugins/bqf.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "kevinhwang91/nvim-bqf", - ft = "qf", - keys = { - -- { "zn", false }, - -- { "zN", false }, - -- { "zf", false }, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/catppuccin.lua b/ar/.config/LazyVim/lua/plugins/catppuccin.lua deleted file mode 100644 index fa451bd..0000000 --- a/ar/.config/LazyVim/lua/plugins/catppuccin.lua +++ /dev/null @@ -1,92 +0,0 @@ -return { - "catppuccin/nvim", - lazy = true, - name = "catppuccin", - priority = 1000, - opts = { - integrations = { - aerial = true, - alpha = true, - cmp = true, - dashboard = true, - flash = true, - gitsigns = true, - headlines = true, - illuminate = true, - indent_blankline = { enabled = true }, - leap = true, - lsp_trouble = true, - mason = true, - markdown = true, - mini = true, - native_lsp = { - enabled = true, - underlines = { - errors = { "undercurl" }, - hints = { "undercurl" }, - warnings = { "undercurl" }, - information = { "undercurl" }, - }, - }, - navic = { enabled = true, custom_bg = "lualine" }, - neotest = true, - neotree = true, - noice = true, - notify = true, - semantic_tokens = true, - telescope = true, - treesitter = true, - treesitter_context = true, - which_key = true, - }, - }, - config = function() - require("catppuccin").setup({ - transparent_background = true, -- disables setting the background color. - styles = { -- Handles the styles of general hi groups (see `:h highlight-args`): - comments = { "italic" }, -- Change the style of comments - conditionals = {}, - loops = {}, - functions = {}, - keywords = { "bold" }, - strings = {}, - variables = {}, - numbers = {}, - booleans = {}, - properties = {}, - types = {}, - operators = {}, - }, - color_overrides = { - mocha = { - rosewater = "#f5e0dc", - flamingo = "#f2cdcd", - pink = "#f5c2e7", - mauve = "#cba6f7", - red = "#f38ba8", - maroon = "#eba0ac", - peach = "#fab387", - yellow = "#f9e2af", - green = "#a6e3a1", - teal = "#94e2d5", - sky = "#89dceb", - sapphire = "#74c7ec", - blue = "#89b4fa", - lavender = "#b4befe", - text = "#cdd6f4", - subtext1 = "#bac2de", - subtext0 = "#a6adc8", - overlay2 = "#9399b2", - overlay1 = "#7f849c", - overlay0 = "#696D86", - surface2 = "#585b70", - surface1 = "#45475a", - surface0 = "#232728", - base = "#282828", - mantle = "#181825", - crust = "#11111b", - }, - }, - }) - end, -} diff --git a/ar/.config/LazyVim/lua/plugins/cmp.lua b/ar/.config/LazyVim/lua/plugins/cmp.lua deleted file mode 100644 index 3121e90..0000000 --- a/ar/.config/LazyVim/lua/plugins/cmp.lua +++ /dev/null @@ -1,50 +0,0 @@ -return { - { - "L3MON4D3/LuaSnip", - keys = function() - return {} - end, - }, - { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-emoji", - }, - ---@param opts cmp.ConfigSchema - opts = function(_, opts) - local has_words_before = function() - unpack = unpack or table.unpack - 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 - - local luasnip = require("luasnip") - local cmp = require("cmp") - - opts.mapping = vim.tbl_extend("force", opts.mapping, { - ["<Tab>"] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable() - -- this way you will only jump inside the snippet region - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { "i", "s" }), - ["<S-Tab>"] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - }) - end, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/colorscheme.lua b/ar/.config/LazyVim/lua/plugins/colorscheme.lua deleted file mode 100644 index 6acb3d3..0000000 --- a/ar/.config/LazyVim/lua/plugins/colorscheme.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - { "catppuccin/nvim", name = "catppuccin", opts = { transparent_background = true }, priority = 1000 }, - { - "LazyVim/LazyVim", - opts = { - -- colorscheme = "tokyonight", - colorscheme = "catppuccin", - -- colorscheme = "gruvbox", - }, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/comment.lua b/ar/.config/LazyVim/lua/plugins/comment.lua deleted file mode 100644 index 1979d56..0000000 --- a/ar/.config/LazyVim/lua/plugins/comment.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - "numToStr/Comment.nvim", - lazy = "false", - keys = { - { - mode = "n", - "<leader>/", - function() - require("Comment.api").toggle.linewise.current() - end, - desc = "Toggle comment", - }, - { - mode = "v", - "<leader>/", - "<ESC><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>", - desc = "Toggle comment", - }, - }, - config = function(_, opts) - require("Comment").setup(opts) - end, -} diff --git a/ar/.config/LazyVim/lua/plugins/dadbod.lua b/ar/.config/LazyVim/lua/plugins/dadbod.lua deleted file mode 100644 index b3e8275..0000000 --- a/ar/.config/LazyVim/lua/plugins/dadbod.lua +++ /dev/null @@ -1,25 +0,0 @@ -return { - "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, - keys = { - { "<leader>ddb", "<cmd>DBUI<cr>", desc = "DB UI" }, - { "<leader>ddu", "<cmd>DBUIToggle<cr>", desc = "Toggle DB UI" }, - { "<leader>dda", "<cmd>DBUIAddConnection<cr>", desc = "Add Connection" }, - { "<leader>ddf", "<cmd>DBUIFindBuffer<cr>", desc = "Find buffer" }, - { "<leader>ddr", "<cmd>DBUIRenameBuffer<cr>", desc = "Rename buffer" }, - { "<leader>ddl", "<cmd>DBUILastQueryInfo<cr>", desc = "Last query info" }, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/dashboard-nvim.lua b/ar/.config/LazyVim/lua/plugins/dashboard-nvim.lua deleted file mode 100644 index 8a1ffd6..0000000 --- a/ar/.config/LazyVim/lua/plugins/dashboard-nvim.lua +++ /dev/null @@ -1,68 +0,0 @@ -local Util = require("lazyvim.util") -return { - "nvimdev/dashboard-nvim", - opts = function(_, opts) - local logo = [[ - ┌──────────────────────────────────────────────────────┐ - │ │ - │ ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ │ - │ ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ │ - │ ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ │ - │ ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ │ - │ ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ │ - │ ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ │ - └──────────────────────────────────────────────────────┘ - ]] - - logo = string.rep("\n", 5) .. logo .. "\n" - - local opts = { - theme = "doom", - hide = { - -- this is taken care of by lualine - -- enabling this messes up the actual laststatus setting after loading a file - statusline = false, - }, - - config = { - header = vim.split(logo, "\n"), - -- stylua: ignore - center = { - { action = "ene | startinsert", desc = " New file", icon = " ", key = "n" }, - { action = "Telescope oldfiles", desc = " Recent files", icon = " ", key = "r" }, - { action = "Telescope projects", desc = " Projects", icon = " ", key = "p" }, - { action = Util.telescope("files"), desc = " Find file", icon = " ", key = "f" }, - { action = "Telescope live_grep", desc = " Find word", icon = " ", key = "g" }, - { action = [[lua require("lazyvim.util").telescope.config_files()()]], desc = " Config", icon = " ", key = "c" }, - { action = 'lua require("persistence").load()', desc = " Restore Session", icon = " ", key = "s" }, - { action = "LazyExtras", desc = " Lazy Extras", icon = " ", key = "e" }, - { action = "Lazy", desc = " Lazy", icon = " ", key = "l" }, - { action = "Mason", desc = " Mason", icon = "◍ ", key = "m" }, - { action = "qa", desc = " Quit", icon = " ", key = "q" }, - }, - footer = function() - local stats = require("lazy").stats() - local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100) - return { "⚡ Neovim loaded " .. stats.loaded .. "/" .. stats.count .. " plugins in " .. ms .. "ms" } - end, - }, - } - - for _, button in ipairs(opts.config.center) do - button.desc = button.desc .. string.rep(" ", 43 - #button.desc) - button.key_format = " %s" - end - - -- close Lazy and re-open when the dashboard is ready - if vim.o.filetype == "lazy" then - vim.cmd.close() - vim.api.nvim_create_autocmd("User", { - pattern = "DashboardLoaded", - callback = function() - require("lazy").show() - end, - }) - end - return opts - end, -} diff --git a/ar/.config/LazyVim/lua/plugins/example.lua b/ar/.config/LazyVim/lua/plugins/example.lua index f84ebdc..17f53d6 100644 --- a/ar/.config/LazyVim/lua/plugins/example.lua +++ b/ar/.config/LazyVim/lua/plugins/example.lua @@ -30,14 +30,6 @@ return { -- disable trouble { "folke/trouble.nvim", enabled = false }, - -- add symbols-outline - { - "simrat39/symbols-outline.nvim", - cmd = "SymbolsOutline", - keys = { { "<leader>cs", "<cmd>SymbolsOutline<cr>", desc = "Symbols Outline" } }, - config = true, - }, - -- override nvim-cmp and add cmp-emoji { "hrsh7th/nvim-cmp", @@ -71,18 +63,6 @@ return { }, }, - -- add telescope-fzf-native - { - "telescope.nvim", - dependencies = { - "nvim-telescope/telescope-fzf-native.nvim", - build = "make", - config = function() - require("telescope").load_extension("fzf") - end, - }, - }, - -- add pyright to lspconfig { "neovim/nvim-lspconfig", @@ -102,7 +82,7 @@ return { dependencies = { "jose-elias-alvarez/typescript.nvim", init = function() - require("lazyvim.util").on_attach(function(_, buffer) + require("lazyvim.util").lsp.on_attach(function(_, buffer) -- stylua: ignore vim.keymap.set( "n", "<leader>co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) vim.keymap.set("n", "<leader>cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) @@ -177,7 +157,11 @@ return { "nvim-lualine/lualine.nvim", event = "VeryLazy", opts = function(_, opts) - table.insert(opts.sections.lualine_x, "😄") + table.insert(opts.sections.lualine_x, { + function() + return "😄" + end, + }) end, }, @@ -210,56 +194,4 @@ return { }, }, }, - - -- Use <tab> for completion and snippets (supertab) - -- first: disable default <tab> and <s-tab> behavior in LuaSnip - { - "L3MON4D3/LuaSnip", - keys = function() - return {} - end, - }, - -- then: setup supertab in cmp - { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-emoji", - }, - ---@param opts cmp.ConfigSchema - opts = function(_, opts) - local has_words_before = function() - unpack = unpack or table.unpack - 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 - - local luasnip = require("luasnip") - local cmp = require("cmp") - - opts.mapping = vim.tbl_extend("force", opts.mapping, { - ["<Tab>"] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable() - -- this way you will only jump inside the snippet region - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { "i", "s" }), - ["<S-Tab>"] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - }) - end, - }, } diff --git a/ar/.config/LazyVim/lua/plugins/file-browser.lua b/ar/.config/LazyVim/lua/plugins/file-browser.lua deleted file mode 100644 index 9a9ea2f..0000000 --- a/ar/.config/LazyVim/lua/plugins/file-browser.lua +++ /dev/null @@ -1,15 +0,0 @@ -return { - "nvim-telescope/telescope-file-browser.nvim", - dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" }, - keys = { - { - mode = "n", - "<leader>sB", - ":Telescope file_browser path=%:p:h=%:p:h<cr>", - desc = "Browse Files", - }, - }, - config = function() - require("telescope").load_extension("file_browser") - end, -} diff --git a/ar/.config/LazyVim/lua/plugins/glow.lua b/ar/.config/LazyVim/lua/plugins/glow.lua deleted file mode 100644 index e4702d2..0000000 --- a/ar/.config/LazyVim/lua/plugins/glow.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "ellisonleao/glow.nvim", - cmd = "Glow", - config = true, - keys = { - { mode = "n", "<leader>mf", "<cmd>Glow<cr>", desc = "Markdown Preview float" }, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/goyo.lua b/ar/.config/LazyVim/lua/plugins/goyo.lua deleted file mode 100644 index 9d0f860..0000000 --- a/ar/.config/LazyVim/lua/plugins/goyo.lua +++ /dev/null @@ -1,53 +0,0 @@ -vim.g.is_goyo_active = false - -vim.g.goyo_enter = function() - if vim.fn.executable("tmux") == 1 and vim.fn.strlen(vim.env.TMUX) > 0 then - vim.fn.system("tmux set status off") - if not string.find(vim.fn.system("tmux list-panes -F '#F'"), "Z") then - vim.fn.system("tmux resize-pane -Z") - end - end - - vim.g.default_colorscheme = vim.g.colors_name or "default" - vim.o.background = "light" - vim.wo.linebreak = true - vim.wo.wrap = true - vim.bo.textwidth = 0 - vim.bo.wrapmargin = 0 - vim.cmd("Goyo 80x85%") - vim.cmd("colorscheme seoul256") - vim.g.is_goyo_active = true -end - -vim.g.goyo_leave = function() - if vim.fn.executable("tmux") == 1 and vim.fn.strlen(vim.env.TMUX) > 0 then - vim.fn.system("tmux set status on") - if string.find(vim.fn.system("tmux list-panes -F '#F'"), "Z") then - vim.fn.system("tmux resize-pane -Z") - end - end - vim.cmd("Goyo!") - vim.cmd("colorscheme " .. vim.g.default_colorscheme) - vim.g.is_goyo_active = false -end - -vim.g.toggle_goyo = function() - if vim.g.is_goyo_active then - vim.g.goyo_leave() - else - vim.g.goyo_enter() - end -end - -return { - "junegunn/goyo.vim", - cmd = "Goyo", - keys = { - vim.api.nvim_set_keymap( - "n", - "<leader>gy", - "<cmd>lua vim.g.toggle_goyo()<CR>", - { noremap = true, silent = true, desc = "Toggle Goyo" } - ), - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/harpoon.lua b/ar/.config/LazyVim/lua/plugins/harpoon.lua deleted file mode 100644 index a156e1d..0000000 --- a/ar/.config/LazyVim/lua/plugins/harpoon.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - "ThePrimeagen/harpoon", - branch = "harpoon2", - opts = { - menu = { - width = vim.api.nvim_win_get_width(0) - 4, - }, - }, - keys = { - { - "<C-e>", - function() - local harpoon = require("harpoon") - harpoon.ui:toggle_quick_menu(harpoon:list()) - end, - desc = "Harpoon quick menu", - }, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/impatient.lua b/ar/.config/LazyVim/lua/plugins/impatient.lua deleted file mode 100644 index d0877c9..0000000 --- a/ar/.config/LazyVim/lua/plugins/impatient.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "lewis6991/impatient.nvim", - config = function() - require("impatient") - end, -} diff --git a/ar/.config/LazyVim/lua/plugins/jukit.lua b/ar/.config/LazyVim/lua/plugins/jukit.lua deleted file mode 100644 index f5ad24f..0000000 --- a/ar/.config/LazyVim/lua/plugins/jukit.lua +++ /dev/null @@ -1,79 +0,0 @@ -return { - -- "luk400/vim-jukit", - -- lazy = false, - -- keys = { - -- { "<leader>os", false }, - -- { "<leader>ts", false }, - -- { "<leader>hs", false }, - -- { "<leader>ohs", false }, - -- { "<leader>hd", false }, - -- { "<leader>od", false }, - -- { "<leader>ohd", false }, - -- { "<leader>so", false }, - -- { "<leader>j", false }, - -- { "<leader>k", false }, - -- { "<leader>ah", false }, - -- { "<leader>sl", false }, - -- { "<space>", false }, - -- { "<cr>", false }, - -- { "<cr>", false }, - -- { "<leader>cc", false }, - -- { "<leader>all", false }, - -- { "<leader>co", false }, - -- { "<leader>cO", false }, - -- { "<leader>ct", false }, - -- { "<leader>cT", false }, - -- { "<leader>cd", false }, - -- { "<leader>cs", false }, - -- { "<leader>cM", false }, - -- { "<leader>cm", false }, - -- { "<leader>ck", false }, - -- { "<leader>cj", false }, - -- { "<leader>J", false }, - -- { "<leader>K", false }, - -- { "<leader>ddo", false }, - -- { "<leader>dda", false }, - -- { "<leader>np", false }, - -- { "<leader>ht", false }, - -- { "<leader>rht", false }, - -- { "<leader>pd", false }, - -- { "<leader>rpd", false }, - -- - -- { "<localleader>os", ":call jukit#splits#output()<cr>", desc = "", mode = "n" }, - -- { "<localleader>ts", ":call jukit#splits#term()<cr>", desc = "", mode = "n" }, - -- { "<localleader>hs", ":call jukit#splits#history()<cr>", desc = "", mode = "n" }, - -- { "<localleader>ohs", ":call jukit#splits#output_and_history()<cr>", desc = "", mode = "n" }, - -- { "<localleader>hd", ":call jukit#splits#close_history()<cr>", desc = "", mode = "n" }, - -- { "<localleader>od", ":call jukit#splits#close_output_split()<cr>", desc = "", mode = "n" }, - -- { "<localleader>ohd", ":call jukit#splits#close_output_and_history(1)<cr>", desc = "", mode = "n" }, - -- { "<localleader>so", ":call jukit#splits#show_last_cell_output(1)<cr>", desc = "", mode = "n" }, - -- { "<localleader>j", ":call jukit#splits#out_hist_scroll(1)<cr>", desc = "", mode = "n" }, - -- { "<localleader>k", ":call jukit#splits#out_hist_scroll(0)<cr>", desc = "", mode = "n" }, - -- { "<localleader>ah", ":call jukit#splits#toggle_auto_hist()<cr>", desc = "", mode = "n" }, - -- { "<localleader>sl", ":call jukit#layouts#set_layout()<cr>", desc = "", mode = "n" }, - -- { "<localleader><space>", ":call jukit#send#section(0)<cr>", desc = "", mode = "n" }, - -- { "<localleader><cr>", ":call jukit#send#line()<cr>", desc = "", mode = "n" }, - -- { "<localleader><cr>", ":<C-U>call jukit#send#selection()<cr>", desc = "", mode = "v" }, - -- { "<localleader>cc", ":call jukit#send#until_current_section()<cr>", desc = "", mode = "n" }, - -- { "<localleader>all", ":call jukit#send#all()<cr>", desc = "", mode = "n" }, - -- { "<localleader>co", ":call jukit#cells#create_below(0)<cr>", desc = "", mode = "n" }, - -- { "<localleader>cO", ":call jukit#cells#create_above(0)<cr>", desc = "", mode = "n" }, - -- { "<localleader>ct", ":call jukit#cells#create_below(1)<cr>", desc = "", mode = "n" }, - -- { "<localleader>cT", ":call jukit#cells#create_above(1)<cr>", desc = "", mode = "n" }, - -- { "<localleader>cd", ":call jukit#cells#delete()<cr>", desc = "", mode = "n" }, - -- { "<localleader>cs", ":call jukit#cells#split()<cr>", desc = "", mode = "n" }, - -- { "<localleader>cM", ":call jukit#cells#merge_above()<cr>", desc = "", mode = "n" }, - -- { "<localleader>cm", ":call jukit#cells#merge_below()<cr>", desc = "", mode = "n" }, - -- { "<localleader>ck", ":call jukit#cells#move_up()<cr>", desc = "", mode = "n" }, - -- { "<localleader>cj", ":call jukit#cells#move_down()<cr>", desc = "", mode = "n" }, - -- { "<localleader>J", ":call jukit#cells#jump_to_next_cell()<cr>", desc = "", mode = "n" }, - -- { "<localleader>K", ":call jukit#cells#jump_to_previous_cell()<cr>", desc = "", mode = "n" }, - -- { "<localleader>ddo", ":call jukit#cells#delete_outputs(0)<cr>", desc = "", mode = "n" }, - -- { "<localleader>dda", ":call jukit#cells#delete_outputs(1)<cr>", desc = "", mode = "n" }, - -- { "<localleader>np", ":call jukit#convert#notebook_convert('jupyter-notebook')<cr>", desc = "", mode = "n" }, - -- { "<localleader>ht", ":call jukit#convert#save_nb_to_file(0,1,'html')<cr>", desc = "", mode = "n" }, - -- { "<localleader>rht", ":call jukit#convert#save_nb_to_file(1,1,'html')<cr>", desc = "", mode = "n" }, - -- { "<localleader>pd", ":call jukit#convert#save_nb_to_file(0,1,'pdf')<cr>", desc = "", mode = "n" }, - -- { "<localleader>rpd", ":call jukit#convert#save_nb_to_file(1,1,'pdf')<cr>", desc = "", mode = "n" }, - -- }, -} diff --git a/ar/.config/LazyVim/lua/plugins/jupyter.lua b/ar/.config/LazyVim/lua/plugins/jupyter.lua deleted file mode 100644 index 0cb684b..0000000 --- a/ar/.config/LazyVim/lua/plugins/jupyter.lua +++ /dev/null @@ -1,345 +0,0 @@ -local function get_commenter() - 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 = get_commenter() .. "%%" -vim.api.nvim_set_hl(0, "CellMarkerHl", { default = true, bg = "#c5c5c5", fg = "#111111" }) - -local function miniai_spec(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 - -local function show_cell_markers() - require("mini.hipatterns").enable(0, { - highlighters = { - marker = { pattern = "^" .. get_commenter() .. "%%%%", group = "CellMarkerHl" }, - }, - }) -end - -local function select_cell() - 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 - -local function execute_cell() - local current_row, current_col, start_line, end_line = 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 - -local function delete_cell() - local _, _, start_line, end_line = 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 - -local function navigate_cell(up) - local is_up = up or false - local _, _, start_line, end_line = 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 = select_cell() - vim.api.nvim_win_set_cursor(0, { end_line - 1, 0 }) - end - end -end - -local function move_cell(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 - -local function insert_cell_before(content) - content = content or CELL_MARKER - local cell_object = miniai_spec("a") - vim.api.nvim_buf_set_lines(0, cell_object.from.line - 1, cell_object.from.line - 1, false, { content, "" }) - move_cell("u") -end - -local function insert_cell_after(content) - content = content or CELL_MARKER - vim.print(content) - local cell_object = miniai_spec("a") - vim.api.nvim_buf_set_lines(0, cell_object.to.line, cell_object.to.line, false, { content, "" }) - move_cell("d") -end - -local function insert_markdown_cell() - insert_cell_after(CELL_MARKER .. " [markdown]") -end - -local function repl_menu() - local cmd = require("hydra.keymap-util").cmd - - local hint = [[ - ^ - _a_: Insert Cell After - _b_: Insert Cell Before - _e_: Execute Cell - _j_: Next Cell - _k_: Previous Cell - _m_: Insert Markdown Cell - _x_: Delete Cell - ^ - _s_: Send Motion - _l_: Send Line - _t_: Send Until Cursor - _f_: Send File - ^ - _R_: Show REPL - _C_: Close REPL - _S_: Restart REPL - _F_: Focus - _H_: Hide - ^ - _c_: Clear - _L_: Clear Highlight - _<CR>_: ENTER - _I_: Interrupt - ^ - ^ ^ _q_: Quit -]] - - return { - name = "REPL", - hint = hint, - config = { - color = "pink", - invoke_on_body = true, - hint = { - border = "rounded", - position = "bottom-middle", - }, - }, - mode = "n", - body = "<A-n>", - -- stylua: ignore - heads = { - { "a", insert_cell_after, desc = "Insert Cell After", }, - { "b", insert_cell_before, desc = "Insert Cell Before", }, - { "e", execute_cell, desc = "Execute Cell", }, - { "j", navigate_cell , desc = "Next Cell", }, - { "k", function() navigate_cell(true) end, desc = "Previous Cell", }, - { "m", insert_markdown_cell, desc = "Insert Markdown Cell", }, - { "x", delete_cell, desc = "Delete Cell", }, - { "s", function() require("iron.core").run_motion("send_motion") end, desc = "Send Motion" }, - { "l", function() require("iron.core").send_line() end, desc = "Send Line" }, - { "t", function() require("iron.core").send_until_cursor() end, desc = "Send Until Cursor" }, - { "f", function() require("iron.core").send_file() end, desc = "Send File" }, - { "L", function() require("iron.marks").clear_hl() end, mode = {"v"}, desc = "Clear Highlight" }, - { "<CR>", function() require("iron.core").send(nil, string.char(13)) end, desc = "ENTER" }, - { "I", function() require("iron.core").send(nil, string.char(03)) end, desc = "Interrupt" }, - { "C", function() require("iron.core").close_repl() end, desc = "Close REPL" }, - { "c", function() require("iron.core").send(nil, string.char(12)) end, desc = "Clear" }, - { "R", cmd("IronRepl"), desc = "REPL" }, - { "S", cmd("IronRestart"), desc = "Restart" }, - { "F", cmd("IronFocus"), desc = "Focus" }, - { "H", cmd("IronHide"), desc = "Hide" }, - { "q", nil, { exit = true, nowait = true, desc = "Exit" } }, - }, - } -end - -return { - { - "goerz/jupytext.vim", - build = "pip install jupytext", - event = "VeryLazy", - dependencies = { "neovim/nvim-lspconfig" }, - opts = {}, - config = function() - -- The destination format: 'ipynb', 'markdown' or 'script', or a file extension: 'md', 'Rmd', 'jl', 'py', 'R', ..., 'auto' (script - -- extension matching the notebook language), or a combination of an extension and a format name, e.g. md:markdown, md:pandoc, - -- md:myst or py:percent, py:light, py:nomarker, py:hydrogen, py:sphinx. The default format for scripts is the 'light' format, - -- which uses few cell markers (none when possible). Alternatively, a format compatible with many editors is the 'percent' format, - -- which uses '# %%' as cell markers. The main formats (markdown, light, percent) preserve notebooks and text documents in a - -- roundtrip. Use the --test and and --test-strict commands to test the roundtrip on your files. Read more about the available - -- formats at https://jupytext.readthedocs.io/en/latest/formats.html (default: None) - 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) - show_cell_markers() - end, - }) - end, - }, - { - "Vigemus/iron.nvim", - event = "VeryLazy", - opts = function() - return { - config = { - -- Whether a repl should be discarded or not - scratch_repl = true, - -- Your repl definitions come here - - repl_definition = { - python = require("iron.fts.python").ipython, - scala = require("iron.fts.scala").scala, - }, - -- How the repl window will be displayed - -- See below for more information - repl_open_cmd = require("iron.view").right("50%"), - }, - -- If the highliht is on, you can change how it looks - -- For the available options, check nvim_set_hl - highlight = { - italic = true, - }, - ignore_blank_lines = true, -- ignore blank lines when sending visual select lines - } - end, - -- stylua: ignore - keys = { - { "<leader>i", function() end, mode = {"n", "x"}, desc = "+REPL" }, - { "<leader>im", function() end, mode = {"n", "x"}, desc = "+Mark" }, - { "<leader>ire>", execute_cell, desc = "Execute Cell" }, - { "<leader>irx", delete_cell, desc = "Delete Cell" }, - { "<leader>ir]", navigate_cell, desc = "Next Cell" }, - { "<leader>ir[", function() navigate_cell(true) end, desc = "Previous Cell" }, - { "<leader>is", function() require("iron.core").run_motion("send_motion") end, desc = "Send Motion" }, - { "<leader>is", function() require("iron.core").visual_send() end, mode = {"v"}, desc = "Send" }, - { "<leader>il", function() require("iron.core").send_line() end, desc = "Send Line" }, - { "<leader>it", function() require("iron.core").send_until_cursor() end, desc = "Send Until Cursor" }, - { "<leader>if", function() require("iron.core").send_file() end, desc = "Send File" }, - { "<leader>iL", function() require("iron.marks").clear_hl() end, mode = {"v"}, desc = "Clear Highlight" }, - { "<leader>i<cr>", function() require("iron.core").send(nil, string.char(13)) end, desc = "ENTER" }, - { "<leader>iI", function() require("iron.core").send(nil, string.char(03)) end, desc = "Interrupt" }, - { "<leader>iC", function() require("iron.core").close_repl() end, desc = "Close REPL" }, - { "<leader>ic", function() require("iron.core").send(nil, string.char(12)) end, desc = "Clear" }, - { "<leader>ims", function() require("iron.core").send_mark() end, desc = "Send Mark" }, - { "<leader>imm", function() require("iron.core").run_motion("mark_motion") end, desc = "Mark Motion" }, - { "<leader>imv", function() require("iron.core").mark_visual() end, mode = {"v"}, desc = "Mark Visual" }, - { "<leader>imr", function() require("iron.marks").drop_last() end, desc = "Remove Mark" }, - { "<leader>iR", "<cmd>IronRepl<cr>", desc = "REPL" }, - { "<leader>iS", "<cmd>IronRestart<cr>", desc = "Restart" }, - { "<leader>iF", "<cmd>IronFocus<cr>", desc = "Focus" }, - { "<leader>iH", "<cmd>IronHide<cr>", desc = "Hide" }, - }, - config = function(_, opts) - local iron = require("iron.core") - iron.setup(opts) - end, - }, - { - "folke/which-key.nvim", - event = "VeryLazy", - opts = { - defaults = { - ["<leader>i"] = { name = "+REPL" }, - ["<leader>im"] = { name = "+Mark" }, - }, - }, - }, - { - "anuvyklack/hydra.nvim", - event = { "VeryLazy" }, - opts = { - specs = { - repl = repl_menu, - }, - }, - config = function(_, opts) - local hydra = require("hydra") - for s, _ in pairs(opts.specs) do - hydra(opts.specs[s]()) - end - end, - }, - { - "echasnovski/mini.ai", - opts = function(_, opts) - opts.custom_textobjects = vim.tbl_extend("force", opts.custom_textobjects, { h = miniai_spec }) - end, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/lspconfig.lua b/ar/.config/LazyVim/lua/plugins/lspconfig.lua deleted file mode 100644 index 4d8db1c..0000000 --- a/ar/.config/LazyVim/lua/plugins/lspconfig.lua +++ /dev/null @@ -1,77 +0,0 @@ -return { - "neovim/nvim-lspconfig", - init = function() - local keys = require("lazyvim.plugins.lsp.keymaps").get() - -- change a keymap - -- keys[#keys + 1] = { "K", "<cmd>echo 'hello'<cr>" } - -- keys[#keys + 1] = { "<c-k>", mode = { "i" }, false } - - -- disable a keymap - -- keys[#keys + 1] = { "K", false } - keys[#keys + 1] = { mode = { "i" }, "<c-k>", false } - - -- add a keymap - -- keys[#keys + 1] = { "H", "<cmd>echo 'hello'<cr>" } - end, - opts = { - servers = { - -- Ensure mason installs the server - clangd = { - keys = { - { "<leader>cR", "<cmd>ClangdSwitchSourceHeader<cr>", desc = "Switch Source/Header (C/C++)" }, - }, - root_dir = function(fname) - return require("lspconfig.util").root_pattern( - "Makefile", - "configure.ac", - "configure.in", - "config.h.in", - "meson.build", - "meson_options.txt", - "build.ninja" - )(fname) or require("lspconfig.util").root_pattern("compile_commands.json", "compile_flags.txt")( - fname - ) or require("lspconfig.util").find_git_ancestor(fname) - end, - capabilities = { - offsetEncoding = { "utf-16" }, - }, - cmd = { - "clangd", - "--background-index", - "--clang-tidy", - "--header-insertion=iwyu", - "--completion-style=detailed", - "--function-arg-placeholders", - "--fallback-style=llvm", - }, - init_options = { - usePlaceholders = true, - completeUnimported = true, - clangdFileStatus = true, - }, - }, - }, - setup = { - clangd = function(_, opts) - local clangd_ext_opts = require("lazyvim.util").opts("clangd_extensions.nvim") - require("clangd_extensions").setup(vim.tbl_deep_extend("force", clangd_ext_opts or {}, { server = opts })) - return false - end, - }, - }, - keys = { - { - -- mode = "n", - "<leader>rr", - ":w | :TermExec cmd='compiler \"%\"' size=50 direction=tab go_back=0<cr>", - desc = "Run Code", - }, - { - -- mode = "n", - "<leader>rd", - ":w | :TermExec cmd='compiler \"%\" -d' size=50 direction=tab go_back=0<cr>", - desc = "Debug Code", - }, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/lualine.lua b/ar/.config/LazyVim/lua/plugins/lualine.lua deleted file mode 100644 index 7c64086..0000000 --- a/ar/.config/LazyVim/lua/plugins/lualine.lua +++ /dev/null @@ -1,105 +0,0 @@ -return { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - init = function() - vim.g.lualine_laststatus = vim.o.laststatus - if vim.fn.argc(-1) > 0 then - -- set an empty statusline till lualine loads - vim.o.statusline = " " - else - -- hide the statusline on the starter page - vim.o.laststatus = 0 - end - end, - opts = function() - -- PERF: we don't need this lualine require madness 🤷 - local lualine_require = require("lualine_require") - lualine_require.require = require - - local icons = require("lazyvim.config").icons - - vim.o.laststatus = vim.g.lualine_laststatus - - return { - options = { - theme = "auto", - component_separators = { left = " ", right = " " }, - section_separators = { left = " ", right = " " }, - globalstatus = true, - disabled_filetypes = { statusline = { "dashboard", "alpha", "starter" } }, - }, - sections = { - lualine_a = { "mode" }, - lualine_b = { "branch" }, - - lualine_c = { - LazyVim.lualine.root_dir(), - { - "diagnostics", - symbols = { - error = icons.diagnostics.Error, - warn = icons.diagnostics.Warn, - info = icons.diagnostics.Info, - hint = icons.diagnostics.Hint, - }, - }, - { "filetype", icon_only = true, separator = "", padding = { left = 1, right = 0 } }, - { LazyVim.lualine.pretty_path() }, - }, - lualine_x = { - -- stylua: ignore - { - function() return require("noice").api.status.command.get() end, - cond = function() return package.loaded["noice"] and require("noice").api.status.command.has() end, - color = LazyVim.ui.fg("Statement"), - }, - -- stylua: ignore - { - function() return require("noice").api.status.mode.get() end, - cond = function() return package.loaded["noice"] and require("noice").api.status.mode.has() end, - color = LazyVim.ui.fg("Constant"), - }, - -- stylua: ignore - { - function() return " " .. require("dap").status() end, - cond = function () return package.loaded["dap"] and require("dap").status() ~= "" end, - color = LazyVim.ui.fg("Debug"), - }, - { - require("lazy.status").updates, - cond = require("lazy.status").has_updates, - color = LazyVim.ui.fg("Special"), - }, - { - "diff", - symbols = { - added = icons.git.added, - modified = icons.git.modified, - removed = icons.git.removed, - }, - source = function() - local gitsigns = vim.b.gitsigns_status_dict - if gitsigns then - return { - added = gitsigns.added, - modified = gitsigns.changed, - removed = gitsigns.removed, - } - end - end, - }, - }, - lualine_y = { - { "progress", separator = " ", padding = { left = 1, right = 0 } }, - { "location", padding = { left = 0, right = 1 } }, - }, - lualine_z = { - function() - return " " .. os.date("%R") - end, - }, - }, - extensions = { "neo-tree", "lazy" }, - } - end, -} diff --git a/ar/.config/LazyVim/lua/plugins/magma.lua b/ar/.config/LazyVim/lua/plugins/magma.lua deleted file mode 100644 index f648762..0000000 --- a/ar/.config/LazyVim/lua/plugins/magma.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - "dccsillag/magma-nvim", - build = ":UpdateRemotePlugins", - keys = { - { - "<LocalLeader>r", - ":MagmaEvaluateOperator<CR>", - expr = true, - silent = true, - desc = "Evaluate Operator", - mode = "n", - }, - { "<LocalLeader>rr", ":MagmaEvaluateLine<CR>", silent = true, desc = "Evaluate Line", mode = "n" }, - { "<LocalLeader>rv", ":<C-u>MagmaEvaluateVisual<CR>", silent = true, desc = "Evaluate Visual", mode = "x" }, - { "<LocalLeader>rc", ":MagmaReevaluateCell<CR>", silent = true, desc = "Reevaluate Cell", mode = "n" }, - { "<LocalLeader>rd", ":MagmaDelete<CR>", silent = true, desc = "Delete", mode = "n" }, - { "<LocalLeader>ro", ":MagmaShowOutput<CR>", silent = true, desc = "Show Output", mode = "n" }, - { "<LocalLeader>ri", ":MagmaInit python3<CR>", silent = true, desc = "Init", mode = "n" }, - -- let g:magma_automatically_open_output = v:false - -- let g:magma_image_provider = "ueberzug" - -- let g:magma_image_provider = "kitty" - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/markdown-preview.lua b/ar/.config/LazyVim/lua/plugins/markdown-preview.lua deleted file mode 100644 index 328f2e9..0000000 --- a/ar/.config/LazyVim/lua/plugins/markdown-preview.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - "iamcco/markdown-preview.nvim", - cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, - -- build = function() - -- vim.fn["mkdp#util#install"]() - -- end, - keys = { - { - "<leader>cp", - false, - }, - { - mode = "n", - "<leader>mp", - ft = "markdown", - "<cmd>MarkdownPreviewToggle<cr>", - desc = "Markdown Preview", - }, - }, - -- config = function() - -- vim.cmd([[do FileType]]) - -- end, -} diff --git a/ar/.config/LazyVim/lua/plugins/mason.lua b/ar/.config/LazyVim/lua/plugins/mason.lua deleted file mode 100644 index 96e320d..0000000 --- a/ar/.config/LazyVim/lua/plugins/mason.lua +++ /dev/null @@ -1,92 +0,0 @@ -local options = { - ensure_installed = { - "black", - "clangd", - "codelldb", - "debugpy", - "docker-compose-language-service", - "dockerfile-language-server", - "eslint-lsp", - "hadolint", - "java-debug-adapter", - "java-test", - "jdtls", - "json-lsp", - "lua-language-server", - "markdownlint", - "marksman", - "prettier", - "pyright", - "ruff", - "shfmt", - "stylua", - "yaml-language-server", - }, - - max_concurrent_installers = 10, -} - -return { - "williamboman/mason.nvim", - cmd = { "Mason", "MasonInstall", "MasonInstallAll", "MasonUpdate" }, - opts = function() - return options - end, - build = ":MasonUpdate", - ---@param opts MasonSettings | {ensure_installed: string[]} - config = function(_, opts) - require("mason").setup(opts) - local mr = require("mason-registry") - mr:on("package:install:success", function() - vim.defer_fn(function() - -- trigger FileType event to possibly load this newly installed LSP server - require("lazy.core.handler.event").trigger({ - event = "FileType", - buf = vim.api.nvim_get_current_buf(), - }) - end, 100) - end) - local function ensure_installed() - for _, tool in ipairs(opts.ensure_installed) do - local p = mr.get_package(tool) - if not p:is_installed() then - p:install() - end - end - end - if mr.refresh then - mr.refresh(ensure_installed) - else - ensure_installed() - end - require("mason").setup(opts) - vim.api.nvim_create_user_command("MasonInstallAll", function() - if opts.ensure_installed and #opts.ensure_installed > 0 then - vim.cmd("MasonInstall " .. table.concat(opts.ensure_installed, " ")) - end - end, {}) - - vim.g.mason_binaries_list = opts.ensure_installed - end, - keys = { - { "<leader>cm", false }, - { - mode = "n", - "<leader>ms", - "<cmd>Mason<cr>", - desc = "Mason", - }, - { - mode = "n", - "<leader>mu", - "<cmd>MasonUpdate<cr>", - desc = "Mason Update", - }, - { - mode = "n", - "<leader>mi", - "<cmd>MasonInstallAll<cr>", - desc = "Mason Install All", - }, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/neogen.lua b/ar/.config/LazyVim/lua/plugins/neogen.lua deleted file mode 100644 index 0fbe48a..0000000 --- a/ar/.config/LazyVim/lua/plugins/neogen.lua +++ /dev/null @@ -1,33 +0,0 @@ -local opts = { noremap = true, silent = true } -return { - "danymat/neogen", - dependencies = "nvim-treesitter/nvim-treesitter", - config = true, - version = "*", - keys = { - vim.api.nvim_set_keymap( - "n", - "<Leader>nf", - ":lua require('neogen').generate({type = 'file'})<CR>", - { desc = "generate file", noremap = true, silent = true } - ), - vim.api.nvim_set_keymap( - "n", - "<Leader>nn", - ":lua require('neogen').generate({type = 'func'})<CR>", - { desc = "generate function", noremap = true, silent = true } - ), - vim.api.nvim_set_keymap( - "n", - "<Leader>nc", - ":lua require('neogen').generate({ type = 'class' })<CR>", - { desc = "generate class", noremap = true, silent = true } - ), - vim.api.nvim_set_keymap( - "n", - "<Leader>nt", - ":lua require('neogen').generate({ type = 'type' })<CR>", - { desc = "generate type", noremap = true, silent = true } - ), - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/notify.lua b/ar/.config/LazyVim/lua/plugins/notify.lua deleted file mode 100644 index 828aaf1..0000000 --- a/ar/.config/LazyVim/lua/plugins/notify.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "rcarriga/nvim-notify", - opts = { - background_colour = "#000000", - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/nvim-neo-tree.lua b/ar/.config/LazyVim/lua/plugins/nvim-neo-tree.lua deleted file mode 100644 index ebb7387..0000000 --- a/ar/.config/LazyVim/lua/plugins/nvim-neo-tree.lua +++ /dev/null @@ -1,16 +0,0 @@ -local Util = require("lazyvim.util") -return { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - cmd = "Neotree", - opts = {}, - keys = { - { - "<C-n>", - function() - require("neo-tree.command").execute({ toggle = false }) - end, - desc = "Focus Explorer NeoTree (root dir)", - }, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/obsidian.lua b/ar/.config/LazyVim/lua/plugins/obsidian.lua deleted file mode 100644 index ed09f64..0000000 --- a/ar/.config/LazyVim/lua/plugins/obsidian.lua +++ /dev/null @@ -1,319 +0,0 @@ -return { - "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", - }, - }, - notes_subdir = "/Resource/Unsorted notes", - log_level = vim.log.levels.INFO, - daily_notes = { - folder = "Area/Journal/Daily", - date_format = "%Y-%m-%d", - alias_format = "%B %e, %Y", - template = "nvim-todo-daily-template.md", - }, - templates = { - subdir = "Resource/Templates/Notes", - date_format = "%Y-%m-%d", - time_format = "%H:%M", - substitutions = { - date_alias = function() - return os.date("%B %-e, %Y") - end, - folder_name = function() - local currentFilePath = vim.fn.expand("%:p:h") - local _, _, currentFolderName = currentFilePath:find("([^/]+)$") - currentFolderName = currentFolderName:gsub(" ", "-") - return currentFolderName - end, - }, - }, - completion = { - nvim_cmp = true, - min_chars = 2, - }, - 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)) - suffix = tostring(os.date("%Y-%m-%d")) - end - end - -- return tostring(os.date("%Y-%M-%d")) .. "-" .. suffix - -- return tostring(os.date("%Y-%m-%d")) - return suffix - end, - disable_frontmatter = true, - note_frontmatter_func = function(note) - local currentDate = os.date("%B %d, %Y") - -- local _, _, filename, parentPath = note.id:find("([^/]+)[^/]*$") - local _, _, parentPath = note.id:find(".*/(.*)/[^/]*$") - - parentPath = parentPath or "unsorted_notes" - note:add_alias(currentDate) - -- note:add_tag(filename) - note:add_tag(parentPath) - - local out = { id = os.date("%Y-%m-%d"), 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, - 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 = true, - finder = "telescope.nvim", - finder_mappings = {}, - sort_by = "modified", - sort_reversed = true, - open_notes_in = "current", - ui = { - tick = 0, - 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", - mappings = {}, - }) - end, - cmd = { - "ObsidianOpen", - "ObsidianNew", - "ObsidianQuickSwitch", - "ObsidianFollowLink", - "ObsidianBacklinks", - "ObsidianToday", - "ObsidianYesterday", - "ObsidianTomorrow", - "ObsidianTemplate", - "ObsidianSearch", - "ObsidianWorkspace", - "ObsidianPasteImg", - "ObsidianRename", - "ObsidianLink", - "ObsidianLinkNew", - }, - keys = { - { - mode = { "i", "n" }, - "gf", - function() - return require("obsidian").util.gf_passthrough() - end, - desc = "goto file", - noremap = false, - expr = true, - buffer = true, - }, - { - mode = "n", - "<leader>cb", - function() - return require("obsidian").util.toggle_checkbox() - end, - buffer = true, - desc = "Check Box", - }, - { - mode = "n", - "<leader>ono", - function() - local query = vim.fn.input("Enter query: ") - if query and #query > 0 then - vim.cmd("ObsidianOpen " .. query) - end - end, - desc = "Open Note", - }, - { - mode = "n", - "<leader>onn", - function() - local title = vim.fn.input("Enter title: ") - if title and #title > 0 then - vim.cmd("ObsidianNew " .. title) - end - end, - desc = "New Note", - }, - { - mode = "n", - "<leader>os", - "<cmd> ObsidianQuickSwitch <CR>", - desc = "Quick Switch", - }, - { - mode = "n", - "<leader>o]", - "<cmd> ObsidianFollowLink <CR>", - desc = "Follow Link", - }, - { - mode = "n", - "<leader>o[", - "<cmd> ObsidianBacklinks <CR>", - desc = "Back Link", - }, - { - mode = "n", - "<leader>ont", - function() - local offset = vim.fn.input("Enter offset: ") - if offset and #offset > 0 then - vim.cmd("ObsidianToday " .. offset) - else - vim.cmd("ObsidianToday") - end - end, - desc = "Today Note", - }, - { - mode = "n", - "<leader>onh", - "<cmd> ObsidianYesterday <cr>", - desc = "Yesterday Note", - }, - { - mode = "n", - "<leader>onl", - "<cmd> ObsidianTomorrow <cr>", - desc = "Tomorrow Note", - }, - { - mode = "n", - "<leader>oti", - "<cmd>ObsidianTemplate<cr>", - desc = "Insert Templates", - }, - { - mode = "n", - "<leader>onf", - function() - local note = vim.fn.input("Enter note: ") - if note and #note > 0 then - vim.cmd("ObsidianSearch " .. note) - end - end, - desc = "Search Note", - }, - { - mode = "n", - "<leader>ow", - function() - local name = vim.fn.input("Enter name: ") - if name and #name > 0 then - vim.cmd("ObsidianWorkspace " .. name) - end - end, - desc = "Workspace Name", - }, - { - mode = "n", - "<leader>opi", - function() - local image = vim.fn.input("Enter image: ") - if image and #image > 0 then - vim.cmd("ObsidianPasteImg " .. image) - end - end, - desc = "Paste Image", - }, - { - mode = "n", - "<leader>onr", - function() - local name = vim.fn.input("Enter name: ") - if name and #name > 0 then - vim.cmd("ObsidianRename " .. name) - end - end, - desc = "Rename Note", - }, - { - mode = "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, - desc = "Link Query", - }, - { - mode = "v", - "<leader>onl", - function() - local note = vim.fn.input("Enter note: ") - if note and #note > 0 then - vim.cmd("ObsidianLinkNew " .. note) - else - vim.cmd("ObsidianLinkNew") - end - end, - desc = "New Link Note", - }, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/oil.lua b/ar/.config/LazyVim/lua/plugins/oil.lua deleted file mode 100644 index ffbbfe9..0000000 --- a/ar/.config/LazyVim/lua/plugins/oil.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - "stevearc/oil.nvim", - opts = {}, - -- Optional dependencies - dependencies = { "nvim-tree/nvim-web-devicons" }, - cmd = { "Oil" }, - config = function() - require("oil").setup() - end, - keys = { - vim.keymap.set("n", "-", "<cmd>Oil<cr>", { desc = "Open parent directory" }), - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/playground.lua b/ar/.config/LazyVim/lua/plugins/playground.lua deleted file mode 100644 index e696828..0000000 --- a/ar/.config/LazyVim/lua/plugins/playground.lua +++ /dev/null @@ -1,38 +0,0 @@ -return { - "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, - keys = { - { mode = "n", "<leader>pg", "<cmd> TSPlaygroundToggle <cr>", desc = "Toggle Playground" }, - { mode = "n", "<leader>pc", "<cmd> TSHighlightCapturesUnderCurso <cr>", desc = "Highlight Captures" }, - { mode = "n", "<leader>pn", "<cmd> TSNodeUnderCursor <cr>", desc = "Node Under Cursor" }, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/project.lua b/ar/.config/LazyVim/lua/plugins/project.lua deleted file mode 100644 index 313c8f8..0000000 --- a/ar/.config/LazyVim/lua/plugins/project.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "ahmedkhalf/project.nvim", - keys = { - { "<leader>pr", "<Cmd>ProjectRoot<CR>", desc = "Project Root" }, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/refactoring.lua b/ar/.config/LazyVim/lua/plugins/refactoring.lua deleted file mode 100644 index a7bdf99..0000000 --- a/ar/.config/LazyVim/lua/plugins/refactoring.lua +++ /dev/null @@ -1,35 +0,0 @@ -return { - "ThePrimeagen/refactoring.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-treesitter/nvim-treesitter", - }, - config = function() - require("refactoring").setup() - end, - keys = { - vim.keymap.set("x", "<leader>re", function() - require("refactoring").refactor("Extract Function") - end, { desc = "Extract Function" }), - vim.keymap.set({ "x", "n" }, "<leader>rf", function() - require("refactoring").refactor("Extract Function To File") - end, { desc = "Extract Function To File" }), - -- Extract function supports only visual mode - vim.keymap.set("x", "<leader>rv", function() - require("refactoring").refactor("Extract Variable") - end, { desc = "Extract Variable" }), - -- Extract variable supports only visual mode - vim.keymap.set("n", "<leader>rI", function() - require("refactoring").refactor("Inline Function") - end, { desc = "Inline Function" }), - -- Inline func supports only normal - vim.keymap.set({ "n", "x" }, "<leader>ri", function() - require("refactoring").refactor("Inline Variable") - end, { desc = "Inline Variable" }), - -- Inline var supports both normal and visual mode - - vim.keymap.set("n", "<leader>rb", function() - require("refactoring").refactor("Extract Block") - end, { desc = "Extract Block" }), - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/seoul256.lua b/ar/.config/LazyVim/lua/plugins/seoul256.lua deleted file mode 100644 index ddbc87b..0000000 --- a/ar/.config/LazyVim/lua/plugins/seoul256.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "junegunn/seoul256.vim", -} diff --git a/ar/.config/LazyVim/lua/plugins/tagbar.lua b/ar/.config/LazyVim/lua/plugins/tagbar.lua deleted file mode 100644 index 3824cfd..0000000 --- a/ar/.config/LazyVim/lua/plugins/tagbar.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - "preservim/tagbar", - cmd = "TagbarToggle", - keys = { - { - mode = "n", - "<leader>tb", - "TagbarToggle", - desc = "Toggle Tagbar", - }, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/telescope.lua b/ar/.config/LazyVim/lua/plugins/telescope.lua deleted file mode 100644 index 0a96a09..0000000 --- a/ar/.config/LazyVim/lua/plugins/telescope.lua +++ /dev/null @@ -1,24 +0,0 @@ -return { - "nvim-telescope/telescope.nvim", - keys = { - { "<leader>/", false }, - { "<C-f>", false }, - { "<C-b>", false }, - }, - opts = function() - local actions = require("telescope.actions") - - return { - defaults = { - mappings = { - i = { - ["<C-j>"] = actions.preview_scrolling_down, - ["<C-k>"] = actions.preview_scrolling_up, - ["<C-h>"] = actions.preview_scrolling_left, - ["<C-l>"] = actions.preview_scrolling_right, - }, - }, - }, - } - end, -} diff --git a/ar/.config/LazyVim/lua/plugins/tmux-navigator.lua b/ar/.config/LazyVim/lua/plugins/tmux-navigator.lua deleted file mode 100644 index 7b37cf7..0000000 --- a/ar/.config/LazyVim/lua/plugins/tmux-navigator.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - { - "christoomey/vim-tmux-navigator", - cmd = { - "TmuxNavigateLeft", - "TmuxNavigateDown", - "TmuxNavigateUp", - "TmuxNavigateRight", - "TmuxNavigatePrevious", - }, - keys = { - { "<c-h>", "<cmd><C-U>TmuxNavigateLeft<cr>", desc = "Tmux Navigate Left" }, - { "<c-j>", "<cmd><C-U>TmuxNavigateDown<cr>", desc = "Tmux Navigate Down" }, - { "<c-k>", "<cmd><C-U>TmuxNavigateUp<cr>", desc = "Tmux Navigate Up" }, - { "<c-l>", "<cmd><C-U>TmuxNavigateRight<cr>", desc = "Tmux Navigate Right" }, - { "<c-\\>", "<cmd><C-U>TmuxNavigatePrevious<cr>", desc = "Tmux Navigate Previous" }, - }, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/tokyonight.lua b/ar/.config/LazyVim/lua/plugins/tokyonight.lua deleted file mode 100644 index 6dcb72f..0000000 --- a/ar/.config/LazyVim/lua/plugins/tokyonight.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - "folke/tokyonight.nvim", - opts = { - transparent = true, - styles = { - sidebars = "transparent", - floats = "transparent", - }, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/treesj.lua b/ar/.config/LazyVim/lua/plugins/treesj.lua deleted file mode 100644 index 9cfb3ff..0000000 --- a/ar/.config/LazyVim/lua/plugins/treesj.lua +++ /dev/null @@ -1,32 +0,0 @@ -return { - "Wansmer/treesj", - dependencies = { "nvim-treesitter/nvim-treesitter" }, - config = function() - require("treesj").setup({ - ---@type boolean Use default keymaps (<space>m - toggle, <space>j - join, <space>s - split) - use_default_keymaps = false, - ---@type boolean Node with syntax error will not be formatted - check_syntax_error = true, - ---If line after join will be longer than max value, - ---@type number If line after join will be longer than max value, node will not be formatted - max_join_length = 300, - ---Cursor behavior: - ---hold - cursor follows the node/place on which it was called - ---start - cursor jumps to the first symbol of the node being formatted - ---end - cursor jumps to the last symbol of the node being formatted - ---@type 'hold'|'start'|'end' - cursor_behavior = "hold", - ---@type boolean Notify about possible problems or not - notify = true, - ---@type boolean Use `dot` for repeat action - dot_repeat = true, - ---@type nil|function Callback for treesj error handler. func (err_text, level, ...other_text) - on_error = nil, - ---@type table Presets for languages - -- langs = {}, -- See the default presets in lua/treesj/langs - }) - end, - keys = { - { "<leader>j", "<cmd>TSJToggle<cr>", desc = "Toggle Treesj" }, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/vimwiki.lua b/ar/.config/LazyVim/lua/plugins/vimwiki.lua deleted file mode 100644 index 697ef70..0000000 --- a/ar/.config/LazyVim/lua/plugins/vimwiki.lua +++ /dev/null @@ -1,37 +0,0 @@ -return { - "vimwiki/vimwiki", - cmd = { "VimwikiIndex", "Vimwiki2HTML", "VimwikiAll2HTML" }, - keys = { - vim.api.nvim_set_keymap("n", "<leader>|", ":VimwikiSplitLink<CR>", { silent = true, desc = "Horizontal Split" }), - vim.api.nvim_set_keymap("n", "<leader>-", ":VimwikiVSplitLink<CR>", { silent = true, desc = "Vertical Split" }), - vim.api.nvim_set_keymap("n", "<leader>va", ":VimwikiAll2HTML<CR>", { silent = true, desc = "All Vimwiki to HTML" }), - vim.api.nvim_set_keymap( - "n", - "<leader>vc", - ":VimwikiColorize<CR>", - { silent = true, desc = "Colorize line or selection" } - ), - vim.api.nvim_set_keymap("n", "<leader>vd", ":VimwikiDeleteFile<CR>", { silent = true, desc = "Delete Wiki Page" }), - vim.api.nvim_set_keymap("n", "<leader>vh", ":Vimwiki2HTML<CR>", { silent = true, desc = "Vimwiki to HTML" }), - vim.api.nvim_set_keymap( - "n", - "<leader>vH", - ":Vimwiki2HTMLBrowse<CR>", - { silent = true, desc = "Convert current wiki to HTML" } - ), - vim.api.nvim_set_keymap("n", "<leader>vw", ":VimwikiIndex<CR>", { silent = true, desc = "Vimwiki Index" }), - vim.api.nvim_set_keymap( - "n", - "<leader>vn", - ":VimwikiGoto<CR>", - { silent = true, desc = "Goto or Create New Wiki Page" } - ), - vim.api.nvim_set_keymap("n", "<leader>vr", ":VimwikiRenameFile<CR>", { silent = true, desc = "Rename Wiki Page" }), - vim.api.nvim_set_keymap( - "n", - "<leader>vu", - ":VimwikiDiaryGenerateLinks<CR>", - { silent = true, desc = "Update Diary" } - ), - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/which-key.lua b/ar/.config/LazyVim/lua/plugins/which-key.lua deleted file mode 100644 index 94a6b3f..0000000 --- a/ar/.config/LazyVim/lua/plugins/which-key.lua +++ /dev/null @@ -1,55 +0,0 @@ -return { - "folke/which-key.nvim", - opts = { - plugins = { spelling = true }, - defaults = { - mode = { "n", "v" }, - ["g"] = { name = "+goto" }, - ["gz"] = { name = "+surround" }, - ["z"] = { name = "+fold" }, - ["]"] = { name = "+next" }, - ["["] = { name = "+prev" }, - ["="] = { name = "+line paste" }, - ["\\"] = { name = "+local leader" }, - ["<leader>"] = { name = "+leader" }, - ["<leader><"] = { name = "+B/A paste & L/R indent" }, - ["<leader>="] = { name = "+paste & B/A filtter" }, - ["<leader>>"] = { name = "+B/A paste & L/R indent" }, - ["<leader>["] = { name = "+indent B/A cursor" }, - ["<leader>]"] = { name = "+indent B/A cursor" }, - ["<leader><tab>"] = { name = "+tabs" }, - ["<leader>b"] = { name = "+buffer" }, - ["<leader>c"] = { name = "+code" }, - ["<leader>cp"] = { name = "+copy" }, - ["<leader>dd"] = { name = "+db" }, - ["<leader>dP"] = { name = "+class/method" }, - ["<leader>f"] = { name = "+file/find" }, - ["<leader>h"] = { name = "+harpoon" }, - ["<leader>g"] = { name = "+git" }, - ["<leader>gh"] = { name = "+hunks" }, - ["<leader>gz"] = { name = "+surround" }, - ["<leader>m"] = { name = "+mason" }, - ["<leader>n"] = { name = "+annotation" }, - ["<leader>o"] = { name = "+obsidian" }, - ["<leader>on"] = { name = "+note" }, - ["<leader>op"] = { name = "+paste" }, - ["<leader>ot"] = { name = "+template" }, - ["<leader>p"] = { name = "+playground" }, - ["<leader>q"] = { name = "+quit/session" }, - ["<leader>r"] = { name = "+refactoring" }, - ["<leader>s"] = { name = "+search" }, - ["<leader>u"] = { name = "+ui" }, - ["<leader>w"] = { name = "+windows/which-key" }, - ["<leader>x"] = { name = "+trouble/quickfix" }, - }, - }, - keys = { - vim.keymap.set("n", "<leader>wK", function() - vim.cmd("WhichKey") - end, { desc = "Which-key All Key" }), - vim.keymap.set("n", "<leader>wk", function() - local input = vim.fn.input("WhichKey: ") - vim.cmd("WhichKey " .. input) - end, { desc = "Which-key Query Lookup" }), - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/yanky.lua b/ar/.config/LazyVim/lua/plugins/yanky.lua deleted file mode 100644 index fb8ac2d..0000000 --- a/ar/.config/LazyVim/lua/plugins/yanky.lua +++ /dev/null @@ -1,31 +0,0 @@ -return { - { - "gbprod/yanky.nvim", - dependencies = not jit.os:find("Windows") and { "kkharji/sqlite.lua" } or {}, - opts = { - highlight = { timer = 250 }, - ring = { storage = jit.os:find("Windows") and "shada" or "sqlite" }, - }, - keys = { - -- stylua: ignore - { "<leader>h", function() require("telescope").extensions.yank_history.yank_history({ }) end, desc = "Open Yank History" }, - { "<leader>y", "<Plug>(YankyYank)", mode = { "n", "x" }, desc = "Yank text" }, - { "<leader>p", "<Plug>(YankyPutAfter)", mode = { "n", "x" }, desc = "Put yanked text after cursor" }, - { "<leader>P", "<Plug>(YankyPutBefore)", mode = { "n", "x" }, desc = "Put yanked text before cursor" }, - { "<leader>gp", "<Plug>(YankyGPutAfter)", mode = { "n", "x" }, desc = "Put yanked text after selection" }, - { "<leader>gP", "<Plug>(YankyGPutBefore)", mode = { "n", "x" }, desc = "Put yanked text before selection" }, - { "<leader>[y", "<Plug>(YankyCycleForward)", desc = "Cycle forward through yank history" }, - { "<leader>]y", "<Plug>(YankyCycleBackward)", desc = "Cycle backward through yank history" }, - { "<leader>]p", "<Plug>(YankyPutIndentAfterLinewise)", desc = "Put indented after cursor (linewise)" }, - { "<leader>[p", "<Plug>(YankyPutIndentBeforeLinewise)", desc = "Put indented before cursor (linewise)" }, - { "<leader>]P", "<Plug>(YankyPutIndentAfterLinewise)", desc = "Put indented after cursor (linewise)" }, - { "<leader>[P", "<Plug>(YankyPutIndentBeforeLinewise)", desc = "Put indented before cursor (linewise)" }, - { "<leader>>p", "<Plug>(YankyPutIndentAfterShiftRight)", desc = "Put and indent right" }, - { "<leader><p", "<Plug>(YankyPutIndentAfterShiftLeft)", desc = "Put and indent left" }, - { "<leader>>P", "<Plug>(YankyPutIndentBeforeShiftRight)", desc = "Put before and indent right" }, - { "<leader><P", "<Plug>(YankyPutIndentBeforeShiftLeft)", desc = "Put before and indent left" }, - { "<leader>=p", "<Plug>(YankyPutAfterFilter)", desc = "Put after applying a filter" }, - { "<leader>=P", "<Plug>(YankyPutBeforeFilter)", desc = "Put before applying a filter" }, - }, - }, -} diff --git a/ar/.config/LazyVim/lua/plugins/zen-mode.lua b/ar/.config/LazyVim/lua/plugins/zen-mode.lua deleted file mode 100644 index 823aa94..0000000 --- a/ar/.config/LazyVim/lua/plugins/zen-mode.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - "folke/zen-mode.nvim", - opts = { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - }, - keys = { - { "<leader><cr>", "<cmd>ZenMode<cr>", desc = "Zen mode" }, - }, -} diff --git a/ar/.config/LazyVim/vscode/easymotion-config.vim b/ar/.config/LazyVim/vscode/easymotion-config.vim deleted file mode 100644 index 89c1f90..0000000 --- a/ar/.config/LazyVim/vscode/easymotion-config.vim +++ /dev/null @@ -1,2 +0,0 @@ -let g:EasyMotion_smartcase = 1 -nmap f <Plug>(easymotion-bd-f) diff --git a/ar/.config/LazyVim/vscode/plugins.lua b/ar/.config/LazyVim/vscode/plugins.lua deleted file mode 100644 index 920d80f..0000000 --- a/ar/.config/LazyVim/vscode/plugins.lua +++ /dev/null @@ -1,153 +0,0 @@ --- plugins.lua - -return { - - -- Alpha (Dashboard) - { - "goolord/alpha-nvim", - lazy = true, - }, - - -- Auto Pairs - { - "windwp/nvim-autopairs", - }, - - -- Bufferline - { - "akinsho/bufferline.nvim", - dependencies = { - "nvim-tree/nvim-web-devicons", - }, - }, - - -- Colorscheme - { - "folke/tokyonight.nvim", - }, - - -- Comments - { - "numToStr/Comment.nvim", - config = function() - require("Comment").setup() - end, - }, - - -- Easymotion (VScode) - { - "ChristianChiarulli/vscode-easymotion", - }, - - -- Git Integration - { - "lewis6991/gitsigns.nvim", - }, - - -- Hop (Better Navigation) - { - "phaazon/hop.nvim", - lazy = true, - }, - - -- Indentation Highlighting - { - "lukas-reineke/indent-blankline.nvim", - }, - - -- Rainbow Highlighting - { - "HiPhish/nvim-ts-rainbow2", - }, - - -- Lualine - { - "nvim-lualine/lualine.nvim", - dependencies = { - "nvim-tree/nvim-web-devicons", - }, - }, - - -- Language Support - { - "VonHeikemen/lsp-zero.nvim", - lazy = true, - branch = "v1.x", - dependencies = { - -- LSP Support - { "neovim/nvim-lspconfig" }, -- Required - { "williamboman/mason.nvim" }, -- Optional - { "williamboman/mason-lspconfig.nvim" }, -- Optional - - -- Autocompletion - { "hrsh7th/nvim-cmp" }, -- Required - { "hrsh7th/cmp-nvim-lsp" }, -- Required - { "hrsh7th/cmp-buffer" }, -- Optional - { "hrsh7th/cmp-path" }, -- Optional - { "saadparwaiz1/cmp_luasnip" }, -- Optional - { "hrsh7th/cmp-nvim-lua" }, -- Optional - - -- Snippets - { "L3MON4D3/LuaSnip" }, -- Required - { "rafamadriz/friendly-snippets" }, -- Optional - }, - }, - - -- Nvim-tree (File Explorer) - { - "nvim-tree/nvim-tree.lua", - lazy = true, - dependencies = { - "nvim-tree/nvim-web-devicons", - }, - }, - - -- Nvim-Surround (Manipulating Surroundings) - { - "kylechui/nvim-surround", - config = function() - require("nvim-surround").setup { - -- Configuration here, or leave empty to use defaults - } - end, - }, - - -- -- Quick-Scope - -- { - -- "unblevable/quick-scope", - -- }, - - -- Telescope (Fuzzy Finder) - { - "nvim-telescope/telescope.nvim", - lazy = true, - dependencies = { - { "nvim-lua/plenary.nvim" }, - }, - }, - - -- Treesitter - { - "nvim-treesitter/nvim-treesitter", - }, - - -- Toggle Term - { - "akinsho/toggleterm.nvim", - config = true, - }, - - -- Undo-Tree - { - "jiaoshijie/undotree", - dependencies = { - "nvim-lua/plenary.nvim", - }, - }, - - -- Which-key - { - "folke/which-key.nvim", - lazy = true, - }, -} diff --git a/ar/.config/LazyVim/vscode/remap.lua b/ar/.config/LazyVim/vscode/remap.lua deleted file mode 100644 index e0b47c4..0000000 --- a/ar/.config/LazyVim/vscode/remap.lua +++ /dev/null @@ -1,32 +0,0 @@ -vim.keymap.set("n", "<leader>pv", vim.cmd.Ex) - -vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv") -vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv") - -vim.keymap.set("n", "J", "mzJ`z") -vim.keymap.set("n", "<C-d>", "<C-d>zz") -vim.keymap.set("n", "<C-u>", "<C-u>zz") -vim.keymap.set("n", "n", "nzzzv") -vim.keymap.set("n", "N", "Nzzzv") - --- greatest remap ever -vim.keymap.set("x", "<leader>p", [["_dP]]) - --- next greatest remap ever : asbjornHaland -vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]]) -vim.keymap.set("n", "<leader>Y", [["+Y]]) - -vim.keymap.set({ "n", "v" }, "<leader>d", [["_d]]) - --- This is going to get me cancelled -vim.keymap.set("i", "jk", "<Esc>") - -vim.keymap.set("n", "Q", "<nop>") - -vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz") -vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz") -vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz") -vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz") - -vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]]) -vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true }) diff --git a/ar/.config/LazyVim/vscode/settings.vim b/ar/.config/LazyVim/vscode/settings.vim deleted file mode 100644 index c48a73c..0000000 --- a/ar/.config/LazyVim/vscode/settings.vim +++ /dev/null @@ -1,49 +0,0 @@ -function! s:closeOtherEditors() - call VSCodeNotify('workbench.action.closeEditorsInOtherGroups') - call VSCodeNotify('workbench.action.closeOtherEditors') -endfunction - -function! s:manageEditorSize(...) - let count = a:1 - let to = a:2 - for i in range(1, count ? count : 1) - call VSCodeNotify(to == 'increase' ? 'workbench.action.increaseViewSize' : 'workbench.action.decreaseViewSize') - endfor -endfunction - -command! -bang Only if <q-bang> == '!' | call <SID>closeOtherEditors() | else | call VSCodeNotify('workbench.action.joinAllGroups') | endif - -nnoremap <silent> <C-a>= :<C-u>call VSCodeNotify('workbench.action.evenEditorWidths')<CR> -xnoremap <silent> <C-a>= :<C-u>call VSCodeNotify('workbench.action.evenEditorWidths')<CR> -nnoremap <silent> <C-x>_ :<C-u>call VSCodeNotify('workbench.action.toggleEditorWidths')<CR> -xnoremap <silent> <C-x>_ :<C-u>call VSCodeNotify('workbench.action.toggleEditorWidths')<CR> - -" nnoremap <silent> <C-w>> :<C-u>call <SID>manageEditorSize(v:count, 'increase')<CR> -" xnoremap <silent> <C-w>> :<C-u>call <SID>manageEditorSize(v:count, 'increase')<CR> -" nnoremap <silent> <C-w>+ :<C-u>call <SID>manageEditorSize(v:count, 'increase')<CR> -" xnoremap <silent> <C-w>+ :<C-u>call <SID>manageEditorSize(v:count, 'increase')<CR> -" nnoremap <silent> <C-w>< :<C-u>call <SID>manageEditorSize(v:count, 'decrease')<CR> -" xnoremap <silent> <C-w>< :<C-u>call <SID>manageEditorSize(v:count, 'decrease')<CR> -" nnoremap <silent> <C-w>- :<C-u>call <SID>manageEditorSize(v:count, 'decrease')<CR> -" xnoremap <silent> <C-w>- :<C-u>call <SID>manageEditorSize(v:count, 'decrease')<CR> - -" Better Navigation -nnoremap <silent> <C-j> :call VSCodeNotify('workbench.action.navigateDown')<CR> -xnoremap <silent> <C-j> :call VSCodeNotify('workbench.action.navigateDown')<CR> -nnoremap <silent> <C-k> :call VSCodeNotify('workbench.action.navigateUp')<CR> -xnoremap <silent> <C-k> :call VSCodeNotify('workbench.action.navigateUp')<CR> -nnoremap <silent> <C-h> :call VSCodeNotify('workbench.action.navigateLeft')<CR> -xnoremap <silent> <C-h> :call VSCodeNotify('workbench.action.navigateLeft')<CR> -nnoremap <silent> <C-l> :call VSCodeNotify('workbench.action.navigateRight')<CR> -xnoremap <silent> <C-l> :call VSCodeNotify('workbench.action.navigateRight')<CR> - -" Bind C-/ to vscode commentary since calling from vscode produces double comments due to multiple cursors -xnoremap <silent> <C-/> :call Comment()<CR> -nnoremap <silent> <C-/> :call Comment()<CR> - -nnoremap <silent> <C-w>_ :<C-u>call VSCodeNotify('workbench.action.toggleEditorWidths')<CR> - -nnoremap <silent> <Space> :call VSCodeNotify('whichkey.show')<CR> -xnoremap <silent> <Space> :call VSCodeNotify('whichkey.show')<CR> - -" nnoremap <silent> <C-n> :call VSCodeNotify('workbench.view.explorer')<CR>
\ No newline at end of file diff --git a/ar/.config/LunarVim b/ar/.config/LunarVim new file mode 160000 +Subproject aa51c20f3404cb482e9c6fd6e5e4a4bf5b1612a diff --git a/ar/.config/NvChad/.ignore b/ar/.config/NvChad/.ignore deleted file mode 100644 index 42677fb..0000000 --- a/ar/.config/NvChad/.ignore +++ /dev/null @@ -1 +0,0 @@ -!/lua/custom/ diff --git a/ar/.config/NvChad/LICENSE b/ar/.config/NvChad/LICENSE index f288702..fdddb29 100644 --- a/ar/.config/NvChad/LICENSE +++ b/ar/.config/NvChad/LICENSE @@ -1,674 +1,24 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<https://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<https://www.gnu.org/licenses/why-not-lgpl.html>. +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to <https://unlicense.org> diff --git a/ar/.config/NvChad/README.md b/ar/.config/NvChad/README.md new file mode 100644 index 0000000..769fbdf --- /dev/null +++ b/ar/.config/NvChad/README.md @@ -0,0 +1,9 @@ +**This repo is supposed to be used as config by NvChad users!** + +- The main nvchad repo (NvChad/NvChad) is used as a plugin by this repo. +- So you just import its modules , like `require "nvchad.options" , require "nvchad.mappings"` +- So you can delete the .git from this repo ( when you clone it locally ) or fork it :) + +# Credits + +1) Lazyvim starter https://github.com/LazyVim/starter as nvchad's starter was inspired by Lazyvim's . It made a lot of things easier! diff --git a/ar/.config/NvChad/db_ui/connections.json b/ar/.config/NvChad/db_ui/connections.json deleted file mode 100644 index b9034fe..0000000 --- a/ar/.config/NvChad/db_ui/connections.json +++ /dev/null @@ -1 +0,0 @@ -[{"url": "mysql://si@localhost:3306/si", "name": "si"}] diff --git a/ar/.config/NvChad/db_ui/si/safTEST b/ar/.config/NvChad/db_ui/si/safTEST deleted file mode 100644 index 8370f6c..0000000 --- a/ar/.config/NvChad/db_ui/si/safTEST +++ /dev/null @@ -1 +0,0 @@ -SELECT * FROM test; diff --git a/ar/.config/NvChad/init.lua b/ar/.config/NvChad/init.lua index 21f0b6f..494360c 100644 --- a/ar/.config/NvChad/init.lua +++ b/ar/.config/NvChad/init.lua @@ -1,21 +1,37 @@ -require "core" +vim.g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/" +vim.g.mapleader = " " -local custom_init_path = vim.api.nvim_get_runtime_file("lua/custom/init.lua", false)[1] +-- bootstrap lazy and all plugins +local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" -if custom_init_path then - dofile(custom_init_path) +if not vim.uv.fs_stat(lazypath) then + local repo = "https://github.com/folke/lazy.nvim.git" + vim.fn.system { "git", "clone", "--filter=blob:none", repo, "--branch=stable", lazypath } end -require("core.utils").load_mappings() +vim.opt.rtp:prepend(lazypath) -local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" +local lazy_config = require "configs.lazy" --- bootstrap lazy.nvim! -if not vim.loop.fs_stat(lazypath) then - require("core.bootstrap").gen_chadrc_template() - require("core.bootstrap").lazy(lazypath) -end +-- load plugins +require("lazy").setup({ + { + "NvChad/NvChad", + lazy = false, + branch = "v2.5", + import = "nvchad.plugins", + }, + { import = "plugins" }, +}, lazy_config) + +-- load theme dofile(vim.g.base46_cache .. "defaults") -vim.opt.rtp:prepend(lazypath) -require "plugins" +dofile(vim.g.base46_cache .. "statusline") + +require "options" +require "autocmds" + +vim.schedule(function() + require "mappings" +end) 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) diff --git a/ar/.config/NvChad/vscode/easymotion-config.vim b/ar/.config/NvChad/vscode/easymotion-config.vim deleted file mode 100644 index 89c1f90..0000000 --- a/ar/.config/NvChad/vscode/easymotion-config.vim +++ /dev/null @@ -1,2 +0,0 @@ -let g:EasyMotion_smartcase = 1 -nmap f <Plug>(easymotion-bd-f) diff --git a/ar/.config/NvChad/vscode/plugins.lua b/ar/.config/NvChad/vscode/plugins.lua deleted file mode 100644 index 920d80f..0000000 --- a/ar/.config/NvChad/vscode/plugins.lua +++ /dev/null @@ -1,153 +0,0 @@ --- plugins.lua - -return { - - -- Alpha (Dashboard) - { - "goolord/alpha-nvim", - lazy = true, - }, - - -- Auto Pairs - { - "windwp/nvim-autopairs", - }, - - -- Bufferline - { - "akinsho/bufferline.nvim", - dependencies = { - "nvim-tree/nvim-web-devicons", - }, - }, - - -- Colorscheme - { - "folke/tokyonight.nvim", - }, - - -- Comments - { - "numToStr/Comment.nvim", - config = function() - require("Comment").setup() - end, - }, - - -- Easymotion (VScode) - { - "ChristianChiarulli/vscode-easymotion", - }, - - -- Git Integration - { - "lewis6991/gitsigns.nvim", - }, - - -- Hop (Better Navigation) - { - "phaazon/hop.nvim", - lazy = true, - }, - - -- Indentation Highlighting - { - "lukas-reineke/indent-blankline.nvim", - }, - - -- Rainbow Highlighting - { - "HiPhish/nvim-ts-rainbow2", - }, - - -- Lualine - { - "nvim-lualine/lualine.nvim", - dependencies = { - "nvim-tree/nvim-web-devicons", - }, - }, - - -- Language Support - { - "VonHeikemen/lsp-zero.nvim", - lazy = true, - branch = "v1.x", - dependencies = { - -- LSP Support - { "neovim/nvim-lspconfig" }, -- Required - { "williamboman/mason.nvim" }, -- Optional - { "williamboman/mason-lspconfig.nvim" }, -- Optional - - -- Autocompletion - { "hrsh7th/nvim-cmp" }, -- Required - { "hrsh7th/cmp-nvim-lsp" }, -- Required - { "hrsh7th/cmp-buffer" }, -- Optional - { "hrsh7th/cmp-path" }, -- Optional - { "saadparwaiz1/cmp_luasnip" }, -- Optional - { "hrsh7th/cmp-nvim-lua" }, -- Optional - - -- Snippets - { "L3MON4D3/LuaSnip" }, -- Required - { "rafamadriz/friendly-snippets" }, -- Optional - }, - }, - - -- Nvim-tree (File Explorer) - { - "nvim-tree/nvim-tree.lua", - lazy = true, - dependencies = { - "nvim-tree/nvim-web-devicons", - }, - }, - - -- Nvim-Surround (Manipulating Surroundings) - { - "kylechui/nvim-surround", - config = function() - require("nvim-surround").setup { - -- Configuration here, or leave empty to use defaults - } - end, - }, - - -- -- Quick-Scope - -- { - -- "unblevable/quick-scope", - -- }, - - -- Telescope (Fuzzy Finder) - { - "nvim-telescope/telescope.nvim", - lazy = true, - dependencies = { - { "nvim-lua/plenary.nvim" }, - }, - }, - - -- Treesitter - { - "nvim-treesitter/nvim-treesitter", - }, - - -- Toggle Term - { - "akinsho/toggleterm.nvim", - config = true, - }, - - -- Undo-Tree - { - "jiaoshijie/undotree", - dependencies = { - "nvim-lua/plenary.nvim", - }, - }, - - -- Which-key - { - "folke/which-key.nvim", - lazy = true, - }, -} diff --git a/ar/.config/NvChad/vscode/remap.lua b/ar/.config/NvChad/vscode/remap.lua deleted file mode 100644 index e0b47c4..0000000 --- a/ar/.config/NvChad/vscode/remap.lua +++ /dev/null @@ -1,32 +0,0 @@ -vim.keymap.set("n", "<leader>pv", vim.cmd.Ex) - -vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv") -vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv") - -vim.keymap.set("n", "J", "mzJ`z") -vim.keymap.set("n", "<C-d>", "<C-d>zz") -vim.keymap.set("n", "<C-u>", "<C-u>zz") -vim.keymap.set("n", "n", "nzzzv") -vim.keymap.set("n", "N", "Nzzzv") - --- greatest remap ever -vim.keymap.set("x", "<leader>p", [["_dP]]) - --- next greatest remap ever : asbjornHaland -vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]]) -vim.keymap.set("n", "<leader>Y", [["+Y]]) - -vim.keymap.set({ "n", "v" }, "<leader>d", [["_d]]) - --- This is going to get me cancelled -vim.keymap.set("i", "jk", "<Esc>") - -vim.keymap.set("n", "Q", "<nop>") - -vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz") -vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz") -vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz") -vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz") - -vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]]) -vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true }) diff --git a/ar/.config/NvChad/vscode/settings.vim b/ar/.config/NvChad/vscode/settings.vim deleted file mode 100644 index c48a73c..0000000 --- a/ar/.config/NvChad/vscode/settings.vim +++ /dev/null @@ -1,49 +0,0 @@ -function! s:closeOtherEditors() - call VSCodeNotify('workbench.action.closeEditorsInOtherGroups') - call VSCodeNotify('workbench.action.closeOtherEditors') -endfunction - -function! s:manageEditorSize(...) - let count = a:1 - let to = a:2 - for i in range(1, count ? count : 1) - call VSCodeNotify(to == 'increase' ? 'workbench.action.increaseViewSize' : 'workbench.action.decreaseViewSize') - endfor -endfunction - -command! -bang Only if <q-bang> == '!' | call <SID>closeOtherEditors() | else | call VSCodeNotify('workbench.action.joinAllGroups') | endif - -nnoremap <silent> <C-a>= :<C-u>call VSCodeNotify('workbench.action.evenEditorWidths')<CR> -xnoremap <silent> <C-a>= :<C-u>call VSCodeNotify('workbench.action.evenEditorWidths')<CR> -nnoremap <silent> <C-x>_ :<C-u>call VSCodeNotify('workbench.action.toggleEditorWidths')<CR> -xnoremap <silent> <C-x>_ :<C-u>call VSCodeNotify('workbench.action.toggleEditorWidths')<CR> - -" nnoremap <silent> <C-w>> :<C-u>call <SID>manageEditorSize(v:count, 'increase')<CR> -" xnoremap <silent> <C-w>> :<C-u>call <SID>manageEditorSize(v:count, 'increase')<CR> -" nnoremap <silent> <C-w>+ :<C-u>call <SID>manageEditorSize(v:count, 'increase')<CR> -" xnoremap <silent> <C-w>+ :<C-u>call <SID>manageEditorSize(v:count, 'increase')<CR> -" nnoremap <silent> <C-w>< :<C-u>call <SID>manageEditorSize(v:count, 'decrease')<CR> -" xnoremap <silent> <C-w>< :<C-u>call <SID>manageEditorSize(v:count, 'decrease')<CR> -" nnoremap <silent> <C-w>- :<C-u>call <SID>manageEditorSize(v:count, 'decrease')<CR> -" xnoremap <silent> <C-w>- :<C-u>call <SID>manageEditorSize(v:count, 'decrease')<CR> - -" Better Navigation -nnoremap <silent> <C-j> :call VSCodeNotify('workbench.action.navigateDown')<CR> -xnoremap <silent> <C-j> :call VSCodeNotify('workbench.action.navigateDown')<CR> -nnoremap <silent> <C-k> :call VSCodeNotify('workbench.action.navigateUp')<CR> -xnoremap <silent> <C-k> :call VSCodeNotify('workbench.action.navigateUp')<CR> -nnoremap <silent> <C-h> :call VSCodeNotify('workbench.action.navigateLeft')<CR> -xnoremap <silent> <C-h> :call VSCodeNotify('workbench.action.navigateLeft')<CR> -nnoremap <silent> <C-l> :call VSCodeNotify('workbench.action.navigateRight')<CR> -xnoremap <silent> <C-l> :call VSCodeNotify('workbench.action.navigateRight')<CR> - -" Bind C-/ to vscode commentary since calling from vscode produces double comments due to multiple cursors -xnoremap <silent> <C-/> :call Comment()<CR> -nnoremap <silent> <C-/> :call Comment()<CR> - -nnoremap <silent> <C-w>_ :<C-u>call VSCodeNotify('workbench.action.toggleEditorWidths')<CR> - -nnoremap <silent> <Space> :call VSCodeNotify('whichkey.show')<CR> -xnoremap <silent> <Space> :call VSCodeNotify('whichkey.show')<CR> - -" nnoremap <silent> <C-n> :call VSCodeNotify('workbench.view.explorer')<CR>
\ No newline at end of file diff --git a/ar/.config/crons b/ar/.config/crons index 0343236..f6ab876 100644 --- a/ar/.config/crons +++ b/ar/.config/crons @@ -1,10 +1,6 @@ */3 * * * * export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u $USER)/bus; export DISPLAY=:0; . $HOME/.zprofile; /usr/local/bin/mailsync */15 * * * * export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u $USER)/bus; export DISPLAY=:0; . $HOME/.zprofile; $HOME/.local/bin/cron/newsup 0 */3 * * * export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u $USER)/bus; export DISPLAY=:0; . $HOME/.zprofile; $HOME/.local/bin/cron/checkup -0 * * * * export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u $USER)/bus; export DISPLAY=:0; . $HOME/.zprofile; NVIM_APPNAME=LazyVim nvim --headless "+Lazy! sync" +qa -0 * * * * export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u $USER)/bus; export DISPLAY=:0; . $HOME/.zprofile; NVIM_APPNAME=LazyVim nvim --headless "+MasonUpdate" +qa -0 0 * * * export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u $USER)/bus; export DISPLAY=:0; . $HOME/.zprofile; NVIM_APPNAME=NvChad nvim --headless "+Lazy! sync" +qa -0 0 * * * export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u $USER)/bus; export DISPLAY=:0; . $HOME/.zprofile; NVIM_APPNAME=NvChad nvim --headless "+MasonUpdate" +qa 0 0 * * * export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u $USER)/bus; export DISPLAY=:0; . $HOME/.zprofile; NVIM_APPNAME=TheSiahxyz nvim --headless "+Lazy! sync" +qa 0 0 * * * export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u $USER)/bus; export DISPLAY=:0; . $HOME/.zprofile; NVIM_APPNAME=TheSiahxyz nvim --headless "+MasonUpdate" +qa 0 * * * * export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u $USER)/bus; export DISPLAY=:0; . $HOME/.zprofile; /usr/bin/nvim --headless "+Lazy! sync" +qa diff --git a/ar/.config/kickstart b/ar/.config/kickstart new file mode 160000 +Subproject 3338d3920620861f8313a2745fd5d2be39f3953 diff --git a/ar/.config/shell/aliasrc b/ar/.config/shell/aliasrc index cabfc2a..13ae888 100644 --- a/ar/.config/shell/aliasrc +++ b/ar/.config/shell/aliasrc @@ -283,6 +283,8 @@ alias ve='$EDITOR -c enew' alias nv.='nvim .' alias nve='nvim -c enew' alias nts='NVIM_APPNAME=TheSiahxyz nvim' +alias nav='NVIM_APPNAME=AstroNvim nvim' +alias nlu='NVIM_APPNAME=LunarVim nvim' alias nlv='NVIM_APPNAME=LazyVim nvim' alias nnc='NVIM_APPNAME=NvChad nvim' alias snv='sudo nvim' diff --git a/ar/.config/zsh/scripts.zsh b/ar/.config/zsh/scripts.zsh index 015a845..7f31426 100644 --- a/ar/.config/zsh/scripts.zsh +++ b/ar/.config/zsh/scripts.zsh @@ -543,7 +543,7 @@ function change_nvim_config_dir() { local target_cache="${XDG_CACHE_HOME:-$HOME/.cache}/nvim" # Neovim"s cache directory # Explicitly list your configuration options - local configs=("Default" "TheSiahxyz" "NvChad" "LazyVim") + local configs=("Default" "TheSiahxyz" "AstroNvim" "LazyVim" "LunarVim" "NvChad") local selected_dir=$(printf "%s\n" "${configs[@]}" | fzf --cycle --prompt=" Neovim Config " --height 50% --layout=reverse --border --exit-0) # Check if a configuration was selected @@ -551,6 +551,7 @@ function change_nvim_config_dir() { # Default configuration if [[ $selected_dir == "Default" ]]; then + selected_dir="kickstart" echo "Clearing the Neovim configuration directory..." rm -rf "$target_dir" "$target_share" "$target_state" "$target_cache" &>/dev/null echo "Switched to the base Neovim configuration." @@ -583,17 +584,18 @@ function change_nvim_config_dir() { return 3 fi - if [ "$whereami" = "artix" ]; then + if [ "$whereami" = "ar" ]; then chown -R "$USER:wheel" "/home/$USER/.config/nvim" fi } # run nvim with target config -alias vtc=nvim_target_config +alias vnf=nvim_target_config function nvim_target_config() { - items=("Default" "TheSiahxyz" "LazyVim" "NvChad") + items=("Default" "TheSiahxyz" "AstroNvim" "LazyVim" "LunarVim" "NvChad") config=$(printf "%s\n" "${items[@]}" | fzf --cycle --prompt=" Neovim Config " --height=~50% --layout=reverse --border --exit-0) [[ -z $config ]] && return 0 + [[ $config == "Default" ]] && config="kickstart" NVIM_APPNAME=$config nvim $@ } |