Commit 2fe26bb1d6b312fdc0cb162c35824d3181d51a2e Parent: 2de9e1056a0dedc5518c137a2354f57ff9fc29cf Author: matt colligan <mlv@posteo.net> Date: 2025-06-06 11:26:58 +0100 Committer: matt colligan <mlv@posteo.net> Committed: 2025-06-06 11:26:58 +0100 use lazy lua
start/vim-gutentags Deleted
@@ -1 +0,0 @@
-Subproject commit aa47c5e29c37c52176c44e61c780032dfacef3dd
start/supermaven-nvim Deleted
@@ -1 +0,0 @@
-Subproject commit 07d20fce48a5629686aefb0a7cd4b25e33947d50
start/self/plugin/theme.vim Modified
@@ -79,6 +79,3 @@ "" character for split barrier "set fillchars=vert:\ "hi VertSplit cterm=bold term=bold ctermbg=12 - -" neovim stuff -colorscheme catppuccin-macchiato
start/self/plugin/settings.vim Modified
@@ -70,10 +70,6 @@ " set ttym=sgr " endif -let g:indentLine_defaultGroup = 'LineNr' -let g:indentLine_char_list = ['|', '¦', '┆', '┊'] -let g:indentLine_conceallevel = 0 - runtime macros/emoji-ab.vim " Only linters listed explicitly will be run. @@ -104,11 +100,5 @@ let g:vim_json_conceal=0 let g:markdown_syntax_conceal=0 -" Blamer plugin disable by default -let g:blamer_delay = 1000 -let g:blamer_show_in_insert_modes = 0 -let g:blamer_date_format = '%d/%m/%y' -highlight Blamer guifg=lightgrey - " used by Ctrl-P, likely among other things set wildignore+=*/tmp/*,*.so,*.swp,*.zip,node_modules,target,.mypy_cache
start/self/plugin/init.lua Modified
@@ -1,24 +1,166 @@ # neovim lua config -require("supermaven-nvim").setup({ - keymaps = { - accept_suggestion = "<Tab>", - clear_suggestion = "<S-Tab>", - } -}) +-- Initialize 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 = "\\" + +-- for nvim-tree.lua +vim.g.loaded_netrw = 1 +vim.g.loaded_netrwPlugin = 1 -require('lualine').setup({ - options = { - section_separators = '', - component_separators = '', - path = 3, +-- Setup lazy.nvim +require("lazy").setup({ + { + 'catppuccin/nvim', + name = "catppuccin", + lazy = false, + priority = 1000, + init = function() + vim.cmd [[colorscheme catppuccin-mocha]] + end, + }, + { + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + opts = { + options = { + section_separators = '', + component_separators = '', + path = 3, + }, + sections = { + lualine_a = {'mode'}, + lualine_b = {}, + lualine_c = {'filename'}, + lualine_x = {'encoding', 'fileformat', 'filetype'}, + lualine_y = {'progress'}, + lualine_z = {'location'} + }, + }, + }, + { + 'Yggdroot/indentLine', + init = function() + vim.g.indentLine_defaultGroup = 'LineNr' + vim.g.indentLine_char_list = {'|', '¦', '┆', '┊'} + vim.g.indentLine_conceallevel = 0 + end + }, + { 'neovimhaskell/haskell-vim' }, + { 'dense-analysis/ale' }, + { + 'nvim-telescope/telescope.nvim', + tag = '0.1.8', + dependencies = { 'nvim-lua/plenary.nvim' }, + opts = { + defaults = { + mappings = { + }, + preview = false, + }, + pickers = { + }, + extensions = { + } + }, + }, + { + 'ctrlpvim/ctrlp.vim', + }, + { + 'ludovicchabant/vim-gutentags', + }, + --{ + -- 'prichrd/netrw.nvim', + -- dependencies = { 'nvim-tree/nvim-web-devicons' }, + -- opts = {}, + -- use_devicons = true, + --}, + --{ + -- 'nvim-tree/nvim-tree.lua', + -- lazy = false, + -- dependencies = { + -- "nvim-tree/nvim-web-devicons", + -- }, + -- opts = {}, + --}, + --{ + -- "supermaven-inc/supermaven-nvim", + -- opts = { + -- keymaps = { + -- accept_suggestion = "<Tab>", + -- clear_suggestion = "<S-Tab>", + -- } + -- }, + --}, + { + "yetone/avante.nvim", + event = "VeryLazy", + version = false, + opts = { + provider = "claude", + --providers = { + -- openai = { + -- endpoint = "https://api.openai.com/v1", + -- model = "gpt-4o", -- your desired model (or use gpt-4o, etc.) + -- extra_request_body = { + -- timeout = 30000, -- Timeout in milliseconds, increase this for reasoning models + -- temperature = 0.75, + -- max_completion_tokens = 8192, -- Increase this to include reasoning tokens (for reasoning models) + -- --reasoning_effort = "medium", -- low|medium|high, only used for reasoning models + -- }, + -- }, + --}, + }, + dependencies = { + "nvim-treesitter/nvim-treesitter", + "stevearc/dressing.nvim", + "nvim-lua/plenary.nvim", + "MunifTanjim/nui.nvim", + --- The below dependencies are optional, + "nvim-telescope/telescope.nvim", -- for file_selector provider telescope + "hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions + "nvim-tree/nvim-web-devicons", + { + -- support for image pasting + "HakonHarnes/img-clip.nvim", + event = "VeryLazy", + opts = { + default = { + embed_image_as_base64 = false, + prompt_for_file_name = false, + drag_and_drop = { + insert_mode = true, + }, + }, + }, }, - sections = { - lualine_a = {'mode'}, - lualine_b = {}, - lualine_c = {'filename'}, - lualine_x = {'encoding', 'fileformat', 'filetype'}, - lualine_y = {'progress'}, - lualine_z = {'location'} + { + 'MeanderingProgrammer/render-markdown.nvim', + opts = { + file_types = { "markdown", "Avante" }, + }, + ft = { "markdown", "Avante" }, }, + }, +} })
start/lualine.nvim Deleted
@@ -1 +0,0 @@
-Subproject commit b431d228b7bbcdaea818bdc3e25b8cdbe861f056
start/indentLine Deleted
@@ -1 +0,0 @@
-Subproject commit b96a75985736da969ac38b72a7716a8c57bdde98
start/haskell-vim Deleted
@@ -1 +0,0 @@
-Subproject commit f35d02204b4813d1dbe8b0e98cc39701a4b8e15e
start/dhall-vim Deleted
@@ -1 +0,0 @@
-Subproject commit bd9fd99f21dbc7174fb728a21d04e073ef7dd930
start/ctrlp.vim Deleted
@@ -1 +0,0 @@
-Subproject commit 31be4c36b713a9637c7b530ee52127000a05ea39
start/catppuccin Deleted
@@ -1 +0,0 @@
-Subproject commit 7be452ee067978cdc8b2c5f3411f0c71ffa612b9
start/blamer.nvim Deleted
@@ -1 +0,0 @@
-Subproject commit e0d43c11697300eb68f00d69df8b87deb0bf52dc
start/ale Deleted
@@ -1 +0,0 @@
-Subproject commit 2e5f135836a700dcc6b787f10097ebdeb8e22abb
.gitmodules Modified
@@ -1,33 +1,3 @@ -[submodule "start/ale"] - path = start/ale - url = https://github.com/dense-analysis/ale [submodule "start/tide"] path = start/tide url = https://github.com/m-col/tide -[submodule "start/haskell-vim"] - path = start/haskell-vim - url = https://github.com/neovimhaskell/haskell-vim.git -[submodule "start/dhall-vim"] - path = start/dhall-vim - url = https://github.com/vmchale/dhall-vim.git -[submodule "start/indentLine"] - path = start/indentLine - url = https://github.com/Yggdroot/indentLine -[submodule "start/ctrlp.vim"] - path = start/ctrlp.vim - url = https://github.com/ctrlpvim/ctrlp.vim -[submodule "start/vim-gutentags"] - path = start/vim-gutentags - url = https://github.com/ludovicchabant/vim-gutentags -[submodule "start/blamer.nvim"] - path = start/blamer.nvim - url = https://github.com/APZelos/blamer.nvim -[submodule "start/supermaven-nvim"] - path = start/supermaven-nvim - url = https://github.com/supermaven-inc/supermaven-nvim -[submodule "start/catppuccin"] - path = start/catppuccin - url = https://github.com/catppuccin/nvim -[submodule "start/lualine.nvim"] - path = start/lualine.nvim - url = https://github.com/nvim-lualine/lualine.nvim