From f6ec1a5e28976827514b7b930418b8b956977374 Mon Sep 17 00:00:00 2001 From: Daniel Nachun Date: Mon, 24 Nov 2025 16:25:15 -0800 Subject: [PATCH 1/4] switch to blink --- dot_config/nvim/lazyvim.json | 11 +- dot_config/nvim/lua/plugins/blink.lua | 10 ++ .../nvim/lua/plugins/nvim-cmp_config.lua | 128 ------------------ 3 files changed, 16 insertions(+), 133 deletions(-) create mode 100644 dot_config/nvim/lua/plugins/blink.lua delete mode 100644 dot_config/nvim/lua/plugins/nvim-cmp_config.lua diff --git a/dot_config/nvim/lazyvim.json b/dot_config/nvim/lazyvim.json index 1f79c7f..7309b9d 100644 --- a/dot_config/nvim/lazyvim.json +++ b/dot_config/nvim/lazyvim.json @@ -1,8 +1,8 @@ { "extras": [ + "lazyvim.plugins.extras.coding.blink", "lazyvim.plugins.extras.coding.mini-surround", "lazyvim.plugins.extras.coding.neogen", - "lazyvim.plugins.extras.coding.nvim-cmp", "lazyvim.plugins.extras.coding.yanky", "lazyvim.plugins.extras.dap.core", "lazyvim.plugins.extras.dap.nlua", @@ -24,6 +24,7 @@ "lazyvim.plugins.extras.lang.clangd", "lazyvim.plugins.extras.lang.cmake", "lazyvim.plugins.extras.lang.docker", + "lazyvim.plugins.extras.lang.dotnet", "lazyvim.plugins.extras.lang.git", "lazyvim.plugins.extras.lang.go", "lazyvim.plugins.extras.lang.haskell", @@ -33,7 +34,6 @@ "lazyvim.plugins.extras.lang.markdown", "lazyvim.plugins.extras.lang.nushell", "lazyvim.plugins.extras.lang.ocaml", - "lazyvim.plugins.extras.lang.omnisharp", "lazyvim.plugins.extras.lang.prisma", "lazyvim.plugins.extras.lang.python", "lazyvim.plugins.extras.lang.r", @@ -61,8 +61,9 @@ "lazyvim.plugins.extras.util.project", "lazyvim.plugins.extras.util.startuptime" ], + "install_version": 7, "news": { - "NEWS.md": "10960" + "NEWS.md": "11866" }, - "version": 7 -} + "version": 8 +} \ No newline at end of file diff --git a/dot_config/nvim/lua/plugins/blink.lua b/dot_config/nvim/lua/plugins/blink.lua new file mode 100644 index 0000000..c7ec2a7 --- /dev/null +++ b/dot_config/nvim/lua/plugins/blink.lua @@ -0,0 +1,10 @@ +return { + "saghen/blink.cmp", + opts = { + keymap = { + preset = "enter", + [""] = { "select_next", "snippet_forward", "fallback" }, + [""] = { "select_prev", "snippet_backward", "fallback" }, + }, + } +} diff --git a/dot_config/nvim/lua/plugins/nvim-cmp_config.lua b/dot_config/nvim/lua/plugins/nvim-cmp_config.lua deleted file mode 100644 index 3b03f13..0000000 --- a/dot_config/nvim/lua/plugins/nvim-cmp_config.lua +++ /dev/null @@ -1,128 +0,0 @@ -return { - "hrsh7th/nvim-cmp", - dependencies = { - "amarz45/nvim-cmp-buffer-lines", - "chrisgrieser/cmp_yanky", - "delphinus/cmp-ctags", - "Dosx001/cmp-commit", - "hrsh7th/cmp-nvim-lua", - "hrsh7th/cmp-calc", - "hrsh7th/cmp-nvim-lsp-signature-help", - "hrsh7th/cmp-nvim-lsp-document-symbol", - "hrsh7th/cmp-cmdline", - "KadoBOT/cmp-plugins", - "lukas-reineke/cmp-rg", - "micangl/cmp-vimtex", - "petertriho/cmp-git", - "rasulomaroff/cmp-bufname", - "ray-x/cmp-treesitter", - "rcarriga/cmp-dap", - "tamago324/cmp-zsh" - }, - enabled = function() - return vim.api.nvim_buf_get_option(0, "buftype") ~= "prompt" - or require("cmp_dap").is_dap_buffer() - end, - opts = function(_, opts) - local cmp = require("cmp") - - local has_words_before = function() - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil - end - - local feedkey = function(key, mode) - vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true) - end - - local lspkind = require("lspkind") - - - opts.mapping = vim.tbl_extend("force", opts.mapping, { - [""] = cmp.mapping.abort(), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif vim.snippet.active({ direction = 1 }) then - vim.schedule(function() - vim.snippet.jump(1) - end) - elseif has_words_before() then - cmp.complete() - else - fallback() -- The fallback function sends a already mapped key. In this case, it's probably ``. - end - end, { "i", "s" }), - [""] = cmp.mapping(function() - if cmp.visible() then - cmp.select_prev_item() - elseif vim.snippet.active({ direction = -1 }) then - vim.schedule(function() - vim.snippet.jump(-1) - end) - end - end, { "i", "s" }), - [""] = cmp.mapping({ - i = function(fallback) - if cmp.visible() then - cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }) - else - fallback() - end - end, - s = cmp.mapping.confirm({ select = true }), - c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }), - }), - }) - - opts.sources = opts.sources or {} - table.insert( - opts.sources, - { - -- { name = "buffer-lines" }, - { name = "bufname" }, - { name = "calc" }, - { name = "cmp_yanky" }, - { name = "ctags" }, - { name = "nvim_lsp_signature_help"}, - { name = "nvim_lsp_signature_help"}, - { name = "nvim_lua" }, - { name = "rg" }, - { name = "vimtex" }, - { name = "zsh" } - } - ) - - -- Set configuration for git. - cmp.setup.filetype("gitcommit", { - sources = cmp.config.sources({ - { name = "cmp_git" }, - { name = "commit" }, - { name = "buffer" }, - }), - }) - - cmp.setup.filetype({ "dap-repl", "dapui_watches", "dapui_hover" }, { - sources = { - { name = "dap" }, - }, - }) - -- - -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore). - -- cmp.setup.cmdline({ "/", "?" }, { - -- mapping = cmp.mapping.preset.cmdline(), - -- sources = { - -- { name = "buffer" }, - -- }, - -- }) - - -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). - -- cmp.setup.cmdline(":", { - -- mapping = cmp.mapping.preset.cmdline(), - -- sources = cmp.config.sources({ - -- { name = "path" }, - -- { name = "cmdline" }, - -- }), - -- }) - end, -} From d580992b30f176e0f92a1eea893e47f03243aea5 Mon Sep 17 00:00:00 2001 From: Daniel Nachun Date: Mon, 24 Nov 2025 17:15:48 -0800 Subject: [PATCH 2/4] switch to blink --- dot_config/nvim/lua/plugins/blink.lua | 81 +++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dot_config/nvim/lua/plugins/blink.lua b/dot_config/nvim/lua/plugins/blink.lua index c7ec2a7..864746b 100644 --- a/dot_config/nvim/lua/plugins/blink.lua +++ b/dot_config/nvim/lua/plugins/blink.lua @@ -1,10 +1,91 @@ return { "saghen/blink.cmp", + dependencies = { + { "mikavilpas/blink-ripgrep.nvim", version = "*" }, + { "Kaiser-Yang/blink-cmp-git" }, + { "ribru17/blink-cmp-spell" }, + { "mgalliou/blink-cmp-tmux" }, + { "bydlw98/blink-cmp-env" }, + { "disrupted/blink-cmp-conventional-commits" }, + { "erooke/blink-cmp-latex" }, + { "alexandre-abrioux/blink-cmp-npm.nvim" }, + { "marcoSven/blink-cmp-yanky" } + }, opts = { keymap = { preset = "enter", [""] = { "select_next", "snippet_forward", "fallback" }, [""] = { "select_prev", "snippet_backward", "fallback" }, }, + sources = { + default = { + "lsp", + "buffer", + "snippets", + "path", + "ripgrep", + "git", + "tmux", + "env", + "conventional_commits", + "latex", + "npm" + }, + providers = { + ripgrep = { + module = "blink-ripgrep", + name = "Ripgrep", + opts = {}, + }, + git = { + module = "blink-cmp-git", + name = "Git", + opts = {}, + }, + spell = { + module = "blink-cmp-spell", + name = "Spell", + opts = { + use_cmp_spelling = true + }, + }, + tmux = { + module = "blink-cmp-tmux", + name = "Tmux", + opts = {}, + }, + env = { + module = "blink-cmp-env", + name = "Env", + opts = {}, + }, + conventional_commits = { + name = 'Conventional Commits', + module = 'blink-cmp-conventional-commits', + enabled = function() + return vim.bo.filetype == 'gitcommit' + end, + opts = {}, + }, + latex = { + name = "Latex", + module = "blink-cmp-latex", + opts = { + insert_command = false + }, + }, + npm = { + name = "Npm", + module = "blink-cmp-npm", + async = true, + opts = {} + }, + yank = { + name = "Yank", + module = "blink-yanky", + opts = {}, + }, + }, + } } } From dc5bcf80f8920ce41684b96e20166838efefd279 Mon Sep 17 00:00:00 2001 From: Daniel Nachun Date: Mon, 24 Nov 2025 19:07:43 -0800 Subject: [PATCH 3/4] import jupyter stuff --- dot_config/chezmoi/package_list | 1 + dot_config/nvim/lua/plugins/blink.lua | 14 ++++++++++---- dot_config/nvim/lua/plugins/jupytext.lua | 12 ++++++++++++ dot_config/nvim/lua/plugins/plugins.lua | 3 +++ dot_config/ranger/rc.conf | 4 ++-- 5 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 dot_config/nvim/lua/plugins/jupytext.lua diff --git a/dot_config/chezmoi/package_list b/dot_config/chezmoi/package_list index 28f1952..49e0ee6 100644 --- a/dot_config/chezmoi/package_list +++ b/dot_config/chezmoi/package_list @@ -311,6 +311,7 @@ pkgconf plzip pnpm pomsky +poppler prettier prql-compiler procs diff --git a/dot_config/nvim/lua/plugins/blink.lua b/dot_config/nvim/lua/plugins/blink.lua index 864746b..7b5761f 100644 --- a/dot_config/nvim/lua/plugins/blink.lua +++ b/dot_config/nvim/lua/plugins/blink.lua @@ -23,19 +23,25 @@ return { "buffer", "snippets", "path", - "ripgrep", + -- "ripgrep", "git", + "spell", "tmux", "env", "conventional_commits", "latex", - "npm" + "npm", + "yanky" }, providers = { ripgrep = { module = "blink-ripgrep", name = "Ripgrep", - opts = {}, + opts = { + backend = { + use = "gitgrep-or-ripgrep" + }, + }, }, git = { module = "blink-cmp-git", @@ -80,7 +86,7 @@ return { async = true, opts = {} }, - yank = { + yanky = { name = "Yank", module = "blink-yanky", opts = {}, diff --git a/dot_config/nvim/lua/plugins/jupytext.lua b/dot_config/nvim/lua/plugins/jupytext.lua new file mode 100644 index 0000000..1dcdd06 --- /dev/null +++ b/dot_config/nvim/lua/plugins/jupytext.lua @@ -0,0 +1,12 @@ +return { + "GCBallesteros/jupytext.nvim", + config = function() + require("jupytext").setup({ + style = "markdown", + output_extension = "md", + force_ft = "markdown", + }) + end, + -- Depending on your nvim distro or config you may need to make the loading not lazy + lazy=false, +} diff --git a/dot_config/nvim/lua/plugins/plugins.lua b/dot_config/nvim/lua/plugins/plugins.lua index 7d2c600..c1f4adb 100644 --- a/dot_config/nvim/lua/plugins/plugins.lua +++ b/dot_config/nvim/lua/plugins/plugins.lua @@ -39,4 +39,7 @@ return { { "christoomey/vim-system-copy" }, { "ojroques/vim-oscyank" }, { "smoka7/multicursors.nvim" }, + { "GCBallesteros/NotebookNavigator.nvim" }, + { "GCBallesteros/jupytext.nvim" }, + { "benlubas/molten-nvim" }, } diff --git a/dot_config/ranger/rc.conf b/dot_config/ranger/rc.conf index e3b4035..bf2e369 100644 --- a/dot_config/ranger/rc.conf +++ b/dot_config/ranger/rc.conf @@ -66,7 +66,7 @@ set vcs_backend_hg disabled set vcs_backend_bzr disabled # Use one of the supported image preview protocols -set preview_images false +set preview_images true # Set the preview image method. Supported methods: # @@ -87,7 +87,7 @@ set preview_images false # * urxvt-full: # The same as urxvt but utilizing not only the preview pane but the # whole terminal window. -set preview_images_method w3m +set preview_images_method iterm2 # Use a unicode "..." character to mark cut-off filenames? set unicode_ellipsis false From 7c2bfda5b0ecacbc84b5620179d8574bb67e6178 Mon Sep 17 00:00:00 2001 From: Daniel Nachun Date: Mon, 24 Nov 2025 19:08:50 -0800 Subject: [PATCH 4/4] remove osx-64 --- .github/workflows/ci.yml | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e019d20..861d07c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,36 +34,6 @@ jobs: export PATH="${HOME}/bin:${PATH}" chezmoi apply - osx-64: - runs-on: macos-13 - strategy: - fail-fast: false - - steps: - - name: Checkout pull request branch - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Free Disk Space (macOS) - run: | - rm -rf ${HOME}/Library/Developer/CoreSimulator - - - name: Set up working directories - run: | - mkdir -p ${HOME}/.local/share/chezmoi - cp -r * ${HOME}/.local/share/chezmoi - - - name: Set up chezmoi - run: | - cd ${HOME} - sh -c "$(curl -fsLS get.chezmoi.io)" - - - name: Test chezmoi - run: | - export PATH="${HOME}/bin:${PATH}" - chezmoi apply - osx-arm64: runs-on: macos-14 strategy: