From 2e6b46179bcd575ba8ae93ebaf04ccc33f22ece4 Mon Sep 17 00:00:00 2001 From: Julien Raynal Date: Thu, 14 Nov 2024 14:41:58 +0100 Subject: [PATCH 1/4] local setup --- init.lua | 8 ++++---- lua/custom/plugins/remote-nvim.lua | 10 ++++++++++ lua/custom/plugins/venv-selector.lua | 25 +++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 lua/custom/plugins/remote-nvim.lua create mode 100644 lua/custom/plugins/venv-selector.lua diff --git a/init.lua b/init.lua index 4ce35f4b5c4..3c83b523967 100644 --- a/init.lua +++ b/init.lua @@ -616,7 +616,7 @@ require('lazy').setup({ local servers = { -- clangd = {}, -- gopls = {}, - -- pyright = {}, + pyright = {}, -- rust_analyzer = {}, -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs -- @@ -927,17 +927,17 @@ require('lazy').setup({ -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- -- require 'kickstart.plugins.debug', - -- require 'kickstart.plugins.indent_line', + require 'kickstart.plugins.indent_line', -- require 'kickstart.plugins.lint', -- require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', + require 'kickstart.plugins.neo-tree', -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- This is the easiest way to modularize your config. -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, -- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- Or use telescope! diff --git a/lua/custom/plugins/remote-nvim.lua b/lua/custom/plugins/remote-nvim.lua new file mode 100644 index 00000000000..a06ee0e19fe --- /dev/null +++ b/lua/custom/plugins/remote-nvim.lua @@ -0,0 +1,10 @@ +return { + 'amitds1997/remote-nvim.nvim', + version = '*', -- Pin to GitHub releases + dependencies = { + 'nvim-lua/plenary.nvim', -- For standard functions + 'MunifTanjim/nui.nvim', -- To build the plugin UI + 'nvim-telescope/telescope.nvim', -- For picking b/w different remote methods + }, + config = true, +} diff --git a/lua/custom/plugins/venv-selector.lua b/lua/custom/plugins/venv-selector.lua new file mode 100644 index 00000000000..8b06f4ad2fd --- /dev/null +++ b/lua/custom/plugins/venv-selector.lua @@ -0,0 +1,25 @@ +return { + 'linux-cultist/venv-selector.nvim', + dependencies = { + 'neovim/nvim-lspconfig', + 'mfussenegger/nvim-dap', + 'mfussenegger/nvim-dap-python', --optional + { 'nvim-telescope/telescope.nvim', branch = '0.1.x', dependencies = { 'nvim-lua/plenary.nvim' } }, + }, + lazy = false, + branch = 'regexp', -- This is the regexp branch, use this for the new version + config = function() + require('venv-selector').setup { + settings = { + search = { + find_pixi_venvs = { + command = 'find .pixi/envs/*/bin -name python', + }, + }, + }, + } + end, + keys = { + { 'v', 'VenvSelect' }, + }, +} From 25595e89707b113095d9e672e9b9d746b2c2250d Mon Sep 17 00:00:00 2001 From: Julien Raynal Date: Wed, 11 Dec 2024 11:18:31 +0100 Subject: [PATCH 2/4] update --- init.lua | 5 ++-- lua/custom/plugins/nvim-repl.lua | 21 ++++++++++++++++ lua/custom/plugins/remote-nvim.lua | 10 -------- lua/custom/plugins/venv-selector.lua | 25 -------------------- lua/custom/plugins/vim-language-nextflow.lua | 3 +++ 5 files changed, 27 insertions(+), 37 deletions(-) create mode 100644 lua/custom/plugins/nvim-repl.lua delete mode 100644 lua/custom/plugins/remote-nvim.lua delete mode 100644 lua/custom/plugins/venv-selector.lua create mode 100644 lua/custom/plugins/vim-language-nextflow.lua diff --git a/init.lua b/init.lua index 3c83b523967..fd7de2088fa 100644 --- a/init.lua +++ b/init.lua @@ -838,13 +838,14 @@ require('lazy').setup({ -- change the command in the config to whatever the name of that colorscheme is. -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', + 'catppuccin/nvim', + name = 'catppuccin', priority = 1000, -- Make sure to load this before all the other start plugins. init = function() -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' + vim.cmd.colorscheme 'catppuccin-macchiato' -- You can configure highlights by doing something like: vim.cmd.hi 'Comment gui=none' diff --git a/lua/custom/plugins/nvim-repl.lua b/lua/custom/plugins/nvim-repl.lua new file mode 100644 index 00000000000..d6cc2a3e527 --- /dev/null +++ b/lua/custom/plugins/nvim-repl.lua @@ -0,0 +1,21 @@ +return { + 'pappasam/nvim-repl', + lazy = false, + init = function() + vim.g['repl_filetype_commands'] = { + bash = 'bash', + javascript = 'node', + haskell = 'ghci', + python = 'ipython --no-autoindent', + r = 'R', + sh = 'sh', + vim = 'nvim --clean -ERM', + zsh = 'zsh', + } + end, + keys = { + { 'sc', '(ReplSendCell)', mode = 'n', desc = 'Send Repl Cell' }, + { 'sl', '(ReplSendLine)', mode = 'n', desc = 'Send Repl Line' }, + { 'sr', '(ReplSendVisual)', mode = 'v', desc = 'Send Repl Visual Selection' }, + }, +} diff --git a/lua/custom/plugins/remote-nvim.lua b/lua/custom/plugins/remote-nvim.lua deleted file mode 100644 index a06ee0e19fe..00000000000 --- a/lua/custom/plugins/remote-nvim.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - 'amitds1997/remote-nvim.nvim', - version = '*', -- Pin to GitHub releases - dependencies = { - 'nvim-lua/plenary.nvim', -- For standard functions - 'MunifTanjim/nui.nvim', -- To build the plugin UI - 'nvim-telescope/telescope.nvim', -- For picking b/w different remote methods - }, - config = true, -} diff --git a/lua/custom/plugins/venv-selector.lua b/lua/custom/plugins/venv-selector.lua deleted file mode 100644 index 8b06f4ad2fd..00000000000 --- a/lua/custom/plugins/venv-selector.lua +++ /dev/null @@ -1,25 +0,0 @@ -return { - 'linux-cultist/venv-selector.nvim', - dependencies = { - 'neovim/nvim-lspconfig', - 'mfussenegger/nvim-dap', - 'mfussenegger/nvim-dap-python', --optional - { 'nvim-telescope/telescope.nvim', branch = '0.1.x', dependencies = { 'nvim-lua/plenary.nvim' } }, - }, - lazy = false, - branch = 'regexp', -- This is the regexp branch, use this for the new version - config = function() - require('venv-selector').setup { - settings = { - search = { - find_pixi_venvs = { - command = 'find .pixi/envs/*/bin -name python', - }, - }, - }, - } - end, - keys = { - { 'v', 'VenvSelect' }, - }, -} diff --git a/lua/custom/plugins/vim-language-nextflow.lua b/lua/custom/plugins/vim-language-nextflow.lua new file mode 100644 index 00000000000..f681cd7949e --- /dev/null +++ b/lua/custom/plugins/vim-language-nextflow.lua @@ -0,0 +1,3 @@ +return { + 'nextflow-io/vim-language-nextflow', +} From b2499bb16d06541562db3173efb31b5c5ced7905 Mon Sep 17 00:00:00 2001 From: Julien Raynal Date: Thu, 2 Oct 2025 15:21:17 +0200 Subject: [PATCH 3/4] Update --- init.lua | 44 ++++++++++++++++++++++++++++----- lua/kickstart/plugins/debug.lua | 2 +- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/init.lua b/init.lua index fd7de2088fa..001f0903d09 100644 --- a/init.lua +++ b/init.lua @@ -115,7 +115,7 @@ vim.opt.showmode = false -- Remove this option if you want your OS clipboard to remain independent. -- See `:help 'clipboard'` vim.schedule(function() - vim.opt.clipboard = 'unnamedplus' + vim.opt.clipboard = 'unnamed' end) -- Enable break indent @@ -456,8 +456,8 @@ require('lazy').setup({ 'neovim/nvim-lspconfig', dependencies = { -- Automatically install LSPs and related tools to stdpath for Neovim - { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants - 'williamboman/mason-lspconfig.nvim', + { 'mason-org/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants + 'mason-org/mason-lspconfig.nvim', 'WhoIsSethDaniel/mason-tool-installer.nvim', -- Useful status updates for LSP. @@ -553,7 +553,7 @@ require('lazy').setup({ -- -- When you move your cursor, the highlights will be cleared (the second autocommand). local client = vim.lsp.get_client_by_id(event.data.client_id) - if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight) then + if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight) then local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { buffer = event.buf, @@ -616,8 +616,27 @@ require('lazy').setup({ local servers = { -- clangd = {}, -- gopls = {}, - pyright = {}, - -- rust_analyzer = {}, + -- pyright = {}, + -- pylsp = {}, + --ty = {}, + --ruff = {}, + zuban = {}, + r_language_server = {}, + rust_analyzer = { + ['rust_analyzer'] = { + settings = { + diagnostic = { enable = false }, + checkOnSave = { enable = false }, + }, + }, + }, + bacon = {}, + ['bacon-ls'] = { + init_options = { + updateOnSave = true, + updateOnSaveWaitMillis = 1000, + }, + }, -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs -- -- Some languages (like typescript) have entire language plugins that can be useful: @@ -667,6 +686,7 @@ require('lazy').setup({ -- by the server configuration above. Useful when disabling -- certain features of an LSP (for example, turning off formatting for ts_ls) server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) + require('lspconfig')[server_name].setup(server) end, }, @@ -968,3 +988,15 @@ require('lazy').setup({ -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et +-- + +-- Gopass +vim.api.nvim_create_autocmd({ 'BufNewFile', 'BufRead' }, { + pattern = '/private/**/gopass**', + callback = function() + vim.opt_local.swapfile = false + vim.opt_local.backup = false + vim.opt_local.undofile = false + vim.opt_local.shadafile = '' + end, +}) diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua index 2226d963442..897345b0940 100644 --- a/lua/kickstart/plugins/debug.lua +++ b/lua/kickstart/plugins/debug.lua @@ -18,7 +18,7 @@ return { 'nvim-neotest/nvim-nio', -- Installs the debug adapters for you - 'williamboman/mason.nvim', + 'mason-org/mason.nvim', 'jay-babu/mason-nvim-dap.nvim', -- Add your own debuggers here From f420d02066fd43866014fad8dd2efe8ad47b6c1b Mon Sep 17 00:00:00 2001 From: Julien Raynal Date: Thu, 2 Oct 2025 15:37:16 +0200 Subject: [PATCH 4/4] Removed tokyonight --- init.lua | 7 ------- 1 file changed, 7 deletions(-) diff --git a/init.lua b/init.lua index a735cdcf5e9..08fc0dd4cd8 100644 --- a/init.lua +++ b/init.lua @@ -905,13 +905,6 @@ require('lazy').setup({ name = 'catppuccin', priority = 1000, -- Make sure to load this before all the other start plugins. config = function() - ---@diagnostic disable-next-line: missing-fields - require('tokyonight').setup { - styles = { - comments = { italic = false }, -- Disable italics in comments - }, - } - -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.