diff options
| author | dacctal <dacctalyt@gmail.com> | 2026-04-19 15:58:03 +0000 |
|---|---|---|
| committer | dacctal <dacctalyt@gmail.com> | 2026-04-19 15:58:03 +0000 |
| commit | 2e6e6d04b2c24a0666b015ef4f73718e2fe7c861 (patch) | |
| tree | 51ee086d8e075d0d01ce01a1855058f95ecdf74d | |
| parent | d19b491454c9f793d2e311dd09f70a88240dda29 (diff) | |
added vis and nvim-12+ configs
| -rw-r--r-- | .config/nvim-lazy/init.lua (renamed from .config/nvim/init.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim-lazy/lazy-lock.json (renamed from .config/nvim/lazy-lock.json) | 0 | ||||
| -rw-r--r-- | .config/nvim-lazy/lua/caelus/init.lua (renamed from .config/nvim/lua/caelus/init.lua) | 0 | ||||
| -rwxr-xr-x | .config/nvim-lazy/lua/config/keymaps.lua (renamed from .config/nvim/lua/config/keymaps.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim-lazy/lua/config/lazy.lua (renamed from .config/nvim/lua/config/lazy.lua) | 0 | ||||
| -rwxr-xr-x | .config/nvim-lazy/lua/config/options.lua (renamed from .config/nvim/lua/config/options.lua) | 0 | ||||
| -rwxr-xr-x | .config/nvim-lazy/lua/plugins/auto-pairs.lua (renamed from .config/nvim/lua/plugins/auto-pairs.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim-lazy/lua/plugins/blink.lua (renamed from .config/nvim/lua/plugins/blink.lua) | 0 | ||||
| -rwxr-xr-x | .config/nvim-lazy/lua/plugins/colorizer.lua (renamed from .config/nvim/lua/plugins/colorizer.lua) | 0 | ||||
| -rwxr-xr-x | .config/nvim-lazy/lua/plugins/eslint.lua (renamed from .config/nvim/lua/plugins/eslint.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim-lazy/lua/plugins/everpuccin.lua.bkp (renamed from .config/nvim/lua/plugins/everpuccin.lua.bkp) | 0 | ||||
| -rwxr-xr-x | .config/nvim-lazy/lua/plugins/harpoon.lua (renamed from .config/nvim/lua/plugins/harpoon.lua) | 0 | ||||
| -rwxr-xr-x | .config/nvim-lazy/lua/plugins/highlight-colors.lua (renamed from .config/nvim/lua/plugins/highlight-colors.lua) | 0 | ||||
| -rwxr-xr-x | .config/nvim-lazy/lua/plugins/lspconfig.lua (renamed from .config/nvim/lua/plugins/lspconfig.lua) | 0 | ||||
| -rwxr-xr-x | .config/nvim-lazy/lua/plugins/lualine.lua (renamed from .config/nvim/lua/plugins/lualine.lua) | 0 | ||||
| -rwxr-xr-x | .config/nvim-lazy/lua/plugins/markdown.lua (renamed from .config/nvim/lua/plugins/markdown.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim-lazy/lua/plugins/mason-lspconfig.lua (renamed from .config/nvim/lua/plugins/mason-lspconfig.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim-lazy/lua/plugins/mason.lua (renamed from .config/nvim/lua/plugins/mason.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim-lazy/lua/plugins/nim.lua (renamed from .config/nvim/lua/plugins/nim.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim-lazy/lua/plugins/oil.lua (renamed from .config/nvim/lua/plugins/oil.lua) | 0 | ||||
| -rwxr-xr-x | .config/nvim-lazy/lua/plugins/orgmode.lua (renamed from .config/nvim/lua/plugins/orgmode.lua) | 0 | ||||
| -rwxr-xr-x | .config/nvim-lazy/lua/plugins/telescope.lua (renamed from .config/nvim/lua/plugins/telescope.lua) | 0 | ||||
| -rwxr-xr-x | .config/nvim-lazy/lua/plugins/treesitter.lua (renamed from .config/nvim/lua/plugins/treesitter.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim-lazy/lua/plugins/trouble.lua (renamed from .config/nvim/lua/plugins/trouble.lua) | 0 | ||||
| -rwxr-xr-x | .config/nvim-lazy/lua/plugins/undotree.lua (renamed from .config/nvim/lua/plugins/undotree.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim-lazy/lua/plugins/vlang.lua (renamed from .config/nvim/lua/plugins/vlang.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim-raw/init.lua | 4 | ||||
| -rw-r--r-- | .config/nvim-raw/lua/caelus/init.lua | 100 | ||||
| -rwxr-xr-x | .config/nvim-raw/lua/config/keymaps.lua | 13 | ||||
| -rwxr-xr-x | .config/nvim-raw/lua/config/options.lua | 40 | ||||
| -rw-r--r-- | .config/nvim-raw/lua/config/plugins.lua | 97 | ||||
| -rw-r--r-- | .config/nvim-raw/nvim-pack-lock.json | 116 | ||||
| -rw-r--r-- | .config/vis/plugins/complete-filename/init.lua | 68 | ||||
| m--------- | .config/vis/plugins/vis-autoclose | 0 | ||||
| m--------- | .config/vis/plugins/vis-colorizer | 0 | ||||
| m--------- | .config/vis/plugins/vis-lspc | 0 | ||||
| -rw-r--r-- | .config/vis/themes/caelus.lua | 39 | ||||
| -rw-r--r-- | .config/vis/visrc.lua | 25 |
38 files changed, 502 insertions, 0 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim-lazy/init.lua index c32ed4e..c32ed4e 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim-lazy/init.lua diff --git a/.config/nvim/lazy-lock.json b/.config/nvim-lazy/lazy-lock.json index 9233f0e..9233f0e 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim-lazy/lazy-lock.json diff --git a/.config/nvim/lua/caelus/init.lua b/.config/nvim-lazy/lua/caelus/init.lua index dec0a41..dec0a41 100644 --- a/.config/nvim/lua/caelus/init.lua +++ b/.config/nvim-lazy/lua/caelus/init.lua diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim-lazy/lua/config/keymaps.lua index e2987bc..e2987bc 100755 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim-lazy/lua/config/keymaps.lua diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim-lazy/lua/config/lazy.lua index c381a4b..c381a4b 100644 --- a/.config/nvim/lua/config/lazy.lua +++ b/.config/nvim-lazy/lua/config/lazy.lua diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim-lazy/lua/config/options.lua index dac7c76..dac7c76 100755 --- a/.config/nvim/lua/config/options.lua +++ b/.config/nvim-lazy/lua/config/options.lua diff --git a/.config/nvim/lua/plugins/auto-pairs.lua b/.config/nvim-lazy/lua/plugins/auto-pairs.lua index db98da2..db98da2 100755 --- a/.config/nvim/lua/plugins/auto-pairs.lua +++ b/.config/nvim-lazy/lua/plugins/auto-pairs.lua diff --git a/.config/nvim/lua/plugins/blink.lua b/.config/nvim-lazy/lua/plugins/blink.lua index e4dd63c..e4dd63c 100644 --- a/.config/nvim/lua/plugins/blink.lua +++ b/.config/nvim-lazy/lua/plugins/blink.lua diff --git a/.config/nvim/lua/plugins/colorizer.lua b/.config/nvim-lazy/lua/plugins/colorizer.lua index dee6b43..dee6b43 100755 --- a/.config/nvim/lua/plugins/colorizer.lua +++ b/.config/nvim-lazy/lua/plugins/colorizer.lua diff --git a/.config/nvim/lua/plugins/eslint.lua b/.config/nvim-lazy/lua/plugins/eslint.lua index ba74b8a..ba74b8a 100755 --- a/.config/nvim/lua/plugins/eslint.lua +++ b/.config/nvim-lazy/lua/plugins/eslint.lua diff --git a/.config/nvim/lua/plugins/everpuccin.lua.bkp b/.config/nvim-lazy/lua/plugins/everpuccin.lua.bkp index 876c20a..876c20a 100644 --- a/.config/nvim/lua/plugins/everpuccin.lua.bkp +++ b/.config/nvim-lazy/lua/plugins/everpuccin.lua.bkp diff --git a/.config/nvim/lua/plugins/harpoon.lua b/.config/nvim-lazy/lua/plugins/harpoon.lua index 407b7f0..407b7f0 100755 --- a/.config/nvim/lua/plugins/harpoon.lua +++ b/.config/nvim-lazy/lua/plugins/harpoon.lua diff --git a/.config/nvim/lua/plugins/highlight-colors.lua b/.config/nvim-lazy/lua/plugins/highlight-colors.lua index 5c97573..5c97573 100755 --- a/.config/nvim/lua/plugins/highlight-colors.lua +++ b/.config/nvim-lazy/lua/plugins/highlight-colors.lua diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim-lazy/lua/plugins/lspconfig.lua index bd748fc..bd748fc 100755 --- a/.config/nvim/lua/plugins/lspconfig.lua +++ b/.config/nvim-lazy/lua/plugins/lspconfig.lua diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim-lazy/lua/plugins/lualine.lua index 34ec658..34ec658 100755 --- a/.config/nvim/lua/plugins/lualine.lua +++ b/.config/nvim-lazy/lua/plugins/lualine.lua diff --git a/.config/nvim/lua/plugins/markdown.lua b/.config/nvim-lazy/lua/plugins/markdown.lua index 01af860..01af860 100755 --- a/.config/nvim/lua/plugins/markdown.lua +++ b/.config/nvim-lazy/lua/plugins/markdown.lua diff --git a/.config/nvim/lua/plugins/mason-lspconfig.lua b/.config/nvim-lazy/lua/plugins/mason-lspconfig.lua index aed1bd5..aed1bd5 100644 --- a/.config/nvim/lua/plugins/mason-lspconfig.lua +++ b/.config/nvim-lazy/lua/plugins/mason-lspconfig.lua diff --git a/.config/nvim/lua/plugins/mason.lua b/.config/nvim-lazy/lua/plugins/mason.lua index 9188cda..9188cda 100644 --- a/.config/nvim/lua/plugins/mason.lua +++ b/.config/nvim-lazy/lua/plugins/mason.lua diff --git a/.config/nvim/lua/plugins/nim.lua b/.config/nvim-lazy/lua/plugins/nim.lua index d079f68..d079f68 100644 --- a/.config/nvim/lua/plugins/nim.lua +++ b/.config/nvim-lazy/lua/plugins/nim.lua diff --git a/.config/nvim/lua/plugins/oil.lua b/.config/nvim-lazy/lua/plugins/oil.lua index 5d153fd..5d153fd 100644 --- a/.config/nvim/lua/plugins/oil.lua +++ b/.config/nvim-lazy/lua/plugins/oil.lua diff --git a/.config/nvim/lua/plugins/orgmode.lua b/.config/nvim-lazy/lua/plugins/orgmode.lua index 0945852..0945852 100755 --- a/.config/nvim/lua/plugins/orgmode.lua +++ b/.config/nvim-lazy/lua/plugins/orgmode.lua diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim-lazy/lua/plugins/telescope.lua index 99f1f5b..99f1f5b 100755 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim-lazy/lua/plugins/telescope.lua diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim-lazy/lua/plugins/treesitter.lua index 90b57fb..90b57fb 100755 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim-lazy/lua/plugins/treesitter.lua diff --git a/.config/nvim/lua/plugins/trouble.lua b/.config/nvim-lazy/lua/plugins/trouble.lua index 3741f30..3741f30 100644 --- a/.config/nvim/lua/plugins/trouble.lua +++ b/.config/nvim-lazy/lua/plugins/trouble.lua diff --git a/.config/nvim/lua/plugins/undotree.lua b/.config/nvim-lazy/lua/plugins/undotree.lua index 88a2038..88a2038 100755 --- a/.config/nvim/lua/plugins/undotree.lua +++ b/.config/nvim-lazy/lua/plugins/undotree.lua diff --git a/.config/nvim/lua/plugins/vlang.lua b/.config/nvim-lazy/lua/plugins/vlang.lua index 8199b3c..8199b3c 100644 --- a/.config/nvim/lua/plugins/vlang.lua +++ b/.config/nvim-lazy/lua/plugins/vlang.lua 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 '>+1<CR>gv=gv", { desc = "moves lines down in visual selection" }) +vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv", { desc = "moves lines up in visual selection" }) + +vim.keymap.set("n", "<leader>al", "<CMD>term<CR>", { desc = "Open terminal" }) + +vim.keymap.set("n", "<leader>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", "<leader>fm", "<CMD>Oil<CR>", { desc = "Open parent directory" }) + +-- harpoon +vim.keymap.set("n", "<leader>ad", function() + harpoon:list():add() +end, { desc = "Harpoon add file" }) +vim.keymap.set("n", "<C-e>", 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", "<leader>vca", function() vim.lsp.buf.code_action() end, opts) +vim.keymap.set("n", "<leader>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/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, "<C-x><C-f>", function() + complete_filename(false); +end, "Complete file name") + +-- complete file path at primary selection location using vis-open(1) +vis:map(vis.modes.INSERT, "<C-x><C-o>", 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 +Subproject 9ab1d301a0e59c9366416f5c8030354b3de514f diff --git a/.config/vis/plugins/vis-colorizer b/.config/vis/plugins/vis-colorizer new file mode 160000 +Subproject 0d67d0f809d1779c5a01fc5a58c045608238ee9 diff --git a/.config/vis/plugins/vis-lspc b/.config/vis/plugins/vis-lspc new file mode 160000 +Subproject 97d8bfa7adff156afe1dcf1e833c6dd864f6b5b 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') |
