From 2e6e6d04b2c24a0666b015ef4f73718e2fe7c861 Mon Sep 17 00:00:00 2001 From: dacctal Date: Sun, 19 Apr 2026 15:58:03 +0000 Subject: added vis and nvim-12+ configs --- .config/nvim-lazy/init.lua | 4 + .config/nvim-lazy/lazy-lock.json | 31 ++ .config/nvim-lazy/lua/caelus/init.lua | 100 +++++++ .config/nvim-lazy/lua/config/keymaps.lua | 13 + .config/nvim-lazy/lua/config/lazy.lua | 35 +++ .config/nvim-lazy/lua/config/options.lua | 40 +++ .config/nvim-lazy/lua/plugins/auto-pairs.lua | 24 ++ .config/nvim-lazy/lua/plugins/blink.lua | 53 ++++ .config/nvim-lazy/lua/plugins/colorizer.lua | 6 + .config/nvim-lazy/lua/plugins/eslint.lua | 41 +++ .config/nvim-lazy/lua/plugins/everpuccin.lua.bkp | 330 +++++++++++++++++++++ .config/nvim-lazy/lua/plugins/harpoon.lua | 26 ++ .config/nvim-lazy/lua/plugins/highlight-colors.lua | 8 + .config/nvim-lazy/lua/plugins/lspconfig.lua | 35 +++ .config/nvim-lazy/lua/plugins/lualine.lua | 12 + .config/nvim-lazy/lua/plugins/markdown.lua | 9 + .config/nvim-lazy/lua/plugins/mason-lspconfig.lua | 8 + .config/nvim-lazy/lua/plugins/mason.lua | 13 + .config/nvim-lazy/lua/plugins/nim.lua | 3 + .config/nvim-lazy/lua/plugins/oil.lua | 20 ++ .config/nvim-lazy/lua/plugins/orgmode.lua | 17 ++ .config/nvim-lazy/lua/plugins/telescope.lua | 25 ++ .config/nvim-lazy/lua/plugins/treesitter.lua | 15 + .config/nvim-lazy/lua/plugins/trouble.lua | 37 +++ .config/nvim-lazy/lua/plugins/undotree.lua | 8 + .config/nvim-lazy/lua/plugins/vlang.lua | 7 + .config/nvim-raw/init.lua | 4 + .config/nvim-raw/lua/caelus/init.lua | 100 +++++++ .config/nvim-raw/lua/config/keymaps.lua | 13 + .config/nvim-raw/lua/config/options.lua | 40 +++ .config/nvim-raw/lua/config/plugins.lua | 97 ++++++ .config/nvim-raw/nvim-pack-lock.json | 116 ++++++++ .config/nvim/init.lua | 4 - .config/nvim/lazy-lock.json | 31 -- .config/nvim/lua/caelus/init.lua | 100 ------- .config/nvim/lua/config/keymaps.lua | 13 - .config/nvim/lua/config/lazy.lua | 35 --- .config/nvim/lua/config/options.lua | 40 --- .config/nvim/lua/plugins/auto-pairs.lua | 24 -- .config/nvim/lua/plugins/blink.lua | 53 ---- .config/nvim/lua/plugins/colorizer.lua | 6 - .config/nvim/lua/plugins/eslint.lua | 41 --- .config/nvim/lua/plugins/everpuccin.lua.bkp | 330 --------------------- .config/nvim/lua/plugins/harpoon.lua | 26 -- .config/nvim/lua/plugins/highlight-colors.lua | 8 - .config/nvim/lua/plugins/lspconfig.lua | 35 --- .config/nvim/lua/plugins/lualine.lua | 12 - .config/nvim/lua/plugins/markdown.lua | 9 - .config/nvim/lua/plugins/mason-lspconfig.lua | 8 - .config/nvim/lua/plugins/mason.lua | 13 - .config/nvim/lua/plugins/nim.lua | 3 - .config/nvim/lua/plugins/oil.lua | 20 -- .config/nvim/lua/plugins/orgmode.lua | 17 -- .config/nvim/lua/plugins/telescope.lua | 25 -- .config/nvim/lua/plugins/treesitter.lua | 15 - .config/nvim/lua/plugins/trouble.lua | 37 --- .config/nvim/lua/plugins/undotree.lua | 8 - .config/nvim/lua/plugins/vlang.lua | 7 - .config/vis/plugins/complete-filename/init.lua | 68 +++++ .config/vis/plugins/vis-autoclose | 1 + .config/vis/plugins/vis-colorizer | 1 + .config/vis/plugins/vis-lspc | 1 + .config/vis/themes/caelus.lua | 39 +++ .config/vis/visrc.lua | 25 ++ 64 files changed, 1425 insertions(+), 920 deletions(-) create mode 100644 .config/nvim-lazy/init.lua create mode 100644 .config/nvim-lazy/lazy-lock.json create mode 100644 .config/nvim-lazy/lua/caelus/init.lua create mode 100755 .config/nvim-lazy/lua/config/keymaps.lua create mode 100644 .config/nvim-lazy/lua/config/lazy.lua create mode 100755 .config/nvim-lazy/lua/config/options.lua create mode 100755 .config/nvim-lazy/lua/plugins/auto-pairs.lua create mode 100644 .config/nvim-lazy/lua/plugins/blink.lua create mode 100755 .config/nvim-lazy/lua/plugins/colorizer.lua create mode 100755 .config/nvim-lazy/lua/plugins/eslint.lua create mode 100644 .config/nvim-lazy/lua/plugins/everpuccin.lua.bkp create mode 100755 .config/nvim-lazy/lua/plugins/harpoon.lua create mode 100755 .config/nvim-lazy/lua/plugins/highlight-colors.lua create mode 100755 .config/nvim-lazy/lua/plugins/lspconfig.lua create mode 100755 .config/nvim-lazy/lua/plugins/lualine.lua create mode 100755 .config/nvim-lazy/lua/plugins/markdown.lua create mode 100644 .config/nvim-lazy/lua/plugins/mason-lspconfig.lua create mode 100644 .config/nvim-lazy/lua/plugins/mason.lua create mode 100644 .config/nvim-lazy/lua/plugins/nim.lua create mode 100644 .config/nvim-lazy/lua/plugins/oil.lua create mode 100755 .config/nvim-lazy/lua/plugins/orgmode.lua create mode 100755 .config/nvim-lazy/lua/plugins/telescope.lua create mode 100755 .config/nvim-lazy/lua/plugins/treesitter.lua create mode 100644 .config/nvim-lazy/lua/plugins/trouble.lua create mode 100755 .config/nvim-lazy/lua/plugins/undotree.lua create mode 100644 .config/nvim-lazy/lua/plugins/vlang.lua create mode 100644 .config/nvim-raw/init.lua create mode 100644 .config/nvim-raw/lua/caelus/init.lua create mode 100755 .config/nvim-raw/lua/config/keymaps.lua create mode 100755 .config/nvim-raw/lua/config/options.lua create mode 100644 .config/nvim-raw/lua/config/plugins.lua create mode 100644 .config/nvim-raw/nvim-pack-lock.json delete mode 100644 .config/nvim/init.lua delete mode 100644 .config/nvim/lazy-lock.json delete mode 100644 .config/nvim/lua/caelus/init.lua delete mode 100755 .config/nvim/lua/config/keymaps.lua delete mode 100644 .config/nvim/lua/config/lazy.lua delete mode 100755 .config/nvim/lua/config/options.lua delete mode 100755 .config/nvim/lua/plugins/auto-pairs.lua delete mode 100644 .config/nvim/lua/plugins/blink.lua delete mode 100755 .config/nvim/lua/plugins/colorizer.lua delete mode 100755 .config/nvim/lua/plugins/eslint.lua delete mode 100644 .config/nvim/lua/plugins/everpuccin.lua.bkp delete mode 100755 .config/nvim/lua/plugins/harpoon.lua delete mode 100755 .config/nvim/lua/plugins/highlight-colors.lua delete mode 100755 .config/nvim/lua/plugins/lspconfig.lua delete mode 100755 .config/nvim/lua/plugins/lualine.lua delete mode 100755 .config/nvim/lua/plugins/markdown.lua delete mode 100644 .config/nvim/lua/plugins/mason-lspconfig.lua delete mode 100644 .config/nvim/lua/plugins/mason.lua delete mode 100644 .config/nvim/lua/plugins/nim.lua delete mode 100644 .config/nvim/lua/plugins/oil.lua delete mode 100755 .config/nvim/lua/plugins/orgmode.lua delete mode 100755 .config/nvim/lua/plugins/telescope.lua delete mode 100755 .config/nvim/lua/plugins/treesitter.lua delete mode 100644 .config/nvim/lua/plugins/trouble.lua delete mode 100755 .config/nvim/lua/plugins/undotree.lua delete mode 100644 .config/nvim/lua/plugins/vlang.lua create mode 100644 .config/vis/plugins/complete-filename/init.lua create mode 160000 .config/vis/plugins/vis-autoclose create mode 160000 .config/vis/plugins/vis-colorizer create mode 160000 .config/vis/plugins/vis-lspc create mode 100644 .config/vis/themes/caelus.lua create mode 100644 .config/vis/visrc.lua (limited to '.config') diff --git a/.config/nvim-lazy/init.lua b/.config/nvim-lazy/init.lua new file mode 100644 index 0000000..c32ed4e --- /dev/null +++ b/.config/nvim-lazy/init.lua @@ -0,0 +1,4 @@ +require("config.keymaps") +require("config.options") +require("config.lazy") +require("caelus.init").colorscheme() diff --git a/.config/nvim-lazy/lazy-lock.json b/.config/nvim-lazy/lazy-lock.json new file mode 100644 index 0000000..9233f0e --- /dev/null +++ b/.config/nvim-lazy/lazy-lock.json @@ -0,0 +1,31 @@ +{ + "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, + "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, + "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "25f609e7fca78af7cede4f9fa3af8a94b1c4950b" }, + "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, + "mini.nvim": { "branch": "main", "commit": "3923662bf3d6ca49a9503f8d7196ea0450983e6a" }, + "nim.nvim": { "branch": "master", "commit": "9ee8fdc04ad3d7fcbd9679e0be3477543f17b9d9" }, + "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, + "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, + "nvim-highlight-colors": { "branch": "main", "commit": "e2cb22089cc2358b2b995c09578224f142de6039" }, + "nvim-lint": { "branch": "master", "commit": "4b03656c09c1561f89b6aa0665c15d292ba9499d" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "b9c795d3973e8eec22706af14959bc60c579e771" }, + "nvim-lspconfig": { "branch": "master", "commit": "8e2084bf5e40c79c1f42210a6ef96a0a4793a763" }, + "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" }, + "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, + "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" }, + "org-bullets.nvim": { "branch": "main", "commit": "503fe053550879cc202086a40454e46a87c41ddb" }, + "orgmode": { "branch": "master", "commit": "1ab7b456020de8bdaed7d8135b5376a0b4419b11" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "render-markdown.nvim": { "branch": "main", "commit": "c7188a8f9d2953696b6303caccbf39c51fa2c1b1" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, + "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, + "undotree": { "branch": "main", "commit": "0e6d41d55ad147407e4ba00a292973de8db0b836" }, + "v-vim": { "branch": "master", "commit": "1dc1388bafb89072f8349dbd96f9462ae22237cb" } +} diff --git a/.config/nvim-lazy/lua/caelus/init.lua b/.config/nvim-lazy/lua/caelus/init.lua new file mode 100644 index 0000000..dec0a41 --- /dev/null +++ b/.config/nvim-lazy/lua/caelus/init.lua @@ -0,0 +1,100 @@ +local M = {}; + +local colors = { + bg = "#0f0f0f", + gray0 = "#141514"; + gray1 = "#1e1f1e"; + gray2 = "#272a28"; + gray3 = "#3b403c"; + gray4 = "#585f5b"; + gray5 = "#6c756f"; + gray6 = "#888e7b"; + gray7 = "#9a9c8b"; + gray8 = "#b6b69a"; + gray9 = "#d9cdb5"; + gray10 = "#e3d6c9"; + fg = "#f4decd", + red = "#f16e65"; + lred = "#ef968f"; + orange = "#ef934d"; + yellow = "#efbf71"; + green = "#7ec97e"; + lgreen = "#a4daa4"; + cyan = "#7ec9a3"; + lcyan = "#abd4bf"; + blue = "#71b4d6"; + lblue = "#b0d4e8"; + magenta = "#e28dc6"; + lmagenta = "#ebadd6"; +} + +function M.colorscheme() + vim.cmd("highlight clear") + vim.cmd("syntax reset") + + vim.o.background = "dark"; + vim.g.colors_name = "caelus"; + + local set = vim.api.nvim_set_hl + + -- ui + set(0, "Normal", { fg = colors.fg, bg = colors.bg }) + set(0, "NormalFloat", { fg = colors.fg, bg = colors.bg }) + set(0, "FloatBorder", { fg = colors.fg, bg = colors.bg }) + set(0, "CursorLine", { bg = colors.gray2 }) + set(0, "Visual", { bg = colors.gray3 }) + set(0, "Search", { fg = colors.bg, bg = colors.orange }) + set(0, "IncSearch", { fg = colors.bg, bg = colors.orange }) + set(0, "StatusLine", { bg = colors.gray2 }) + set(0, "StatusLineNC", { bg = colors.orange }) + set(0, "VertSplit", { fg = colors.gray8 }) + set(0, "WinSeparator", { fg = colors.gray8 }) + set(0, "LineNr", { fg = colors.gray6 }) + set(0, "CursorLineNr", { fg = colors.orange, bold = true }) + set(0, "SignColumn", { bg = colors.bg }) + set(0, "Folded", { fg = colors.gray8, bg = colors.gray3 }) + + -- popup + set(0, "Pmenu", { fg = colors.fg, bg = colors.gray10 }) + set(0, "PmenuSel", { fg = colors.bg, bg = colors.orange }) + set(0, "PmenuSbar", { bg = colors.gray10 }) + set(0, "PmenuThumb", { bg = colors.orange }) + + -- syntax + set(0, "Comment", { fg = colors.gray8, italic = true }) + set(0, "Constant", { fg = colors.magenta }) + set(0, "String", { fg = colors.green }) + set(0, "Identifier", { fg = colors.blue }) + set(0, "Function", { fg = colors.yellow }) + set(0, "Statement", { fg = colors.red }) + set(0, "Type", { fg = colors.cyan, bold = true }) + set(0, "Special", { fg = colors.yellow }) + set(0, "Error", { fg = colors.red, bold = true }) + set(0, "Keyword", { fg = colors.red }) + set(0, "Variable", { fg = colors.fg }) + set(0, "TSKeyword", { fg = colors.red }) + set(0, "TSFunction", { fg = colors.yellow }) + set(0, "TSVariable", { fg = colors.fg }) + set(0, "TSType", { fg = colors.cyan }) + + -- blink + set(0, "BlinkCmpMenu", { bg = colors.gray1 }) + set(0, "BlinkCmpMenuBorder", { fg = colors.gray6, bg = colors.gray1 }) + set(0, "BlinkCmpMenuSelection", { fg = colors.bg, bg = colors.orange }) + set(0, "BlinkCmpLabel", { fg = colors.fg }) + set(0, "BlinkCmpLabelDetail", { fg = colors.gray7 }) + set(0, "BlinkCmpLabelDescription",{ fg = colors.gray8 }) + set(0, "BlinkCmpLabelMatch", { fg = colors.orange, bold = true }) + set(0, "BlinkCmpKind", { fg = colors.cyan }) + set(0, "BlinkCmpDoc", { fg = colors.fg, bg = colors.gray2 }) + set(0, "BlinkCmpDocBorder", { fg = colors.gray5, bg = colors.gray2 }) + + if package.loaded['lualine'] then + require('lualine').setup({ + options = { theme = 'auto' }, + }) + end + +end + +return M diff --git a/.config/nvim-lazy/lua/config/keymaps.lua b/.config/nvim-lazy/lua/config/keymaps.lua new file mode 100755 index 0000000..e2987bc --- /dev/null +++ b/.config/nvim-lazy/lua/config/keymaps.lua @@ -0,0 +1,13 @@ +localopts = { noremap = true, silent = true } + +vim.g.mapleader = " " +vim.g.maplocalleader = " " + +vim.keymap.set({"n", "v"}, "y", '"+y', { noremap = true, silent = true }) + +vim.keymap.set("v", "J", ":m '>+1gv=gv", { desc = "moves lines down in visual selection" }) +vim.keymap.set("v", "K", ":m '<-2gv=gv", { desc = "moves lines up in visual selection" }) + +vim.keymap.set("n", "al", "term", { desc = "Open terminal" }) + +vim.keymap.set("n", "f", vim.lsp.buf.format) diff --git a/.config/nvim-lazy/lua/config/lazy.lua b/.config/nvim-lazy/lua/config/lazy.lua new file mode 100644 index 0000000..c381a4b --- /dev/null +++ b/.config/nvim-lazy/lua/config/lazy.lua @@ -0,0 +1,35 @@ +-- Bootstrap lazy.nvim +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +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(lazypath) + +-- Make sure to setup `mapleader` and `maplocalleader` before +-- loading lazy.nvim so that mappings are correct. +-- This is also a good place to setup other settings (vim.opt) +vim.g.mapleader = " " +vim.g.maplocalleader = "\\" + +-- Setup lazy.nvim +require("lazy").setup({ + spec = { + -- import your plugins + { import = "plugins" }, + }, + -- Configure any other settings here. See the documentation for more details. + -- colorscheme that will be used when installing plugins. + install = { colorscheme = { "habamax" } }, + -- automatically check for plugin updates + checker = { enabled = true }, +}) diff --git a/.config/nvim-lazy/lua/config/options.lua b/.config/nvim-lazy/lua/config/options.lua new file mode 100755 index 0000000..dac7c76 --- /dev/null +++ b/.config/nvim-lazy/lua/config/options.lua @@ -0,0 +1,40 @@ +vim.cmd("let g:netrw_banner = 0") +vim.cmd("set termguicolors") + +vim.opt.guicursor = "" +vim.opt.nu = true +vim.opt.relativenumber = false + +vim.opt.tabstop = 2 +vim.opt.softtabstop = 2 +vim.opt.shiftwidth = 2 +vim.opt.expandtab = true +vim.opt.autoindent = true +vim.opt.smartindent = true +vim.opt.wrap = true + +vim.opt.swapfile = false +vim.opt.backup = false +vim.opt.undofile = true + +vim.opt.incsearch = true +vim.opt.inccommand = "split" +vim.opt.ignorecase = true +vim.opt.smartcase = true + +vim.opt.termguicolors = true +vim.opt.background = "dark" +vim.opt.scrolloff = 8 +vim.opt.signcolumn = "yes" + +vim.opt.backspace = { "start", "eol", "indent" } + +vim.opt.splitright = true +vim.opt.splitbelow = true + +vim.opt.hlsearch = true + +vim.opt.mouse = "a" +vim.g.editorconfig = true + +vim.g.markdown_folding = 1 diff --git a/.config/nvim-lazy/lua/plugins/auto-pairs.lua b/.config/nvim-lazy/lua/plugins/auto-pairs.lua new file mode 100755 index 0000000..db98da2 --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/auto-pairs.lua @@ -0,0 +1,24 @@ +return { + "windwp/nvim-autopairs", + event = { "InsertEnter" }, + dependencies = { + "hrsh7th/nvim-cmp", + }, + config = function() + local autopairs = require("nvim-autopairs") + + autopairs.setup({ + check_ts = true, + ts_config = { + lua = { "string" }, + javascript = { "template_string" }, + java = false, + }, + }) + + local cmp_autopairs = require("nvim-autopairs.completion.cmp") + local cmp = require("cmp") + + cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) + end, +} diff --git a/.config/nvim-lazy/lua/plugins/blink.lua b/.config/nvim-lazy/lua/plugins/blink.lua new file mode 100644 index 0000000..e4dd63c --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/blink.lua @@ -0,0 +1,53 @@ +return { + 'saghen/blink.cmp', + -- optional: provides snippets for the snippet source + dependencies = { 'rafamadriz/friendly-snippets' }, + + -- use a release tag to download pre-built binaries + version = '1.*', + -- AND/OR build from source + -- build = 'cargo build --release', + -- If you use nix, you can build from source with: + -- build = 'nix run .#build-plugin', + + ---@module 'blink.cmp' + ---@type blink.cmp.Config + opts = { + -- 'default' (recommended) for mappings similar to built-in completions (C-y to accept) + -- 'super-tab' for mappings similar to vscode (tab to accept) + -- 'enter' for enter to accept + -- 'none' for no mappings + -- + -- All presets have the following mappings: + -- C-space: Open menu or open docs if already open + -- C-n/C-p or Up/Down: Select next/previous item + -- C-e: Hide menu + -- C-k: Toggle signature help (if signature.enabled = true) + -- + -- See :h blink-cmp-config-keymap for defining your own keymap + keymap = { preset = 'default' }, + + appearance = { + -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' + -- Adjusts spacing to ensure icons are aligned + nerd_font_variant = 'mono' + }, + + -- (Default) Only show the documentation popup when manually triggered + completion = { documentation = { auto_show = false } }, + + -- Default list of enabled providers defined so that you can extend it + -- elsewhere in your config, without redefining it, due to `opts_extend` + sources = { + default = { 'lsp', 'path', 'snippets', 'buffer' }, + }, + + -- (Default) Rust fuzzy matcher for typo resistance and significantly better performance + -- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation, + -- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"` + -- + -- See the fuzzy documentation for more information + fuzzy = { implementation = "prefer_rust_with_warning" } + }, + opts_extend = { "sources.default" } +} diff --git a/.config/nvim-lazy/lua/plugins/colorizer.lua b/.config/nvim-lazy/lua/plugins/colorizer.lua new file mode 100755 index 0000000..dee6b43 --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/colorizer.lua @@ -0,0 +1,6 @@ +return { + "norcalli/nvim-colorizer.lua", + config = function() + require("colorizer").setup() + end, +} diff --git a/.config/nvim-lazy/lua/plugins/eslint.lua b/.config/nvim-lazy/lua/plugins/eslint.lua new file mode 100755 index 0000000..ba74b8a --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/eslint.lua @@ -0,0 +1,41 @@ +return { + "mfussenegger/nvim-lint", + event = { "BufReadPre", "BufNewFile" }, + config = function() + local lint = require("lint") + local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) + local eslint = lint.linters.eslint_d + + -- if Eslint error configuration not found : change MasonInstall eslint@version or npm i -g eslint at a specific version + lint.linters_by_ft = { + javascript = { "eslint_d" }, + typescript = { "eslint_d" }, + javascriptreact = { "eslint_d" }, + typescriptreact = { "eslint_d" }, + svelte = { "eslint_d" }, + python = { "pylint" }, + } + + eslint.args = { + "--no-warn-ignored", + "--format", + "json", + "--stdin", + "--stdin-filename", + function() + return vim.fn.expand("%:p") + end, + } + + vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { + group = lint_augroup, + callback = function() + lint.try_lint() + end, + }) + + vim.keymap.set("n", "l", function() + lint.try_lint() + end, { desc = "Trigger linting for current file" }) + end, +} diff --git a/.config/nvim-lazy/lua/plugins/everpuccin.lua.bkp b/.config/nvim-lazy/lua/plugins/everpuccin.lua.bkp new file mode 100644 index 0000000..876c20a --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/everpuccin.lua.bkp @@ -0,0 +1,330 @@ +return { + "catppuccin/nvim", + name = "catppuccin", + lazy = false, + priority = 1000, + config = function() + require("catppuccin").setup({ + background = { + light = "latte", + dark = "mocha", + }, + color_overrides = { + macchiato = { + rosewater = "#ef958f", + flamingo = "#ef958f", + red = "#f16e65", + maroon = "#f16e65", + pink = "#ebadd6", + mauve = "#e28dc6", + peach = "#ef944d", + yellow = "#efbe71", + green = "#7dc97d", + teal = "#a4daa4", + sky = "#7dc9a3", + sapphire = "#abd4bf", + blue = "#b0d4e8", + lavender = "#72b4d6", + text = "#F9EEE5", + subtext1 = "#E3DAC9", + subtext0 = "#D8CCB4", + overlay2 = "#B6B69A", + overlay1 = "#999C8B", + overlay0 = "#878E7A", + surface2 = "#6B746E", + surface1 = "#585F5A", + surface0 = "#3A3F3C", + crust = "#272A28", + mantle = "#1D1F1E", + base = "#131414", + none = "#0f0f0f", + }, + }, + transparent_background = true, + show_end_of_buffer = false, + integration_default = false, + integrations = { + barbecue = { dim_dirname = true, bold_basename = true, dim_context = false, alt_background = false }, + cmp = true, + gitsigns = true, + hop = true, + illuminate = { enabled = true }, + native_lsp = { enabled = true, inlay_hints = { background = true } }, + neogit = true, + neotree = true, + semantic_tokens = true, + treesitter = true, + treesitter_context = true, + vimwiki = true, + which_key = true, + }, + highlight_overrides = { + all = function(colors) + return { + CmpItemMenu = { fg = colors.surface2 }, + CursorLineNr = { fg = colors.text }, + FloatBorder = { bg = colors.base, fg = colors.surface0 }, + GitSignsChange = { fg = colors.peach }, + LineNr = { fg = colors.overlay0 }, + LspInfoBorder = { link = "FloatBorder" }, + NeoTreeDirectoryIcon = { fg = colors.subtext1 }, + NeoTreeDirectoryName = { fg = colors.subtext1 }, + NeoTreeFloatBorder = { bg = colors.mantle, fg = colors.mantle }, + -- NeoTreeFloatBorder = { bg = "None" }, + NeoTreeGitConflict = { fg = colors.red }, + NeoTreeGitDeleted = { fg = colors.red }, + NeoTreeGitIgnored = { fg = colors.overlay0 }, + NeoTreeGitModified = { fg = colors.peach }, + NeoTreeGitStaged = { fg = colors.green }, + NeoTreeGitUnstaged = { fg = colors.red }, + NeoTreeGitUntracked = { fg = colors.green }, + NeoTreeIndent = { fg = colors.surface1 }, + NeoTreeNormal = { bg = colors.mantle }, + NeoTreeNormalNC = { bg = colors.mantle }, + NeoTreeRootName = { fg = colors.subtext1, style = { "bold" } }, + NeoTreeTabActive = { fg = colors.text, bg = colors.mantle }, + NeoTreeTabInactive = { fg = colors.surface2, bg = colors.crust }, + NeoTreeTabSeparatorActive = { fg = colors.mantle, bg = colors.mantle }, + NeoTreeTabSeparatorInactive = { fg = colors.crust, bg = colors.crust }, + NeoTreeWinSeparator = { fg = colors.base, bg = colors.base }, + NormalFloat = { bg = colors.base }, + Pmenu = { bg = colors.mantle, fg = "" }, + -- telescope prompt + TelescopePromptTitle = { fg = colors.mantle, bg = "#39fd9c", style = { "bold" } }, + TelescopePromptCounter = { fg = colors.red, style = { "bold" } }, + TelescopePromptBorder = { bg = colors.base }, + -- telescope results + TelescopeResultsTitle = { link = "TelescopePromptTitle" }, + TelescopeResultsBorder = { link = "TelescopePromptBorder" }, + -- telescope preview + TelescopePreviewTitle = { link = "TelescopePromptTitle" }, + TelescopePreviewBorder = { link = "TelescopePromptBorder" }, + VertSplit = { bg = colors.base, fg = colors.surface0 }, + WhichKeyFloat = { bg = colors.mantle }, + YankHighlight = { bg = colors.surface2 }, + FidgetTask = { fg = colors.subtext2 }, + FidgetTitle = { fg = colors.peach }, + + IblIndent = { fg = colors.surface0 }, + IblScope = { fg = colors.overlay0 }, + + Boolean = { fg = colors.mauve }, + Number = { fg = colors.mauve }, + Float = { fg = colors.mauve }, + + PreProc = { fg = colors.mauve }, + PreCondit = { fg = colors.mauve }, + Include = { fg = colors.mauve }, + Define = { fg = colors.mauve }, + Conditional = { fg = colors.red }, + Repeat = { fg = colors.red }, + Keyword = { fg = colors.red }, + Typedef = { fg = colors.red }, + Exception = { fg = colors.red }, + Statement = { fg = colors.red }, + + Error = { fg = colors.red }, + StorageClass = { fg = colors.peach }, + Tag = { fg = colors.peach }, + Label = { fg = colors.peach }, + Structure = { fg = colors.peach }, + Operator = { fg = colors.peach }, + Title = { fg = colors.peach }, + Special = { fg = colors.yellow }, + SpecialChar = { fg = colors.yellow }, + Type = { fg = colors.yellow, style = { "bold" } }, + Function = { fg = colors.green, style = { "bold" } }, + Delimiter = { fg = colors.subtext2 }, + Ignore = { fg = colors.subtext2 }, + Macro = { fg = colors.teal }, + + TSAnnotation = { fg = colors.mauve }, + TSAttribute = { fg = colors.mauve }, + TSBoolean = { fg = colors.mauve }, + TSCharacter = { fg = colors.teal }, + TSCharacterSpecial = { link = "SpecialChar" }, + TSComment = { link = "Comment" }, + TSConditional = { fg = colors.red }, + TSConstBuiltin = { fg = colors.mauve }, + TSConstMacro = { fg = colors.mauve }, + TSConstant = { fg = colors.text }, + TSConstructor = { fg = colors.green }, + TSDebug = { link = "Debug" }, + TSDefine = { link = "Define" }, + TSEnvironment = { link = "Macro" }, + TSEnvironmentName = { link = "Type" }, + TSError = { link = "Error" }, + TSException = { fg = colors.red }, + TSField = { fg = colors.blue }, + TSFloat = { fg = colors.mauve }, + TSFuncBuiltin = { fg = colors.green }, + TSFuncMacro = { fg = colors.green }, + TSFunction = { fg = colors.green }, + TSFunctionCall = { fg = colors.lavender }, + TSInclude = { fg = colors.red }, + TSKeyword = { fg = colors.red }, + TSKeywordFunction = { fg = colors.red }, + TSKeywordOperator = { fg = colors.peach }, + TSKeywordReturn = { fg = colors.red }, + TSLabel = { fg = colors.peach }, + TSLiteral = { link = "String" }, + TSMath = { fg = colors.blue }, + TSMethod = { fg = colors.green }, + TSMethodCall = { fg = colors.green }, + TSNamespace = { fg = colors.yellow }, + TSNone = { fg = colors.text }, + TSNumber = { fg = colors.mauve }, + TSOperator = { fg = colors.peach }, + TSParameter = { fg = colors.text }, + TSParameterReference = { fg = colors.text }, + TSPreProc = { link = "PreProc" }, + TSProperty = { fg = colors.blue }, + TSPunctBracket = { fg = colors.text }, + TSPunctDelimiter = { link = "Delimiter" }, + TSPunctSpecial = { fg = colors.blue }, + TSRepeat = { fg = colors.red }, + TSStorageClass = { fg = colors.peach }, + TSStorageClassLifetime = { fg = colors.peach }, + TSStrike = { fg = colors.subtext2 }, + TSString = { fg = colors.green }, + TSStringEscape = { fg = colors.mauve }, + TSStringRegex = { fg = colors.green }, + TSStringSpecial = { link = "SpecialChar" }, + TSSymbol = { fg = colors.text }, + TSTag = { fg = colors.peach }, + TSTagAttribute = { fg = colors.green }, + TSTagDelimiter = { fg = colors.green }, + TSText = { fg = colors.green }, + TSTextReference = { link = "Constant" }, + TSTitle = { link = "Title" }, + TSTodo = { link = "Todo" }, + TSType = { fg = colors.yellow, style = { "bold" } }, + TSTypeBuiltin = { fg = colors.yellow, style = { "bold" } }, + TSTypeDefinition = { fg = colors.yellow, style = { "bold" } }, + TSTypeQualifier = { fg = colors.peach, style = { "bold" } }, + TSURI = { fg = colors.blue }, + TSVariable = { fg = colors.text }, + TSVariableBuiltin = { fg = colors.mauve }, + + ["@annotation"] = { link = "TSAnnotation" }, + ["@attribute"] = { link = "TSAttribute" }, + ["@boolean"] = { link = "TSBoolean" }, + ["@character"] = { link = "TSCharacter" }, + ["@character.special"] = { link = "TSCharacterSpecial" }, + ["@comment"] = { link = "TSComment" }, + ["@conceal"] = { link = "Grey" }, + ["@conditional"] = { link = "TSConditional" }, + ["@constant"] = { link = "TSConstant" }, + ["@constant.builtin"] = { link = "TSConstBuiltin" }, + ["@constant.macro"] = { link = "TSConstMacro" }, + ["@constructor"] = { link = "TSConstructor" }, + ["@debug"] = { link = "TSDebug" }, + ["@define"] = { link = "TSDefine" }, + ["@error"] = { link = "TSError" }, + ["@exception"] = { link = "TSException" }, + ["@field"] = { link = "TSField" }, + ["@float"] = { link = "TSFloat" }, + ["@function"] = { link = "TSFunction" }, + ["@function.builtin"] = { link = "TSFuncBuiltin" }, + ["@function.call"] = { link = "TSFunctionCall" }, + ["@function.macro"] = { link = "TSFuncMacro" }, + ["@include"] = { link = "TSInclude" }, + ["@keyword"] = { link = "TSKeyword" }, + ["@keyword.function"] = { link = "TSKeywordFunction" }, + ["@keyword.operator"] = { link = "TSKeywordOperator" }, + ["@keyword.return"] = { link = "TSKeywordReturn" }, + ["@label"] = { link = "TSLabel" }, + ["@math"] = { link = "TSMath" }, + ["@method"] = { link = "TSMethod" }, + ["@method.call"] = { link = "TSMethodCall" }, + ["@namespace"] = { link = "TSNamespace" }, + ["@none"] = { link = "TSNone" }, + ["@number"] = { link = "TSNumber" }, + ["@operator"] = { link = "TSOperator" }, + ["@parameter"] = { link = "TSParameter" }, + ["@parameter.reference"] = { link = "TSParameterReference" }, + ["@preproc"] = { link = "TSPreProc" }, + ["@property"] = { link = "TSProperty" }, + ["@punctuation.bracket"] = { link = "TSPunctBracket" }, + ["@punctuation.delimiter"] = { link = "TSPunctDelimiter" }, + ["@punctuation.special"] = { link = "TSPunctSpecial" }, + ["@repeat"] = { link = "TSRepeat" }, + ["@storageclass"] = { link = "TSStorageClass" }, + ["@storageclass.lifetime"] = { link = "TSStorageClassLifetime" }, + ["@strike"] = { link = "TSStrike" }, + ["@string"] = { link = "TSString" }, + ["@string.escape"] = { link = "TSStringEscape" }, + ["@string.regex"] = { link = "TSStringRegex" }, + ["@string.special"] = { link = "TSStringSpecial" }, + ["@symbol"] = { link = "TSSymbol" }, + ["@tag"] = { link = "TSTag" }, + ["@tag.attribute"] = { link = "TSTagAttribute" }, + ["@tag.delimiter"] = { link = "TSTagDelimiter" }, + ["@text"] = { link = "TSText" }, + ["@text.danger"] = { link = "TSDanger" }, + ["@text.diff.add"] = { link = "diffAdded" }, + ["@text.diff.delete"] = { link = "diffRemoved" }, + ["@text.emphasis"] = { link = "TSEmphasis" }, + ["@text.environment"] = { link = "TSEnvironment" }, + ["@text.environment.name"] = { link = "TSEnvironmentName" }, + ["@text.literal"] = { link = "TSLiteral" }, + ["@text.math"] = { link = "TSMath" }, + ["@text.note"] = { link = "TSNote" }, + ["@text.reference"] = { link = "TSTextReference" }, + ["@text.strike"] = { link = "TSStrike" }, + ["@text.strong"] = { link = "TSStrong" }, + ["@text.title"] = { link = "TSTitle" }, + ["@text.todo"] = { link = "TSTodo" }, + ["@text.todo.checked"] = { link = "Green" }, + ["@text.todo.unchecked"] = { link = "Ignore" }, + ["@text.underline"] = { link = "TSUnderline" }, + ["@text.uri"] = { link = "TSURI" }, + ["@text.warning"] = { link = "TSWarning" }, + ["@todo"] = { link = "TSTodo" }, + ["@type"] = { link = "TSType" }, + ["@type.builtin"] = { link = "TSTypeBuiltin" }, + ["@type.definition"] = { link = "TSTypeDefinition" }, + ["@type.qualifier"] = { link = "TSTypeQualifier" }, + ["@uri"] = { link = "TSURI" }, + ["@variable"] = { link = "TSVariable" }, + ["@variable.builtin"] = { link = "TSVariableBuiltin" }, + + ["@lsp.type.class"] = { link = "TSType" }, + ["@lsp.type.comment"] = { link = "TSComment" }, + ["@lsp.type.decorator"] = { link = "TSFunction" }, + ["@lsp.type.enum"] = { link = "TSType" }, + ["@lsp.type.enumMember"] = { link = "TSProperty" }, + ["@lsp.type.events"] = { link = "TSLabel" }, + ["@lsp.type.function"] = { link = "TSFunction" }, + ["@lsp.type.interface"] = { link = "TSType" }, + ["@lsp.type.keyword"] = { link = "TSKeyword" }, + ["@lsp.type.macro"] = { link = "TSConstMacro" }, + ["@lsp.type.method"] = { link = "TSMethod" }, + ["@lsp.type.modifier"] = { link = "TSTypeQualifier" }, + ["@lsp.type.namespace"] = { link = "TSNamespace" }, + ["@lsp.type.number"] = { link = "TSNumber" }, + ["@lsp.type.operator"] = { link = "TSOperator" }, + ["@lsp.type.parameter"] = { link = "TSParameter" }, + ["@lsp.type.property"] = { link = "TSProperty" }, + ["@lsp.type.regexp"] = { link = "TSStringRegex" }, + ["@lsp.type.string"] = { link = "TSString" }, + ["@lsp.type.struct"] = { link = "TSType" }, + ["@lsp.type.type"] = { link = "TSType" }, + ["@lsp.type.typeParameter"] = { link = "TSTypeDefinition" }, + ["@lsp.type.variable"] = { link = "TSVariable" }, + } + end, + latte = function(colors) + return { + IblIndent = { fg = colors.mantle }, + IblScope = { fg = colors.surface1 }, + + LineNr = { fg = colors.surface1 }, + } + end, + }, + }) + + vim.api.nvim_command("colorscheme catppuccin-macchiato") + end, +} diff --git a/.config/nvim-lazy/lua/plugins/harpoon.lua b/.config/nvim-lazy/lua/plugins/harpoon.lua new file mode 100755 index 0000000..407b7f0 --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/harpoon.lua @@ -0,0 +1,26 @@ +return { + "thePrimeagen/harpoon", + enabled = true, + branch = "harpoon2", + dependencies = { + "nvim-lua/plenary.nvim", + }, + + config = function() + local harpoon = require("harpoon") + + harpoon:setup({ + global_settings = { + save_on_toggle = true, + save_on_change = true, + }, + }) + + vim.keymap.set("n", "ad", function() + harpoon:list():add() + end, { desc = "Harpoon add file" }) + vim.keymap.set("n", "", function() + harpoon.ui:toggle_quick_menu(harpoon:list()) + end) + end, +} diff --git a/.config/nvim-lazy/lua/plugins/highlight-colors.lua b/.config/nvim-lazy/lua/plugins/highlight-colors.lua new file mode 100755 index 0000000..5c97573 --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/highlight-colors.lua @@ -0,0 +1,8 @@ +return { + "brenoprata10/nvim-highlight-colors", + config = function() + vim.opt.termguicolors = true + + require("nvim-highlight-colors").setup({}) + end, +} diff --git a/.config/nvim-lazy/lua/plugins/lspconfig.lua b/.config/nvim-lazy/lua/plugins/lspconfig.lua new file mode 100755 index 0000000..bd748fc --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/lspconfig.lua @@ -0,0 +1,35 @@ +return { + "neovim/nvim-lspconfig", + event = { "BufReadPre", "BufNewFile" }, + dependencies = { + "hrsh7th/cmp-nvim-lsp", + { "antosha417/nvim-lsp-file-operations", config = true }, + }, + config = function() + vim.diagnostic.config({ + update_in_insert = true, + float = { + focusable = false, + style = "minimal", + border = "rounded", + source = "always", + header = "", + prefix = "", + } + }) + + vim.diagnostic.config({ virtual_text = true }) + + local lsp_configurations = require('lspconfig.configs') + + local capabilities = vim.tbl_deep_extend( + "force", + {}, + vim.lsp.protocol.make_client_capabilities(), + require('cmp_nvim_lsp').default_capabilities() + ) + end, + vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts), + vim.keymap.set("n", "vca", function() vim.lsp.buf.code_action() end, opts), + vim.keymap.set("n", "vrn", function() vim.lsp.buf.rename() end, opts) +} diff --git a/.config/nvim-lazy/lua/plugins/lualine.lua b/.config/nvim-lazy/lua/plugins/lualine.lua new file mode 100755 index 0000000..34ec658 --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/lualine.lua @@ -0,0 +1,12 @@ +return { + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + require('lualine').setup { + options = { + icons_enabled = true, + theme = 'auto', + } + } + end, +} diff --git a/.config/nvim-lazy/lua/plugins/markdown.lua b/.config/nvim-lazy/lua/plugins/markdown.lua new file mode 100755 index 0000000..01af860 --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/markdown.lua @@ -0,0 +1,9 @@ +return { + "MeanderingProgrammer/render-markdown.nvim", + dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-mini/mini.nvim" }, -- if you use the mini.nvim suite + -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins + -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons + ---@module 'render-markdown' + ---@type render.md.UserConfig + opts = {}, +} diff --git a/.config/nvim-lazy/lua/plugins/mason-lspconfig.lua b/.config/nvim-lazy/lua/plugins/mason-lspconfig.lua new file mode 100644 index 0000000..aed1bd5 --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/mason-lspconfig.lua @@ -0,0 +1,8 @@ +return { + "mason-org/mason-lspconfig.nvim", + opts = {}, + dependencies = { + { "mason-org/mason.nvim", opts = {} }, + "neovim/nvim-lspconfig", + }, +} diff --git a/.config/nvim-lazy/lua/plugins/mason.lua b/.config/nvim-lazy/lua/plugins/mason.lua new file mode 100644 index 0000000..9188cda --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/mason.lua @@ -0,0 +1,13 @@ +return{ + "mason-org/mason.nvim", + opts = { + ui = { + icons = { + package_installed = "✓", + package_pending = "➜", + package_uninstalled = "✗" + } + } + } +} + diff --git a/.config/nvim-lazy/lua/plugins/nim.lua b/.config/nvim-lazy/lua/plugins/nim.lua new file mode 100644 index 0000000..d079f68 --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/nim.lua @@ -0,0 +1,3 @@ +return{ + "alaviss/nim.nvim" +} diff --git a/.config/nvim-lazy/lua/plugins/oil.lua b/.config/nvim-lazy/lua/plugins/oil.lua new file mode 100644 index 0000000..5d153fd --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/oil.lua @@ -0,0 +1,20 @@ +return { + "stevearc/oil.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + require("oil").setup({ + default_file_explorer = true, + columns = {}, + keymaps = { + ["q"] = "actions.close", + }, + delete_to_trash = true, + view_options = { + show_hidden = true, + }, + skip_confirm_for_simple_edits = true, + }) + + vim.keymap.set("n", "fm", "Oil", { desc = "Open parent directory" }) + end, +} diff --git a/.config/nvim-lazy/lua/plugins/orgmode.lua b/.config/nvim-lazy/lua/plugins/orgmode.lua new file mode 100755 index 0000000..0945852 --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/orgmode.lua @@ -0,0 +1,17 @@ +return { + { + "nvim-orgmode/orgmode", + config = function() + require("orgmode").setup({ + org_agenda_files = "~/orgfiles/**/*", + org_default_notes_file = "~/orgfiles/refile.org", + }) + end, + }, + { + "akinsho/org-bullets.nvim", + config = function() + require("org-bullets").setup() + end, + }, +} diff --git a/.config/nvim-lazy/lua/plugins/telescope.lua b/.config/nvim-lazy/lua/plugins/telescope.lua new file mode 100755 index 0000000..99f1f5b --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/telescope.lua @@ -0,0 +1,25 @@ +return { + { + "nvim-telescope/telescope.nvim", + tag = "0.1.8", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + local builtin = require("telescope.builtin") + vim.keymap.set("n", "fj", builtin.find_files, {}) + vim.keymap.set("n", "fl", builtin.live_grep, {}) + end, + }, + { + "nvim-telescope/telescope-ui-select.nvim", + config = function() + require("telescope").setup({ + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown({}), + }, + }, + }) + require("telescope").load_extension("ui-select") + end, + }, +} diff --git a/.config/nvim-lazy/lua/plugins/treesitter.lua b/.config/nvim-lazy/lua/plugins/treesitter.lua new file mode 100755 index 0000000..90b57fb --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/treesitter.lua @@ -0,0 +1,15 @@ +return { + "nvim-treesitter/nvim-treesitter", + branch = "master", + lazy = false, + build = ":TSUpdate", + config = function() + local config = require("lazy") + config.setup({ + auto_install = true, + highlight = { enable = true }, + ensure_installed = { "v", "c", "lua", "vim", "markeown" }, + indent = { enable = true }, + }) + end, +} diff --git a/.config/nvim-lazy/lua/plugins/trouble.lua b/.config/nvim-lazy/lua/plugins/trouble.lua new file mode 100644 index 0000000..3741f30 --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/trouble.lua @@ -0,0 +1,37 @@ +return { + "folke/trouble.nvim", + opts = {}, -- for default options, refer to the configuration section for custom setup. + cmd = "Trouble", + keys = { + { + "xx", + "Trouble diagnostics toggle", + desc = "Diagnostics (Trouble)", + }, + { + "xX", + "Trouble diagnostics toggle filter.buf=0", + desc = "Buffer Diagnostics (Trouble)", + }, + { + "cs", + "Trouble symbols toggle focus=false", + desc = "Symbols (Trouble)", + }, + { + "cl", + "Trouble lsp toggle focus=false win.position=right", + desc = "LSP Definitions / references / ... (Trouble)", + }, + { + "xL", + "Trouble loclist toggle", + desc = "Location List (Trouble)", + }, + { + "xQ", + "Trouble qflist toggle", + desc = "Quickfix List (Trouble)", + }, + }, +} diff --git a/.config/nvim-lazy/lua/plugins/undotree.lua b/.config/nvim-lazy/lua/plugins/undotree.lua new file mode 100755 index 0000000..88a2038 --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/undotree.lua @@ -0,0 +1,8 @@ +return { + "jiaoshijie/undotree", + dependencies = "nvim-lua/plenary.nvim", + config = true, + keys = { + { "u", "lua require('undotree').toggle()" }, + }, +} diff --git a/.config/nvim-lazy/lua/plugins/vlang.lua b/.config/nvim-lazy/lua/plugins/vlang.lua new file mode 100644 index 0000000..8199b3c --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/vlang.lua @@ -0,0 +1,7 @@ +return { + 'neovim/nvim-lspconfig', + config = function() + require('lspconfig').vlang.setup({}) + end, + 'ollykel/v-vim' +} diff --git a/.config/nvim-raw/init.lua b/.config/nvim-raw/init.lua new file mode 100644 index 0000000..6bf6f8e --- /dev/null +++ b/.config/nvim-raw/init.lua @@ -0,0 +1,4 @@ +require("caelus.init").colorscheme() +require("config.keymaps") +require("config.options") +require("config.plugins") diff --git a/.config/nvim-raw/lua/caelus/init.lua b/.config/nvim-raw/lua/caelus/init.lua new file mode 100644 index 0000000..dec0a41 --- /dev/null +++ b/.config/nvim-raw/lua/caelus/init.lua @@ -0,0 +1,100 @@ +local M = {}; + +local colors = { + bg = "#0f0f0f", + gray0 = "#141514"; + gray1 = "#1e1f1e"; + gray2 = "#272a28"; + gray3 = "#3b403c"; + gray4 = "#585f5b"; + gray5 = "#6c756f"; + gray6 = "#888e7b"; + gray7 = "#9a9c8b"; + gray8 = "#b6b69a"; + gray9 = "#d9cdb5"; + gray10 = "#e3d6c9"; + fg = "#f4decd", + red = "#f16e65"; + lred = "#ef968f"; + orange = "#ef934d"; + yellow = "#efbf71"; + green = "#7ec97e"; + lgreen = "#a4daa4"; + cyan = "#7ec9a3"; + lcyan = "#abd4bf"; + blue = "#71b4d6"; + lblue = "#b0d4e8"; + magenta = "#e28dc6"; + lmagenta = "#ebadd6"; +} + +function M.colorscheme() + vim.cmd("highlight clear") + vim.cmd("syntax reset") + + vim.o.background = "dark"; + vim.g.colors_name = "caelus"; + + local set = vim.api.nvim_set_hl + + -- ui + set(0, "Normal", { fg = colors.fg, bg = colors.bg }) + set(0, "NormalFloat", { fg = colors.fg, bg = colors.bg }) + set(0, "FloatBorder", { fg = colors.fg, bg = colors.bg }) + set(0, "CursorLine", { bg = colors.gray2 }) + set(0, "Visual", { bg = colors.gray3 }) + set(0, "Search", { fg = colors.bg, bg = colors.orange }) + set(0, "IncSearch", { fg = colors.bg, bg = colors.orange }) + set(0, "StatusLine", { bg = colors.gray2 }) + set(0, "StatusLineNC", { bg = colors.orange }) + set(0, "VertSplit", { fg = colors.gray8 }) + set(0, "WinSeparator", { fg = colors.gray8 }) + set(0, "LineNr", { fg = colors.gray6 }) + set(0, "CursorLineNr", { fg = colors.orange, bold = true }) + set(0, "SignColumn", { bg = colors.bg }) + set(0, "Folded", { fg = colors.gray8, bg = colors.gray3 }) + + -- popup + set(0, "Pmenu", { fg = colors.fg, bg = colors.gray10 }) + set(0, "PmenuSel", { fg = colors.bg, bg = colors.orange }) + set(0, "PmenuSbar", { bg = colors.gray10 }) + set(0, "PmenuThumb", { bg = colors.orange }) + + -- syntax + set(0, "Comment", { fg = colors.gray8, italic = true }) + set(0, "Constant", { fg = colors.magenta }) + set(0, "String", { fg = colors.green }) + set(0, "Identifier", { fg = colors.blue }) + set(0, "Function", { fg = colors.yellow }) + set(0, "Statement", { fg = colors.red }) + set(0, "Type", { fg = colors.cyan, bold = true }) + set(0, "Special", { fg = colors.yellow }) + set(0, "Error", { fg = colors.red, bold = true }) + set(0, "Keyword", { fg = colors.red }) + set(0, "Variable", { fg = colors.fg }) + set(0, "TSKeyword", { fg = colors.red }) + set(0, "TSFunction", { fg = colors.yellow }) + set(0, "TSVariable", { fg = colors.fg }) + set(0, "TSType", { fg = colors.cyan }) + + -- blink + set(0, "BlinkCmpMenu", { bg = colors.gray1 }) + set(0, "BlinkCmpMenuBorder", { fg = colors.gray6, bg = colors.gray1 }) + set(0, "BlinkCmpMenuSelection", { fg = colors.bg, bg = colors.orange }) + set(0, "BlinkCmpLabel", { fg = colors.fg }) + set(0, "BlinkCmpLabelDetail", { fg = colors.gray7 }) + set(0, "BlinkCmpLabelDescription",{ fg = colors.gray8 }) + set(0, "BlinkCmpLabelMatch", { fg = colors.orange, bold = true }) + set(0, "BlinkCmpKind", { fg = colors.cyan }) + set(0, "BlinkCmpDoc", { fg = colors.fg, bg = colors.gray2 }) + set(0, "BlinkCmpDocBorder", { fg = colors.gray5, bg = colors.gray2 }) + + if package.loaded['lualine'] then + require('lualine').setup({ + options = { theme = 'auto' }, + }) + end + +end + +return M diff --git a/.config/nvim-raw/lua/config/keymaps.lua b/.config/nvim-raw/lua/config/keymaps.lua new file mode 100755 index 0000000..e2987bc --- /dev/null +++ b/.config/nvim-raw/lua/config/keymaps.lua @@ -0,0 +1,13 @@ +localopts = { noremap = true, silent = true } + +vim.g.mapleader = " " +vim.g.maplocalleader = " " + +vim.keymap.set({"n", "v"}, "y", '"+y', { noremap = true, silent = true }) + +vim.keymap.set("v", "J", ":m '>+1gv=gv", { desc = "moves lines down in visual selection" }) +vim.keymap.set("v", "K", ":m '<-2gv=gv", { desc = "moves lines up in visual selection" }) + +vim.keymap.set("n", "al", "term", { desc = "Open terminal" }) + +vim.keymap.set("n", "f", vim.lsp.buf.format) diff --git a/.config/nvim-raw/lua/config/options.lua b/.config/nvim-raw/lua/config/options.lua new file mode 100755 index 0000000..dac7c76 --- /dev/null +++ b/.config/nvim-raw/lua/config/options.lua @@ -0,0 +1,40 @@ +vim.cmd("let g:netrw_banner = 0") +vim.cmd("set termguicolors") + +vim.opt.guicursor = "" +vim.opt.nu = true +vim.opt.relativenumber = false + +vim.opt.tabstop = 2 +vim.opt.softtabstop = 2 +vim.opt.shiftwidth = 2 +vim.opt.expandtab = true +vim.opt.autoindent = true +vim.opt.smartindent = true +vim.opt.wrap = true + +vim.opt.swapfile = false +vim.opt.backup = false +vim.opt.undofile = true + +vim.opt.incsearch = true +vim.opt.inccommand = "split" +vim.opt.ignorecase = true +vim.opt.smartcase = true + +vim.opt.termguicolors = true +vim.opt.background = "dark" +vim.opt.scrolloff = 8 +vim.opt.signcolumn = "yes" + +vim.opt.backspace = { "start", "eol", "indent" } + +vim.opt.splitright = true +vim.opt.splitbelow = true + +vim.opt.hlsearch = true + +vim.opt.mouse = "a" +vim.g.editorconfig = true + +vim.g.markdown_folding = 1 diff --git a/.config/nvim-raw/lua/config/plugins.lua b/.config/nvim-raw/lua/config/plugins.lua new file mode 100644 index 0000000..f0b7619 --- /dev/null +++ b/.config/nvim-raw/lua/config/plugins.lua @@ -0,0 +1,97 @@ +vim.pack.add { + 'https://github.com/ollykel/v-vim', + 'https://github.com/hrsh7th/nvim-cmp', + 'https://github.com/saghen/blink.cmp', + 'https://github.com/alaviss/nim.nvim', + 'https://github.com/stevearc/oil.nvim', + 'https://github.com/folke/trouble.nvim', + 'https://github.com/nvim-mini/mini.nvim', + 'https://github.com/jiaoshijie/undotree', + 'https://github.com/thePrimeagen/harpoon', + 'https://github.com/hrsh7th/cmp-nvim-lsp', + 'https://github.com/mason-org/mason.nvim', + 'https://github.com/nvim-orgmode/orgmode', + 'https://github.com/windwp/nvim-autopairs', + 'https://github.com/neovim/nvim-lspconfig', + 'https://github.com/nvim-lua/plenary.nvim', + 'https://github.com/mfussenegger/nvim-lint', + 'https://github.com/akinsho/org-bullets.nvim', + 'https://github.com/nvim-lualine/lualine.nvim', + 'https://github.com/norcalli/nvim-colorizer.lua', + 'https://github.com/nvim-tree/nvim-web-devicons', + 'https://github.com/rafamadriz/friendly-snippets', + 'https://github.com/nvim-telescope/telescope.nvim', + 'https://github.com/mason-org/mason-lspconfig.nvim', + 'https://github.com/nvim-treesitter/nvim-treesitter', + 'https://github.com/brenoprata10/nvim-highlight-colors', + 'https://github.com/antosha417/nvim-lsp-file-operations', + 'https://github.com/nvim-telescope/telescope-ui-select.nvim', + 'https://github.com/MeanderingProgrammer/render-markdown.nvim', +} + +-- vlang +--vim.lsp.config.vlang.setup({}) + +-- oil +require("oil").setup({ default_file_explorer = true, + columns = {}, + keymaps = { + ["q"] = "actions.close", + }, + delete_to_trash = true, + view_options = { + show_hidden = true, + }, + skip_confirm_for_simple_edits = true, +}) +vim.keymap.set("n", "fm", "Oil", { desc = "Open parent directory" }) + +-- harpoon +vim.keymap.set("n", "ad", function() + harpoon:list():add() +end, { desc = "Harpoon add file" }) +vim.keymap.set("n", "", function() + harpoon.ui:toggle_quick_menu(harpoon:list()) +end) + +-- mason +require("mason").setup({ + opts = { + ui = { + icons = { + package_installed = "*", + package_pending = ">", + package_uninstalled = "x" + } + } + } +}) + +-- autopairs +require("nvim-autopairs").setup({ + check_ts = true, + ts_config = { + lua = { "string" }, + javascript = { "template_string" }, + java = false, + }, +}) + +-- lspconfig +vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts) +vim.keymap.set("n", "vca", function() vim.lsp.buf.code_action() end, opts) +vim.keymap.set("n", "vrn", function() vim.lsp.buf.rename() end, opts) + +-- lualine +require('lualine').setup { + options = { + icons_enabled = true, + theme = 'auto', + } +} + +-- colorizer +require("colorizer").setup() + +-- mason-lspconfig +require("mason-lspconfig").setup() diff --git a/.config/nvim-raw/nvim-pack-lock.json b/.config/nvim-raw/nvim-pack-lock.json new file mode 100644 index 0000000..dc69b9a --- /dev/null +++ b/.config/nvim-raw/nvim-pack-lock.json @@ -0,0 +1,116 @@ +{ + "plugins": { + "blink.cmp": { + "rev": "679a2ffad4bae720bb12e6bcdf57b0dd8b8a80f8", + "src": "https://github.com/saghen/blink.cmp" + }, + "cmp-nvim-lsp": { + "rev": "cbc7b02bb99fae35cb42f514762b89b5126651ef", + "src": "https://github.com/hrsh7th/cmp-nvim-lsp" + }, + "friendly-snippets": { + "rev": "6cd7280adead7f586db6fccbd15d2cac7e2188b9", + "src": "https://github.com/rafamadriz/friendly-snippets" + }, + "harpoon": { + "rev": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3", + "src": "https://github.com/thePrimeagen/harpoon" + }, + "lualine.nvim": { + "rev": "47f91c416daef12db467145e16bed5bbfe00add8", + "src": "https://github.com/nvim-lualine/lualine.nvim" + }, + "mason-lspconfig.nvim": { + "rev": "25f609e7fca78af7cede4f9fa3af8a94b1c4950b", + "src": "https://github.com/mason-org/mason-lspconfig.nvim" + }, + "mason.nvim": { + "rev": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65", + "src": "https://github.com/mason-org/mason.nvim" + }, + "mini.nvim": { + "rev": "3923662bf3d6ca49a9503f8d7196ea0450983e6a", + "src": "https://github.com/nvim-mini/mini.nvim" + }, + "nim.nvim": { + "rev": "9ee8fdc04ad3d7fcbd9679e0be3477543f17b9d9", + "src": "https://github.com/alaviss/nim.nvim" + }, + "nvim-autopairs": { + "rev": "59bce2eef357189c3305e25bc6dd2d138c1683f5", + "src": "https://github.com/windwp/nvim-autopairs" + }, + "nvim-cmp": { + "rev": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca", + "src": "https://github.com/hrsh7th/nvim-cmp" + }, + "nvim-colorizer.lua": { + "rev": "a065833f35a3a7cc3ef137ac88b5381da2ba302e", + "src": "https://github.com/norcalli/nvim-colorizer.lua" + }, + "nvim-highlight-colors": { + "rev": "e2cb22089cc2358b2b995c09578224f142de6039", + "src": "https://github.com/brenoprata10/nvim-highlight-colors" + }, + "nvim-lint": { + "rev": "4b03656c09c1561f89b6aa0665c15d292ba9499d", + "src": "https://github.com/mfussenegger/nvim-lint" + }, + "nvim-lsp-file-operations": { + "rev": "b9c795d3973e8eec22706af14959bc60c579e771", + "src": "https://github.com/antosha417/nvim-lsp-file-operations" + }, + "nvim-lspconfig": { + "rev": "8e2084bf5e40c79c1f42210a6ef96a0a4793a763", + "src": "https://github.com/neovim/nvim-lspconfig" + }, + "nvim-treesitter": { + "rev": "539abf6da5ee8702e37b82cc953131dadd570da2", + "src": "https://github.com/nvim-treesitter/nvim-treesitter" + }, + "nvim-web-devicons": { + "rev": "d7462543c9e366c0d196c7f67a945eaaf5d99414", + "src": "https://github.com/nvim-tree/nvim-web-devicons" + }, + "oil.nvim": { + "rev": "0fcc83805ad11cf714a949c98c605ed717e0b83e", + "src": "https://github.com/stevearc/oil.nvim" + }, + "org-bullets.nvim": { + "rev": "503fe053550879cc202086a40454e46a87c41ddb", + "src": "https://github.com/akinsho/org-bullets.nvim" + }, + "orgmode": { + "rev": "1ab7b456020de8bdaed7d8135b5376a0b4419b11", + "src": "https://github.com/nvim-orgmode/orgmode" + }, + "plenary.nvim": { + "rev": "b9fd5226c2f76c951fc8ed5923d85e4de065e509", + "src": "https://github.com/nvim-lua/plenary.nvim" + }, + "render-markdown.nvim": { + "rev": "c7188a8f9d2953696b6303caccbf39c51fa2c1b1", + "src": "https://github.com/MeanderingProgrammer/render-markdown.nvim" + }, + "telescope-ui-select.nvim": { + "rev": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2", + "src": "https://github.com/nvim-telescope/telescope-ui-select.nvim" + }, + "telescope.nvim": { + "rev": "cfb85dcf7f822b79224e9e6aef9e8c794211b20b", + "src": "https://github.com/nvim-telescope/telescope.nvim" + }, + "trouble.nvim": { + "rev": "bd67efe408d4816e25e8491cc5ad4088e708a69a", + "src": "https://github.com/folke/trouble.nvim" + }, + "undotree": { + "rev": "0e6d41d55ad147407e4ba00a292973de8db0b836", + "src": "https://github.com/jiaoshijie/undotree" + }, + "v-vim": { + "rev": "1dc1388bafb89072f8349dbd96f9462ae22237cb", + "src": "https://github.com/ollykel/v-vim" + } + } +} diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua deleted file mode 100644 index c32ed4e..0000000 --- a/.config/nvim/init.lua +++ /dev/null @@ -1,4 +0,0 @@ -require("config.keymaps") -require("config.options") -require("config.lazy") -require("caelus.init").colorscheme() diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json deleted file mode 100644 index 9233f0e..0000000 --- a/.config/nvim/lazy-lock.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, - "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, - "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" }, - "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, - "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "25f609e7fca78af7cede4f9fa3af8a94b1c4950b" }, - "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, - "mini.nvim": { "branch": "main", "commit": "3923662bf3d6ca49a9503f8d7196ea0450983e6a" }, - "nim.nvim": { "branch": "master", "commit": "9ee8fdc04ad3d7fcbd9679e0be3477543f17b9d9" }, - "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, - "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-highlight-colors": { "branch": "main", "commit": "e2cb22089cc2358b2b995c09578224f142de6039" }, - "nvim-lint": { "branch": "master", "commit": "4b03656c09c1561f89b6aa0665c15d292ba9499d" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "b9c795d3973e8eec22706af14959bc60c579e771" }, - "nvim-lspconfig": { "branch": "master", "commit": "8e2084bf5e40c79c1f42210a6ef96a0a4793a763" }, - "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" }, - "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, - "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" }, - "org-bullets.nvim": { "branch": "main", "commit": "503fe053550879cc202086a40454e46a87c41ddb" }, - "orgmode": { "branch": "master", "commit": "1ab7b456020de8bdaed7d8135b5376a0b4419b11" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "render-markdown.nvim": { "branch": "main", "commit": "c7188a8f9d2953696b6303caccbf39c51fa2c1b1" }, - "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, - "undotree": { "branch": "main", "commit": "0e6d41d55ad147407e4ba00a292973de8db0b836" }, - "v-vim": { "branch": "master", "commit": "1dc1388bafb89072f8349dbd96f9462ae22237cb" } -} diff --git a/.config/nvim/lua/caelus/init.lua b/.config/nvim/lua/caelus/init.lua deleted file mode 100644 index dec0a41..0000000 --- a/.config/nvim/lua/caelus/init.lua +++ /dev/null @@ -1,100 +0,0 @@ -local M = {}; - -local colors = { - bg = "#0f0f0f", - gray0 = "#141514"; - gray1 = "#1e1f1e"; - gray2 = "#272a28"; - gray3 = "#3b403c"; - gray4 = "#585f5b"; - gray5 = "#6c756f"; - gray6 = "#888e7b"; - gray7 = "#9a9c8b"; - gray8 = "#b6b69a"; - gray9 = "#d9cdb5"; - gray10 = "#e3d6c9"; - fg = "#f4decd", - red = "#f16e65"; - lred = "#ef968f"; - orange = "#ef934d"; - yellow = "#efbf71"; - green = "#7ec97e"; - lgreen = "#a4daa4"; - cyan = "#7ec9a3"; - lcyan = "#abd4bf"; - blue = "#71b4d6"; - lblue = "#b0d4e8"; - magenta = "#e28dc6"; - lmagenta = "#ebadd6"; -} - -function M.colorscheme() - vim.cmd("highlight clear") - vim.cmd("syntax reset") - - vim.o.background = "dark"; - vim.g.colors_name = "caelus"; - - local set = vim.api.nvim_set_hl - - -- ui - set(0, "Normal", { fg = colors.fg, bg = colors.bg }) - set(0, "NormalFloat", { fg = colors.fg, bg = colors.bg }) - set(0, "FloatBorder", { fg = colors.fg, bg = colors.bg }) - set(0, "CursorLine", { bg = colors.gray2 }) - set(0, "Visual", { bg = colors.gray3 }) - set(0, "Search", { fg = colors.bg, bg = colors.orange }) - set(0, "IncSearch", { fg = colors.bg, bg = colors.orange }) - set(0, "StatusLine", { bg = colors.gray2 }) - set(0, "StatusLineNC", { bg = colors.orange }) - set(0, "VertSplit", { fg = colors.gray8 }) - set(0, "WinSeparator", { fg = colors.gray8 }) - set(0, "LineNr", { fg = colors.gray6 }) - set(0, "CursorLineNr", { fg = colors.orange, bold = true }) - set(0, "SignColumn", { bg = colors.bg }) - set(0, "Folded", { fg = colors.gray8, bg = colors.gray3 }) - - -- popup - set(0, "Pmenu", { fg = colors.fg, bg = colors.gray10 }) - set(0, "PmenuSel", { fg = colors.bg, bg = colors.orange }) - set(0, "PmenuSbar", { bg = colors.gray10 }) - set(0, "PmenuThumb", { bg = colors.orange }) - - -- syntax - set(0, "Comment", { fg = colors.gray8, italic = true }) - set(0, "Constant", { fg = colors.magenta }) - set(0, "String", { fg = colors.green }) - set(0, "Identifier", { fg = colors.blue }) - set(0, "Function", { fg = colors.yellow }) - set(0, "Statement", { fg = colors.red }) - set(0, "Type", { fg = colors.cyan, bold = true }) - set(0, "Special", { fg = colors.yellow }) - set(0, "Error", { fg = colors.red, bold = true }) - set(0, "Keyword", { fg = colors.red }) - set(0, "Variable", { fg = colors.fg }) - set(0, "TSKeyword", { fg = colors.red }) - set(0, "TSFunction", { fg = colors.yellow }) - set(0, "TSVariable", { fg = colors.fg }) - set(0, "TSType", { fg = colors.cyan }) - - -- blink - set(0, "BlinkCmpMenu", { bg = colors.gray1 }) - set(0, "BlinkCmpMenuBorder", { fg = colors.gray6, bg = colors.gray1 }) - set(0, "BlinkCmpMenuSelection", { fg = colors.bg, bg = colors.orange }) - set(0, "BlinkCmpLabel", { fg = colors.fg }) - set(0, "BlinkCmpLabelDetail", { fg = colors.gray7 }) - set(0, "BlinkCmpLabelDescription",{ fg = colors.gray8 }) - set(0, "BlinkCmpLabelMatch", { fg = colors.orange, bold = true }) - set(0, "BlinkCmpKind", { fg = colors.cyan }) - set(0, "BlinkCmpDoc", { fg = colors.fg, bg = colors.gray2 }) - set(0, "BlinkCmpDocBorder", { fg = colors.gray5, bg = colors.gray2 }) - - if package.loaded['lualine'] then - require('lualine').setup({ - options = { theme = 'auto' }, - }) - end - -end - -return M diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua deleted file mode 100755 index e2987bc..0000000 --- a/.config/nvim/lua/config/keymaps.lua +++ /dev/null @@ -1,13 +0,0 @@ -localopts = { noremap = true, silent = true } - -vim.g.mapleader = " " -vim.g.maplocalleader = " " - -vim.keymap.set({"n", "v"}, "y", '"+y', { noremap = true, silent = true }) - -vim.keymap.set("v", "J", ":m '>+1gv=gv", { desc = "moves lines down in visual selection" }) -vim.keymap.set("v", "K", ":m '<-2gv=gv", { desc = "moves lines up in visual selection" }) - -vim.keymap.set("n", "al", "term", { desc = "Open terminal" }) - -vim.keymap.set("n", "f", vim.lsp.buf.format) diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua deleted file mode 100644 index c381a4b..0000000 --- a/.config/nvim/lua/config/lazy.lua +++ /dev/null @@ -1,35 +0,0 @@ --- Bootstrap lazy.nvim -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -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(lazypath) - --- Make sure to setup `mapleader` and `maplocalleader` before --- loading lazy.nvim so that mappings are correct. --- This is also a good place to setup other settings (vim.opt) -vim.g.mapleader = " " -vim.g.maplocalleader = "\\" - --- Setup lazy.nvim -require("lazy").setup({ - spec = { - -- import your plugins - { import = "plugins" }, - }, - -- Configure any other settings here. See the documentation for more details. - -- colorscheme that will be used when installing plugins. - install = { colorscheme = { "habamax" } }, - -- automatically check for plugin updates - checker = { enabled = true }, -}) diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua deleted file mode 100755 index dac7c76..0000000 --- a/.config/nvim/lua/config/options.lua +++ /dev/null @@ -1,40 +0,0 @@ -vim.cmd("let g:netrw_banner = 0") -vim.cmd("set termguicolors") - -vim.opt.guicursor = "" -vim.opt.nu = true -vim.opt.relativenumber = false - -vim.opt.tabstop = 2 -vim.opt.softtabstop = 2 -vim.opt.shiftwidth = 2 -vim.opt.expandtab = true -vim.opt.autoindent = true -vim.opt.smartindent = true -vim.opt.wrap = true - -vim.opt.swapfile = false -vim.opt.backup = false -vim.opt.undofile = true - -vim.opt.incsearch = true -vim.opt.inccommand = "split" -vim.opt.ignorecase = true -vim.opt.smartcase = true - -vim.opt.termguicolors = true -vim.opt.background = "dark" -vim.opt.scrolloff = 8 -vim.opt.signcolumn = "yes" - -vim.opt.backspace = { "start", "eol", "indent" } - -vim.opt.splitright = true -vim.opt.splitbelow = true - -vim.opt.hlsearch = true - -vim.opt.mouse = "a" -vim.g.editorconfig = true - -vim.g.markdown_folding = 1 diff --git a/.config/nvim/lua/plugins/auto-pairs.lua b/.config/nvim/lua/plugins/auto-pairs.lua deleted file mode 100755 index db98da2..0000000 --- a/.config/nvim/lua/plugins/auto-pairs.lua +++ /dev/null @@ -1,24 +0,0 @@ -return { - "windwp/nvim-autopairs", - event = { "InsertEnter" }, - dependencies = { - "hrsh7th/nvim-cmp", - }, - config = function() - local autopairs = require("nvim-autopairs") - - autopairs.setup({ - check_ts = true, - ts_config = { - lua = { "string" }, - javascript = { "template_string" }, - java = false, - }, - }) - - local cmp_autopairs = require("nvim-autopairs.completion.cmp") - local cmp = require("cmp") - - cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) - end, -} diff --git a/.config/nvim/lua/plugins/blink.lua b/.config/nvim/lua/plugins/blink.lua deleted file mode 100644 index e4dd63c..0000000 --- a/.config/nvim/lua/plugins/blink.lua +++ /dev/null @@ -1,53 +0,0 @@ -return { - 'saghen/blink.cmp', - -- optional: provides snippets for the snippet source - dependencies = { 'rafamadriz/friendly-snippets' }, - - -- use a release tag to download pre-built binaries - version = '1.*', - -- AND/OR build from source - -- build = 'cargo build --release', - -- If you use nix, you can build from source with: - -- build = 'nix run .#build-plugin', - - ---@module 'blink.cmp' - ---@type blink.cmp.Config - opts = { - -- 'default' (recommended) for mappings similar to built-in completions (C-y to accept) - -- 'super-tab' for mappings similar to vscode (tab to accept) - -- 'enter' for enter to accept - -- 'none' for no mappings - -- - -- All presets have the following mappings: - -- C-space: Open menu or open docs if already open - -- C-n/C-p or Up/Down: Select next/previous item - -- C-e: Hide menu - -- C-k: Toggle signature help (if signature.enabled = true) - -- - -- See :h blink-cmp-config-keymap for defining your own keymap - keymap = { preset = 'default' }, - - appearance = { - -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' - -- Adjusts spacing to ensure icons are aligned - nerd_font_variant = 'mono' - }, - - -- (Default) Only show the documentation popup when manually triggered - completion = { documentation = { auto_show = false } }, - - -- Default list of enabled providers defined so that you can extend it - -- elsewhere in your config, without redefining it, due to `opts_extend` - sources = { - default = { 'lsp', 'path', 'snippets', 'buffer' }, - }, - - -- (Default) Rust fuzzy matcher for typo resistance and significantly better performance - -- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation, - -- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"` - -- - -- See the fuzzy documentation for more information - fuzzy = { implementation = "prefer_rust_with_warning" } - }, - opts_extend = { "sources.default" } -} diff --git a/.config/nvim/lua/plugins/colorizer.lua b/.config/nvim/lua/plugins/colorizer.lua deleted file mode 100755 index dee6b43..0000000 --- a/.config/nvim/lua/plugins/colorizer.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "norcalli/nvim-colorizer.lua", - config = function() - require("colorizer").setup() - end, -} diff --git a/.config/nvim/lua/plugins/eslint.lua b/.config/nvim/lua/plugins/eslint.lua deleted file mode 100755 index ba74b8a..0000000 --- a/.config/nvim/lua/plugins/eslint.lua +++ /dev/null @@ -1,41 +0,0 @@ -return { - "mfussenegger/nvim-lint", - event = { "BufReadPre", "BufNewFile" }, - config = function() - local lint = require("lint") - local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) - local eslint = lint.linters.eslint_d - - -- if Eslint error configuration not found : change MasonInstall eslint@version or npm i -g eslint at a specific version - lint.linters_by_ft = { - javascript = { "eslint_d" }, - typescript = { "eslint_d" }, - javascriptreact = { "eslint_d" }, - typescriptreact = { "eslint_d" }, - svelte = { "eslint_d" }, - python = { "pylint" }, - } - - eslint.args = { - "--no-warn-ignored", - "--format", - "json", - "--stdin", - "--stdin-filename", - function() - return vim.fn.expand("%:p") - end, - } - - vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { - group = lint_augroup, - callback = function() - lint.try_lint() - end, - }) - - vim.keymap.set("n", "l", function() - lint.try_lint() - end, { desc = "Trigger linting for current file" }) - end, -} diff --git a/.config/nvim/lua/plugins/everpuccin.lua.bkp b/.config/nvim/lua/plugins/everpuccin.lua.bkp deleted file mode 100644 index 876c20a..0000000 --- a/.config/nvim/lua/plugins/everpuccin.lua.bkp +++ /dev/null @@ -1,330 +0,0 @@ -return { - "catppuccin/nvim", - name = "catppuccin", - lazy = false, - priority = 1000, - config = function() - require("catppuccin").setup({ - background = { - light = "latte", - dark = "mocha", - }, - color_overrides = { - macchiato = { - rosewater = "#ef958f", - flamingo = "#ef958f", - red = "#f16e65", - maroon = "#f16e65", - pink = "#ebadd6", - mauve = "#e28dc6", - peach = "#ef944d", - yellow = "#efbe71", - green = "#7dc97d", - teal = "#a4daa4", - sky = "#7dc9a3", - sapphire = "#abd4bf", - blue = "#b0d4e8", - lavender = "#72b4d6", - text = "#F9EEE5", - subtext1 = "#E3DAC9", - subtext0 = "#D8CCB4", - overlay2 = "#B6B69A", - overlay1 = "#999C8B", - overlay0 = "#878E7A", - surface2 = "#6B746E", - surface1 = "#585F5A", - surface0 = "#3A3F3C", - crust = "#272A28", - mantle = "#1D1F1E", - base = "#131414", - none = "#0f0f0f", - }, - }, - transparent_background = true, - show_end_of_buffer = false, - integration_default = false, - integrations = { - barbecue = { dim_dirname = true, bold_basename = true, dim_context = false, alt_background = false }, - cmp = true, - gitsigns = true, - hop = true, - illuminate = { enabled = true }, - native_lsp = { enabled = true, inlay_hints = { background = true } }, - neogit = true, - neotree = true, - semantic_tokens = true, - treesitter = true, - treesitter_context = true, - vimwiki = true, - which_key = true, - }, - highlight_overrides = { - all = function(colors) - return { - CmpItemMenu = { fg = colors.surface2 }, - CursorLineNr = { fg = colors.text }, - FloatBorder = { bg = colors.base, fg = colors.surface0 }, - GitSignsChange = { fg = colors.peach }, - LineNr = { fg = colors.overlay0 }, - LspInfoBorder = { link = "FloatBorder" }, - NeoTreeDirectoryIcon = { fg = colors.subtext1 }, - NeoTreeDirectoryName = { fg = colors.subtext1 }, - NeoTreeFloatBorder = { bg = colors.mantle, fg = colors.mantle }, - -- NeoTreeFloatBorder = { bg = "None" }, - NeoTreeGitConflict = { fg = colors.red }, - NeoTreeGitDeleted = { fg = colors.red }, - NeoTreeGitIgnored = { fg = colors.overlay0 }, - NeoTreeGitModified = { fg = colors.peach }, - NeoTreeGitStaged = { fg = colors.green }, - NeoTreeGitUnstaged = { fg = colors.red }, - NeoTreeGitUntracked = { fg = colors.green }, - NeoTreeIndent = { fg = colors.surface1 }, - NeoTreeNormal = { bg = colors.mantle }, - NeoTreeNormalNC = { bg = colors.mantle }, - NeoTreeRootName = { fg = colors.subtext1, style = { "bold" } }, - NeoTreeTabActive = { fg = colors.text, bg = colors.mantle }, - NeoTreeTabInactive = { fg = colors.surface2, bg = colors.crust }, - NeoTreeTabSeparatorActive = { fg = colors.mantle, bg = colors.mantle }, - NeoTreeTabSeparatorInactive = { fg = colors.crust, bg = colors.crust }, - NeoTreeWinSeparator = { fg = colors.base, bg = colors.base }, - NormalFloat = { bg = colors.base }, - Pmenu = { bg = colors.mantle, fg = "" }, - -- telescope prompt - TelescopePromptTitle = { fg = colors.mantle, bg = "#39fd9c", style = { "bold" } }, - TelescopePromptCounter = { fg = colors.red, style = { "bold" } }, - TelescopePromptBorder = { bg = colors.base }, - -- telescope results - TelescopeResultsTitle = { link = "TelescopePromptTitle" }, - TelescopeResultsBorder = { link = "TelescopePromptBorder" }, - -- telescope preview - TelescopePreviewTitle = { link = "TelescopePromptTitle" }, - TelescopePreviewBorder = { link = "TelescopePromptBorder" }, - VertSplit = { bg = colors.base, fg = colors.surface0 }, - WhichKeyFloat = { bg = colors.mantle }, - YankHighlight = { bg = colors.surface2 }, - FidgetTask = { fg = colors.subtext2 }, - FidgetTitle = { fg = colors.peach }, - - IblIndent = { fg = colors.surface0 }, - IblScope = { fg = colors.overlay0 }, - - Boolean = { fg = colors.mauve }, - Number = { fg = colors.mauve }, - Float = { fg = colors.mauve }, - - PreProc = { fg = colors.mauve }, - PreCondit = { fg = colors.mauve }, - Include = { fg = colors.mauve }, - Define = { fg = colors.mauve }, - Conditional = { fg = colors.red }, - Repeat = { fg = colors.red }, - Keyword = { fg = colors.red }, - Typedef = { fg = colors.red }, - Exception = { fg = colors.red }, - Statement = { fg = colors.red }, - - Error = { fg = colors.red }, - StorageClass = { fg = colors.peach }, - Tag = { fg = colors.peach }, - Label = { fg = colors.peach }, - Structure = { fg = colors.peach }, - Operator = { fg = colors.peach }, - Title = { fg = colors.peach }, - Special = { fg = colors.yellow }, - SpecialChar = { fg = colors.yellow }, - Type = { fg = colors.yellow, style = { "bold" } }, - Function = { fg = colors.green, style = { "bold" } }, - Delimiter = { fg = colors.subtext2 }, - Ignore = { fg = colors.subtext2 }, - Macro = { fg = colors.teal }, - - TSAnnotation = { fg = colors.mauve }, - TSAttribute = { fg = colors.mauve }, - TSBoolean = { fg = colors.mauve }, - TSCharacter = { fg = colors.teal }, - TSCharacterSpecial = { link = "SpecialChar" }, - TSComment = { link = "Comment" }, - TSConditional = { fg = colors.red }, - TSConstBuiltin = { fg = colors.mauve }, - TSConstMacro = { fg = colors.mauve }, - TSConstant = { fg = colors.text }, - TSConstructor = { fg = colors.green }, - TSDebug = { link = "Debug" }, - TSDefine = { link = "Define" }, - TSEnvironment = { link = "Macro" }, - TSEnvironmentName = { link = "Type" }, - TSError = { link = "Error" }, - TSException = { fg = colors.red }, - TSField = { fg = colors.blue }, - TSFloat = { fg = colors.mauve }, - TSFuncBuiltin = { fg = colors.green }, - TSFuncMacro = { fg = colors.green }, - TSFunction = { fg = colors.green }, - TSFunctionCall = { fg = colors.lavender }, - TSInclude = { fg = colors.red }, - TSKeyword = { fg = colors.red }, - TSKeywordFunction = { fg = colors.red }, - TSKeywordOperator = { fg = colors.peach }, - TSKeywordReturn = { fg = colors.red }, - TSLabel = { fg = colors.peach }, - TSLiteral = { link = "String" }, - TSMath = { fg = colors.blue }, - TSMethod = { fg = colors.green }, - TSMethodCall = { fg = colors.green }, - TSNamespace = { fg = colors.yellow }, - TSNone = { fg = colors.text }, - TSNumber = { fg = colors.mauve }, - TSOperator = { fg = colors.peach }, - TSParameter = { fg = colors.text }, - TSParameterReference = { fg = colors.text }, - TSPreProc = { link = "PreProc" }, - TSProperty = { fg = colors.blue }, - TSPunctBracket = { fg = colors.text }, - TSPunctDelimiter = { link = "Delimiter" }, - TSPunctSpecial = { fg = colors.blue }, - TSRepeat = { fg = colors.red }, - TSStorageClass = { fg = colors.peach }, - TSStorageClassLifetime = { fg = colors.peach }, - TSStrike = { fg = colors.subtext2 }, - TSString = { fg = colors.green }, - TSStringEscape = { fg = colors.mauve }, - TSStringRegex = { fg = colors.green }, - TSStringSpecial = { link = "SpecialChar" }, - TSSymbol = { fg = colors.text }, - TSTag = { fg = colors.peach }, - TSTagAttribute = { fg = colors.green }, - TSTagDelimiter = { fg = colors.green }, - TSText = { fg = colors.green }, - TSTextReference = { link = "Constant" }, - TSTitle = { link = "Title" }, - TSTodo = { link = "Todo" }, - TSType = { fg = colors.yellow, style = { "bold" } }, - TSTypeBuiltin = { fg = colors.yellow, style = { "bold" } }, - TSTypeDefinition = { fg = colors.yellow, style = { "bold" } }, - TSTypeQualifier = { fg = colors.peach, style = { "bold" } }, - TSURI = { fg = colors.blue }, - TSVariable = { fg = colors.text }, - TSVariableBuiltin = { fg = colors.mauve }, - - ["@annotation"] = { link = "TSAnnotation" }, - ["@attribute"] = { link = "TSAttribute" }, - ["@boolean"] = { link = "TSBoolean" }, - ["@character"] = { link = "TSCharacter" }, - ["@character.special"] = { link = "TSCharacterSpecial" }, - ["@comment"] = { link = "TSComment" }, - ["@conceal"] = { link = "Grey" }, - ["@conditional"] = { link = "TSConditional" }, - ["@constant"] = { link = "TSConstant" }, - ["@constant.builtin"] = { link = "TSConstBuiltin" }, - ["@constant.macro"] = { link = "TSConstMacro" }, - ["@constructor"] = { link = "TSConstructor" }, - ["@debug"] = { link = "TSDebug" }, - ["@define"] = { link = "TSDefine" }, - ["@error"] = { link = "TSError" }, - ["@exception"] = { link = "TSException" }, - ["@field"] = { link = "TSField" }, - ["@float"] = { link = "TSFloat" }, - ["@function"] = { link = "TSFunction" }, - ["@function.builtin"] = { link = "TSFuncBuiltin" }, - ["@function.call"] = { link = "TSFunctionCall" }, - ["@function.macro"] = { link = "TSFuncMacro" }, - ["@include"] = { link = "TSInclude" }, - ["@keyword"] = { link = "TSKeyword" }, - ["@keyword.function"] = { link = "TSKeywordFunction" }, - ["@keyword.operator"] = { link = "TSKeywordOperator" }, - ["@keyword.return"] = { link = "TSKeywordReturn" }, - ["@label"] = { link = "TSLabel" }, - ["@math"] = { link = "TSMath" }, - ["@method"] = { link = "TSMethod" }, - ["@method.call"] = { link = "TSMethodCall" }, - ["@namespace"] = { link = "TSNamespace" }, - ["@none"] = { link = "TSNone" }, - ["@number"] = { link = "TSNumber" }, - ["@operator"] = { link = "TSOperator" }, - ["@parameter"] = { link = "TSParameter" }, - ["@parameter.reference"] = { link = "TSParameterReference" }, - ["@preproc"] = { link = "TSPreProc" }, - ["@property"] = { link = "TSProperty" }, - ["@punctuation.bracket"] = { link = "TSPunctBracket" }, - ["@punctuation.delimiter"] = { link = "TSPunctDelimiter" }, - ["@punctuation.special"] = { link = "TSPunctSpecial" }, - ["@repeat"] = { link = "TSRepeat" }, - ["@storageclass"] = { link = "TSStorageClass" }, - ["@storageclass.lifetime"] = { link = "TSStorageClassLifetime" }, - ["@strike"] = { link = "TSStrike" }, - ["@string"] = { link = "TSString" }, - ["@string.escape"] = { link = "TSStringEscape" }, - ["@string.regex"] = { link = "TSStringRegex" }, - ["@string.special"] = { link = "TSStringSpecial" }, - ["@symbol"] = { link = "TSSymbol" }, - ["@tag"] = { link = "TSTag" }, - ["@tag.attribute"] = { link = "TSTagAttribute" }, - ["@tag.delimiter"] = { link = "TSTagDelimiter" }, - ["@text"] = { link = "TSText" }, - ["@text.danger"] = { link = "TSDanger" }, - ["@text.diff.add"] = { link = "diffAdded" }, - ["@text.diff.delete"] = { link = "diffRemoved" }, - ["@text.emphasis"] = { link = "TSEmphasis" }, - ["@text.environment"] = { link = "TSEnvironment" }, - ["@text.environment.name"] = { link = "TSEnvironmentName" }, - ["@text.literal"] = { link = "TSLiteral" }, - ["@text.math"] = { link = "TSMath" }, - ["@text.note"] = { link = "TSNote" }, - ["@text.reference"] = { link = "TSTextReference" }, - ["@text.strike"] = { link = "TSStrike" }, - ["@text.strong"] = { link = "TSStrong" }, - ["@text.title"] = { link = "TSTitle" }, - ["@text.todo"] = { link = "TSTodo" }, - ["@text.todo.checked"] = { link = "Green" }, - ["@text.todo.unchecked"] = { link = "Ignore" }, - ["@text.underline"] = { link = "TSUnderline" }, - ["@text.uri"] = { link = "TSURI" }, - ["@text.warning"] = { link = "TSWarning" }, - ["@todo"] = { link = "TSTodo" }, - ["@type"] = { link = "TSType" }, - ["@type.builtin"] = { link = "TSTypeBuiltin" }, - ["@type.definition"] = { link = "TSTypeDefinition" }, - ["@type.qualifier"] = { link = "TSTypeQualifier" }, - ["@uri"] = { link = "TSURI" }, - ["@variable"] = { link = "TSVariable" }, - ["@variable.builtin"] = { link = "TSVariableBuiltin" }, - - ["@lsp.type.class"] = { link = "TSType" }, - ["@lsp.type.comment"] = { link = "TSComment" }, - ["@lsp.type.decorator"] = { link = "TSFunction" }, - ["@lsp.type.enum"] = { link = "TSType" }, - ["@lsp.type.enumMember"] = { link = "TSProperty" }, - ["@lsp.type.events"] = { link = "TSLabel" }, - ["@lsp.type.function"] = { link = "TSFunction" }, - ["@lsp.type.interface"] = { link = "TSType" }, - ["@lsp.type.keyword"] = { link = "TSKeyword" }, - ["@lsp.type.macro"] = { link = "TSConstMacro" }, - ["@lsp.type.method"] = { link = "TSMethod" }, - ["@lsp.type.modifier"] = { link = "TSTypeQualifier" }, - ["@lsp.type.namespace"] = { link = "TSNamespace" }, - ["@lsp.type.number"] = { link = "TSNumber" }, - ["@lsp.type.operator"] = { link = "TSOperator" }, - ["@lsp.type.parameter"] = { link = "TSParameter" }, - ["@lsp.type.property"] = { link = "TSProperty" }, - ["@lsp.type.regexp"] = { link = "TSStringRegex" }, - ["@lsp.type.string"] = { link = "TSString" }, - ["@lsp.type.struct"] = { link = "TSType" }, - ["@lsp.type.type"] = { link = "TSType" }, - ["@lsp.type.typeParameter"] = { link = "TSTypeDefinition" }, - ["@lsp.type.variable"] = { link = "TSVariable" }, - } - end, - latte = function(colors) - return { - IblIndent = { fg = colors.mantle }, - IblScope = { fg = colors.surface1 }, - - LineNr = { fg = colors.surface1 }, - } - end, - }, - }) - - vim.api.nvim_command("colorscheme catppuccin-macchiato") - end, -} diff --git a/.config/nvim/lua/plugins/harpoon.lua b/.config/nvim/lua/plugins/harpoon.lua deleted file mode 100755 index 407b7f0..0000000 --- a/.config/nvim/lua/plugins/harpoon.lua +++ /dev/null @@ -1,26 +0,0 @@ -return { - "thePrimeagen/harpoon", - enabled = true, - branch = "harpoon2", - dependencies = { - "nvim-lua/plenary.nvim", - }, - - config = function() - local harpoon = require("harpoon") - - harpoon:setup({ - global_settings = { - save_on_toggle = true, - save_on_change = true, - }, - }) - - vim.keymap.set("n", "ad", function() - harpoon:list():add() - end, { desc = "Harpoon add file" }) - vim.keymap.set("n", "", function() - harpoon.ui:toggle_quick_menu(harpoon:list()) - end) - end, -} diff --git a/.config/nvim/lua/plugins/highlight-colors.lua b/.config/nvim/lua/plugins/highlight-colors.lua deleted file mode 100755 index 5c97573..0000000 --- a/.config/nvim/lua/plugins/highlight-colors.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "brenoprata10/nvim-highlight-colors", - config = function() - vim.opt.termguicolors = true - - require("nvim-highlight-colors").setup({}) - end, -} diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua deleted file mode 100755 index bd748fc..0000000 --- a/.config/nvim/lua/plugins/lspconfig.lua +++ /dev/null @@ -1,35 +0,0 @@ -return { - "neovim/nvim-lspconfig", - event = { "BufReadPre", "BufNewFile" }, - dependencies = { - "hrsh7th/cmp-nvim-lsp", - { "antosha417/nvim-lsp-file-operations", config = true }, - }, - config = function() - vim.diagnostic.config({ - update_in_insert = true, - float = { - focusable = false, - style = "minimal", - border = "rounded", - source = "always", - header = "", - prefix = "", - } - }) - - vim.diagnostic.config({ virtual_text = true }) - - local lsp_configurations = require('lspconfig.configs') - - local capabilities = vim.tbl_deep_extend( - "force", - {}, - vim.lsp.protocol.make_client_capabilities(), - require('cmp_nvim_lsp').default_capabilities() - ) - end, - vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts), - vim.keymap.set("n", "vca", function() vim.lsp.buf.code_action() end, opts), - vim.keymap.set("n", "vrn", function() vim.lsp.buf.rename() end, opts) -} diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua deleted file mode 100755 index 34ec658..0000000 --- a/.config/nvim/lua/plugins/lualine.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - 'nvim-lualine/lualine.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, - config = function() - require('lualine').setup { - options = { - icons_enabled = true, - theme = 'auto', - } - } - end, -} diff --git a/.config/nvim/lua/plugins/markdown.lua b/.config/nvim/lua/plugins/markdown.lua deleted file mode 100755 index 01af860..0000000 --- a/.config/nvim/lua/plugins/markdown.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "MeanderingProgrammer/render-markdown.nvim", - dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-mini/mini.nvim" }, -- if you use the mini.nvim suite - -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins - -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons - ---@module 'render-markdown' - ---@type render.md.UserConfig - opts = {}, -} diff --git a/.config/nvim/lua/plugins/mason-lspconfig.lua b/.config/nvim/lua/plugins/mason-lspconfig.lua deleted file mode 100644 index aed1bd5..0000000 --- a/.config/nvim/lua/plugins/mason-lspconfig.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "mason-org/mason-lspconfig.nvim", - opts = {}, - dependencies = { - { "mason-org/mason.nvim", opts = {} }, - "neovim/nvim-lspconfig", - }, -} diff --git a/.config/nvim/lua/plugins/mason.lua b/.config/nvim/lua/plugins/mason.lua deleted file mode 100644 index 9188cda..0000000 --- a/.config/nvim/lua/plugins/mason.lua +++ /dev/null @@ -1,13 +0,0 @@ -return{ - "mason-org/mason.nvim", - opts = { - ui = { - icons = { - package_installed = "✓", - package_pending = "➜", - package_uninstalled = "✗" - } - } - } -} - diff --git a/.config/nvim/lua/plugins/nim.lua b/.config/nvim/lua/plugins/nim.lua deleted file mode 100644 index d079f68..0000000 --- a/.config/nvim/lua/plugins/nim.lua +++ /dev/null @@ -1,3 +0,0 @@ -return{ - "alaviss/nim.nvim" -} diff --git a/.config/nvim/lua/plugins/oil.lua b/.config/nvim/lua/plugins/oil.lua deleted file mode 100644 index 5d153fd..0000000 --- a/.config/nvim/lua/plugins/oil.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - "stevearc/oil.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - require("oil").setup({ - default_file_explorer = true, - columns = {}, - keymaps = { - ["q"] = "actions.close", - }, - delete_to_trash = true, - view_options = { - show_hidden = true, - }, - skip_confirm_for_simple_edits = true, - }) - - vim.keymap.set("n", "fm", "Oil", { desc = "Open parent directory" }) - end, -} diff --git a/.config/nvim/lua/plugins/orgmode.lua b/.config/nvim/lua/plugins/orgmode.lua deleted file mode 100755 index 0945852..0000000 --- a/.config/nvim/lua/plugins/orgmode.lua +++ /dev/null @@ -1,17 +0,0 @@ -return { - { - "nvim-orgmode/orgmode", - config = function() - require("orgmode").setup({ - org_agenda_files = "~/orgfiles/**/*", - org_default_notes_file = "~/orgfiles/refile.org", - }) - end, - }, - { - "akinsho/org-bullets.nvim", - config = function() - require("org-bullets").setup() - end, - }, -} diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua deleted file mode 100755 index 99f1f5b..0000000 --- a/.config/nvim/lua/plugins/telescope.lua +++ /dev/null @@ -1,25 +0,0 @@ -return { - { - "nvim-telescope/telescope.nvim", - tag = "0.1.8", - dependencies = { "nvim-lua/plenary.nvim" }, - config = function() - local builtin = require("telescope.builtin") - vim.keymap.set("n", "fj", builtin.find_files, {}) - vim.keymap.set("n", "fl", builtin.live_grep, {}) - end, - }, - { - "nvim-telescope/telescope-ui-select.nvim", - config = function() - require("telescope").setup({ - extensions = { - ["ui-select"] = { - require("telescope.themes").get_dropdown({}), - }, - }, - }) - require("telescope").load_extension("ui-select") - end, - }, -} diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua deleted file mode 100755 index 90b57fb..0000000 --- a/.config/nvim/lua/plugins/treesitter.lua +++ /dev/null @@ -1,15 +0,0 @@ -return { - "nvim-treesitter/nvim-treesitter", - branch = "master", - lazy = false, - build = ":TSUpdate", - config = function() - local config = require("lazy") - config.setup({ - auto_install = true, - highlight = { enable = true }, - ensure_installed = { "v", "c", "lua", "vim", "markeown" }, - indent = { enable = true }, - }) - end, -} diff --git a/.config/nvim/lua/plugins/trouble.lua b/.config/nvim/lua/plugins/trouble.lua deleted file mode 100644 index 3741f30..0000000 --- a/.config/nvim/lua/plugins/trouble.lua +++ /dev/null @@ -1,37 +0,0 @@ -return { - "folke/trouble.nvim", - opts = {}, -- for default options, refer to the configuration section for custom setup. - cmd = "Trouble", - keys = { - { - "xx", - "Trouble diagnostics toggle", - desc = "Diagnostics (Trouble)", - }, - { - "xX", - "Trouble diagnostics toggle filter.buf=0", - desc = "Buffer Diagnostics (Trouble)", - }, - { - "cs", - "Trouble symbols toggle focus=false", - desc = "Symbols (Trouble)", - }, - { - "cl", - "Trouble lsp toggle focus=false win.position=right", - desc = "LSP Definitions / references / ... (Trouble)", - }, - { - "xL", - "Trouble loclist toggle", - desc = "Location List (Trouble)", - }, - { - "xQ", - "Trouble qflist toggle", - desc = "Quickfix List (Trouble)", - }, - }, -} diff --git a/.config/nvim/lua/plugins/undotree.lua b/.config/nvim/lua/plugins/undotree.lua deleted file mode 100755 index 88a2038..0000000 --- a/.config/nvim/lua/plugins/undotree.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "jiaoshijie/undotree", - dependencies = "nvim-lua/plenary.nvim", - config = true, - keys = { - { "u", "lua require('undotree').toggle()" }, - }, -} diff --git a/.config/nvim/lua/plugins/vlang.lua b/.config/nvim/lua/plugins/vlang.lua deleted file mode 100644 index 8199b3c..0000000 --- a/.config/nvim/lua/plugins/vlang.lua +++ /dev/null @@ -1,7 +0,0 @@ -return { - 'neovim/nvim-lspconfig', - config = function() - require('lspconfig').vlang.setup({}) - end, - 'ollykel/v-vim' -} diff --git a/.config/vis/plugins/complete-filename/init.lua b/.config/vis/plugins/complete-filename/init.lua new file mode 100644 index 0000000..db0f2a7 --- /dev/null +++ b/.config/vis/plugins/complete-filename/init.lua @@ -0,0 +1,68 @@ +local complete_filename = function(expand) + local win = vis.win + local file = win.file + local pos = win.selection.pos + if not pos then return end + + -- TODO do something clever here + local range = file:text_object_longword(pos > 0 and pos-1 or pos); + if not range then return end + if range.finish > pos then range.finish = pos end + + local prefix = file:content(range) + if not prefix then return end + + -- Strip leading delimiters for some programming languages + local _, j = prefix:find(".*[{[(<'\"]+") + if not expand and j then prefix = prefix:sub(j + 1) end + + if prefix:match("^%s*$") then + prefix = "" + range.start = pos + range.finish = pos + end + + -- Expand tilda for the home directory + _, j = prefix:find('^~') + if j ~= nil then + local home = assert(os.getenv("HOME"), "$HOME variable not set!") + prefix = home .. prefix:sub(j + 1) + end + + local status, out, err + if prefix:sub(1, 1) == ":" then + status, out, err = vis:complete_command(prefix:sub(2)) + if out then + out = out:gsub("\n$", ""):sub(#prefix) .. " " + end + pos = range.start + #prefix + expand = false + else + local cmdfmt = "vis-complete --file '%s'" + if expand then cmdfmt = "vis-open -- '%s'*" end + status, out, err = vis:pipe(cmdfmt:format(prefix:gsub("'", "'\\''"))) + end + if status ~= 0 or not out then + if err then vis:info(err) end + return + end + out = out:gsub("\n$", "") + + if expand then + file:delete(range) + pos = range.start + end + + file:insert(pos, out) + win.selection.pos = pos + #out +end + +-- complete file path at primary selection location using vis-complete(1) +vis:map(vis.modes.INSERT, "", function() + complete_filename(false); +end, "Complete file name") + +-- complete file path at primary selection location using vis-open(1) +vis:map(vis.modes.INSERT, "", function() + complete_filename(true); +end, "Complete file name (expands path) or command") diff --git a/.config/vis/plugins/vis-autoclose b/.config/vis/plugins/vis-autoclose new file mode 160000 index 0000000..9ab1d30 --- /dev/null +++ b/.config/vis/plugins/vis-autoclose @@ -0,0 +1 @@ +Subproject commit 9ab1d301a0e59c9366416f5c8030354b3de514fb diff --git a/.config/vis/plugins/vis-colorizer b/.config/vis/plugins/vis-colorizer new file mode 160000 index 0000000..0d67d0f --- /dev/null +++ b/.config/vis/plugins/vis-colorizer @@ -0,0 +1 @@ +Subproject commit 0d67d0f809d1779c5a01fc5a58c045608238ee93 diff --git a/.config/vis/plugins/vis-lspc b/.config/vis/plugins/vis-lspc new file mode 160000 index 0000000..97d8bfa --- /dev/null +++ b/.config/vis/plugins/vis-lspc @@ -0,0 +1 @@ +Subproject commit 97d8bfa7adff156afe1dcf1e833c6dd864f6b5bf diff --git a/.config/vis/themes/caelus.lua b/.config/vis/themes/caelus.lua new file mode 100644 index 0000000..4078b14 --- /dev/null +++ b/.config/vis/themes/caelus.lua @@ -0,0 +1,39 @@ +local lexers = vis.lexers + +local lightyellow = '#efbf71' +local lightgray = '#9a9c8b' +local darkgray = '#1e1f1e' + +lexers.STYLE_DEFAULT = 'back:black,fore:white' +lexers.STYLE_NOTHING = 'back:black' +lexers.STYLE_CLASS = 'fore:cyan,bold' +lexers.STYLE_COMMENT = 'fore:white' +lexers.STYLE_CONSTANT = 'fore:cyan' +lexers.STYLE_DEFINITION = 'fore:white' +lexers.STYLE_ERROR = 'fore:red' +lexers.STYLE_FUNCTION = 'fore:'..lightyellow +lexers.STYLE_KEYWORD = 'fore:red' +lexers.STYLE_LABEL = 'fore:white' +lexers.STYLE_NUMBER = 'fore:magenta' +lexers.STYLE_OPERATOR = 'fore:white' +lexers.STYLE_REGEX = 'fore:white' +lexers.STYLE_STRING = 'fore:green' +lexers.STYLE_PREPROCESSOR = 'fore:white' +lexers.STYLE_TAG = 'fore:white' +lexers.STYLE_TYPE = 'fore:cyan,bold' +lexers.STYLE_VARIABLE = 'fore:white' +lexers.STYLE_WHITESPACE = '' +lexers.STYLE_EMBEDDED = 'fore:white' +lexers.STYLE_IDENTIFIER = 'fore:blue' +lexers.STYLE_LINENUMBER = 'fore:white' +lexers.STYLE_LINENUMBER_CURSOR = lexers.STYLE_LINENUMBER +lexers.STYLE_CURSOR = 'reverse' +lexers.STYLE_CURSOR_PRIMARY = lexers.STYLE_CURSOR..',fore:cyan' +lexers.STYLE_CURSOR_LINE = 'underlined' +lexers.STYLE_COLOR_COLUMN = 'back:black' +lexers.STYLE_SELECTION = 'fore:black,back:yellow' +lexers.STYLE_STATUS = 'back:'..darkgray..'fore:'..lightgray +lexers.STYLE_STATUS_FOCUSED = 'fore:'..darkgray..',back:'..lightgray..',bold' +lexers.STYLE_SEPARATOR = lexers.STYLE_DEFAULT +lexers.STYLE_INFO = 'fore:default,back:default,bold' +lexers.STYLE_EOF = '' diff --git a/.config/vis/visrc.lua b/.config/vis/visrc.lua new file mode 100644 index 0000000..948151f --- /dev/null +++ b/.config/vis/visrc.lua @@ -0,0 +1,25 @@ +-- load standard vis module, providing parts of the Lua API, sets _G.vis +require('vis') + +-- global configuration options +vis.events.subscribe(vis.events.INIT, function() + vis:command("set theme caelus") +end) +-- per-window configuration options +vis.events.subscribe(vis.events.WIN_OPEN, function(win) + vis:command("set tabwidth 2") + vis:command("set numbers true") +end) + + -- plugins -- + +-- colorizer +local colorizer = require('plugins/vis-colorizer') +colorizer.three = false +colorizer.six = true +-- complete-filename +local completefilename = require('plugins/complete-filename') +-- vis-lspc +local lsp = require('plugins/vis-lspc') +-- vis-autoclose +local autoclose = require('plugins/vis-autoclose') -- cgit v1.2.3