althaea.zone / candy
neovim
fork atom

drop supermaven

marshmallow.tngl.sh 3f29d064 0f72d91f

+110 -198
unified split
-10
candy/lua/marshmallow/completion.lua
··· 1 -- Awaiting mini.completion w/ snippet support... 2 -- require("mini.completion").setup() 3 4 - if vim.env.CANDY_CHECK == nil then 5 - -- Disable in check phase 6 - require("supermaven-nvim").setup({ 7 - disable_inline_completion = true, 8 - disable_keymaps = true, 9 - log_level = "off", 10 - }) 11 - end 12 - 13 local cmp = require("cmp") 14 cmp.setup({ 15 snippet = { ··· 30 }), 31 sources = cmp.config.sources({ 32 { name = "nvim_lsp" }, 33 - { name = "supermaven" }, 34 { name = "luasnip" }, 35 { name = "async_path" }, 36 }, {
··· 1 -- Awaiting mini.completion w/ snippet support... 2 -- require("mini.completion").setup() 3 4 local cmp = require("cmp") 5 cmp.setup({ 6 snippet = { ··· 21 }), 22 sources = cmp.config.sources({ 23 { name = "nvim_lsp" }, 24 { name = "luasnip" }, 25 { name = "async_path" }, 26 }, {
+39 -60
flake.lock
··· 5 "nixpkgs": "nixpkgs" 6 }, 7 "locked": { 8 - "lastModified": 1728330715, 9 - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", 10 "owner": "numtide", 11 "repo": "devshell", 12 - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", 13 "type": "github" 14 }, 15 "original": { ··· 57 ] 58 }, 59 "locked": { 60 - "lastModified": 1733312601, 61 - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", 62 "owner": "hercules-ci", 63 "repo": "flake-parts", 64 - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", 65 "type": "github" 66 }, 67 "original": { ··· 78 ] 79 }, 80 "locked": { 81 - "lastModified": 1733312601, 82 - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", 83 "owner": "hercules-ci", 84 "repo": "flake-parts", 85 - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", 86 "type": "github" 87 }, 88 "original": { ··· 100 ] 101 }, 102 "locked": { 103 - "lastModified": 1733312601, 104 - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", 105 "owner": "hercules-ci", 106 "repo": "flake-parts", 107 - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", 108 "type": "github" 109 }, 110 "original": { ··· 119 "nixpkgs": [ 120 "nightly", 121 "nixpkgs" 122 - ], 123 - "nixpkgs-stable": [ 124 - "nightly", 125 - "nixpkgs" 126 ] 127 }, 128 "locked": { 129 - "lastModified": 1734797603, 130 - "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", 131 "owner": "cachix", 132 "repo": "git-hooks.nix", 133 - "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", 134 "type": "github" 135 }, 136 "original": { ··· 164 "harpoon-nvim": { 165 "flake": false, 166 "locked": { 167 - "lastModified": 1712688075, 168 - "narHash": "sha256-FZQH38E02HuRPIPAog/nWM55FuBxKp8AyrEldFkoLYk=", 169 "owner": "ThePrimeagen", 170 "repo": "harpoon", 171 - "rev": "0378a6c428a0bed6a2781d459d7943843f374bce", 172 "type": "github" 173 }, 174 "original": { ··· 187 ] 188 }, 189 "locked": { 190 - "lastModified": 1733333617, 191 - "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", 192 "owner": "hercules-ci", 193 "repo": "hercules-ci-effects", 194 - "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", 195 "type": "github" 196 }, 197 "original": { ··· 203 "neovim-src": { 204 "flake": false, 205 "locked": { 206 - "lastModified": 1734989976, 207 - "narHash": "sha256-DVlI7ua+VOkqC70WpSbJO+FjQyBEarGZnKoql7I7Unk=", 208 "owner": "neovim", 209 "repo": "neovim", 210 - "rev": "c51bf5a6b24928ac04d0bb129b1b424d4c78f28d", 211 "type": "github" 212 }, 213 "original": { ··· 227 "treefmt-nix": "treefmt-nix" 228 }, 229 "locked": { 230 - "lastModified": 1734999862, 231 - "narHash": "sha256-CJ3dXoCQzbSR/b8kbswlf/JIGKIN/6c9ywRw2rQAIYY=", 232 "owner": "nix-community", 233 "repo": "neovim-nightly-overlay", 234 - "rev": "0d0beafd94c34915fb951b31e165be5cf1cf3a7c", 235 "type": "github" 236 }, 237 "original": { ··· 258 }, 259 "nixpkgs_2": { 260 "locked": { 261 - "lastModified": 1734856068, 262 - "narHash": "sha256-Q+CB1ajsJg4Z9HGHTBAGY1q18KpnnkmF/eCTLUY6FQ0=", 263 "owner": "NixOS", 264 "repo": "nixpkgs", 265 - "rev": "93ff48c9be84a76319dac293733df09bbbe3f25c", 266 "type": "github" 267 }, 268 "original": { ··· 274 }, 275 "nixpkgs_3": { 276 "locked": { 277 - "lastModified": 1726871744, 278 - "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", 279 "owner": "NixOS", 280 "repo": "nixpkgs", 281 - "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", 282 "type": "github" 283 }, 284 "original": { ··· 296 "nightly": "nightly", 297 "nixpkgs": "nixpkgs_3", 298 "stay-in-place-nvim": "stay-in-place-nvim", 299 - "supermaven-nvim": "supermaven-nvim", 300 "tolerable": "tolerable" 301 } 302 }, ··· 316 "type": "github" 317 } 318 }, 319 - "supermaven-nvim": { 320 - "flake": false, 321 - "locked": { 322 - "lastModified": 1728314930, 323 - "narHash": "sha256-1z3WKIiikQqoweReUyK5O8MWSRN5y95qcxM6qzlKMME=", 324 - "owner": "supermaven-inc", 325 - "repo": "supermaven-nvim", 326 - "rev": "07d20fce48a5629686aefb0a7cd4b25e33947d50", 327 - "type": "github" 328 - }, 329 - "original": { 330 - "owner": "supermaven-inc", 331 - "repo": "supermaven-nvim", 332 - "type": "github" 333 - } 334 - }, 335 "tolerable": { 336 "inputs": { 337 "nightly": [ ··· 342 ] 343 }, 344 "locked": { 345 - "lastModified": 1735006360, 346 - "narHash": "sha256-Nsip3NjLcGsDeTb0eWYNKfHHzE5R2pDRH58I348Z4Z8=", 347 "owner": "wires-org", 348 "repo": "tolerable-nvim-nix", 349 - "rev": "ffdc8eb5e0d45848430567a35105234414239af1", 350 "type": "github" 351 }, 352 "original": { ··· 363 ] 364 }, 365 "locked": { 366 - "lastModified": 1734982074, 367 - "narHash": "sha256-N7M37KP7cHWoXicuE536GrVvU8nMDT/gpI1kja2hkdg=", 368 "owner": "numtide", 369 "repo": "treefmt-nix", 370 - "rev": "e41e948cf097cbf96ba4dff47a30ea6891af9f33", 371 "type": "github" 372 }, 373 "original": {
··· 5 "nixpkgs": "nixpkgs" 6 }, 7 "locked": { 8 + "lastModified": 1741473158, 9 + "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", 10 "owner": "numtide", 11 "repo": "devshell", 12 + "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", 13 "type": "github" 14 }, 15 "original": { ··· 57 ] 58 }, 59 "locked": { 60 + "lastModified": 1741352980, 61 + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", 62 "owner": "hercules-ci", 63 "repo": "flake-parts", 64 + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", 65 "type": "github" 66 }, 67 "original": { ··· 78 ] 79 }, 80 "locked": { 81 + "lastModified": 1741352980, 82 + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", 83 "owner": "hercules-ci", 84 "repo": "flake-parts", 85 + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", 86 "type": "github" 87 }, 88 "original": { ··· 100 ] 101 }, 102 "locked": { 103 + "lastModified": 1741352980, 104 + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", 105 "owner": "hercules-ci", 106 "repo": "flake-parts", 107 + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", 108 "type": "github" 109 }, 110 "original": { ··· 119 "nixpkgs": [ 120 "nightly", 121 "nixpkgs" 122 ] 123 }, 124 "locked": { 125 + "lastModified": 1742649964, 126 + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", 127 "owner": "cachix", 128 "repo": "git-hooks.nix", 129 + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", 130 "type": "github" 131 }, 132 "original": { ··· 160 "harpoon-nvim": { 161 "flake": false, 162 "locked": { 163 + "lastModified": 1739222527, 164 + "narHash": "sha256-L7FvOV6KvD58BnY3no5IudiKTdgkGqhpS85RoSxtl7U=", 165 "owner": "ThePrimeagen", 166 "repo": "harpoon", 167 + "rev": "ed1f853847ffd04b2b61c314865665e1dadf22c7", 168 "type": "github" 169 }, 170 "original": { ··· 183 ] 184 }, 185 "locked": { 186 + "lastModified": 1742014779, 187 + "narHash": "sha256-I6fG1zrfdLFcp/imGZElig0BJO3YU0QEXLgvwWoOpJ8=", 188 "owner": "hercules-ci", 189 "repo": "hercules-ci-effects", 190 + "rev": "524637ef84c177661690b924bf64a1ce18072a2c", 191 "type": "github" 192 }, 193 "original": { ··· 199 "neovim-src": { 200 "flake": false, 201 "locked": { 202 + "lastModified": 1742654371, 203 + "narHash": "sha256-fmOfoKTyGmjouWGFxfJvMdZVX3u2GSZyMlVE9yNhusA=", 204 "owner": "neovim", 205 "repo": "neovim", 206 + "rev": "f4d9a2983a49c1729f78ffbf6b1e6dcc30215d0d", 207 "type": "github" 208 }, 209 "original": { ··· 223 "treefmt-nix": "treefmt-nix" 224 }, 225 "locked": { 226 + "lastModified": 1742688454, 227 + "narHash": "sha256-gK9nPXWEXVtBWlZCBlwMZynlCDGJ1TtVlRBfC02PNxc=", 228 "owner": "nix-community", 229 "repo": "neovim-nightly-overlay", 230 + "rev": "098d2af8c606ea8adc1b8b3084f454ca681a7ab3", 231 "type": "github" 232 }, 233 "original": { ··· 254 }, 255 "nixpkgs_2": { 256 "locked": { 257 + "lastModified": 1742578646, 258 + "narHash": "sha256-GiQ40ndXRnmmbDZvuv762vS+gew1uDpFwOfgJ8tLiEs=", 259 "owner": "NixOS", 260 "repo": "nixpkgs", 261 + "rev": "94c4dbe77c0740ebba36c173672ca15a7926c993", 262 "type": "github" 263 }, 264 "original": { ··· 270 }, 271 "nixpkgs_3": { 272 "locked": { 273 + "lastModified": 1742578646, 274 + "narHash": "sha256-GiQ40ndXRnmmbDZvuv762vS+gew1uDpFwOfgJ8tLiEs=", 275 "owner": "NixOS", 276 "repo": "nixpkgs", 277 + "rev": "94c4dbe77c0740ebba36c173672ca15a7926c993", 278 "type": "github" 279 }, 280 "original": { ··· 292 "nightly": "nightly", 293 "nixpkgs": "nixpkgs_3", 294 "stay-in-place-nvim": "stay-in-place-nvim", 295 "tolerable": "tolerable" 296 } 297 }, ··· 311 "type": "github" 312 } 313 }, 314 "tolerable": { 315 "inputs": { 316 "nightly": [ ··· 321 ] 322 }, 323 "locked": { 324 + "lastModified": 1742696745, 325 + "narHash": "sha256-57jlygyNVeCgFiVSvNqdErMlE6NiWaIxQ0XlHoMTEL8=", 326 "owner": "wires-org", 327 "repo": "tolerable-nvim-nix", 328 + "rev": "bb3c4788849428cb5ec852a529e6e99b9396727c", 329 "type": "github" 330 }, 331 "original": { ··· 342 ] 343 }, 344 "locked": { 345 + "lastModified": 1742370146, 346 + "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", 347 "owner": "numtide", 348 "repo": "treefmt-nix", 349 + "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", 350 "type": "github" 351 }, 352 "original": {
+71 -99
flake.nix
··· 17 inputs.harpoon-nvim.flake = false; 18 inputs.stay-in-place-nvim.url = "github:gbprod/stay-in-place.nvim"; 19 inputs.stay-in-place-nvim.flake = false; 20 - inputs.supermaven-nvim.url = "github:supermaven-inc/supermaven-nvim"; 21 - inputs.supermaven-nvim.flake = false; 22 23 outputs = inputs: 24 inputs.flake-parts.lib.mkFlake {inherit inputs;} ({config, ...}: { ··· 42 ... 43 }: { 44 packages = { 45 - neovim = 46 - (inputs.tolerable.makeNightlyNeovimConfig "candy" { 47 - inherit pkgs; 48 - src = lib.fileset.toSource { 49 - root = ./.; 50 - fileset = ./candy; 51 - }; 52 - config = { 53 - plugins = let 54 - opt = plugin: { 55 - inherit plugin; 56 - optional = true; 57 - }; 58 - in 59 - with pkgs.vimPlugins; [ 60 - lz-n 61 - nvim-treesitter.withAllGrammars 62 - nvim-lspconfig 63 - catppuccin-nvim 64 - kanagawa-nvim 65 - mini-nvim 66 - luasnip 67 - (opt conform-nvim) 68 - plenary-nvim 69 - which-key-nvim 70 - (pkgs.vimUtils.buildVimPlugin { 71 - src = inputs.harpoon-nvim; 72 - name = "harpoon"; 73 - }) 74 - (pkgs.vimUtils.buildVimPlugin { 75 - src = inputs.supermaven-nvim; 76 - name = "supermaven"; 77 - patches = [./patches/use-env-for-supermaven-binary-path.patch]; 78 - }) 79 - rustaceanvim 80 - nvim-web-devicons 81 - typescript-tools-nvim 82 - direnv-vim 83 - vim-dotenv 84 - (opt nvim-spider) 85 - vim-fugitive 86 - gitsigns-nvim 87 - vim-gnupg 88 - fidget-nvim 89 - presence-nvim 90 - vim-wakatime 91 - 92 - # nvim-cmp 93 - nvim-cmp 94 - cmp-nvim-lsp 95 - cmp-cmdline 96 - cmp-async-path 97 - cmp-buffer 98 - luasnip 99 - cmp_luasnip 100 - ]; 101 - }; 102 - }) 103 - .overrideAttrs (old: { 104 - generatedWrapperArgs = with pkgs; 105 - old.generatedWrapperArgs 106 - or [] 107 - ++ [ 108 - "--prefix" 109 - "PATH" 110 - ":" 111 - ( 112 - lib.makeBinPath [ 113 - curl 114 - git 115 - stylua 116 - prettierd 117 - black 118 - alejandra 119 - taplo 120 - lua-language-server 121 - nil 122 - statix 123 - nodePackages.typescript-language-server 124 - tailwindcss-language-server 125 - nodePackages.sql-formatter 126 - gopls 127 - golangci-lint-langserver 128 - golangci-lint 129 - pyright 130 - tinymist 131 - ] 132 - ) 133 - "--prefix" 134 - "SUPERMAVEN_BINARY" 135 - ":" 136 - (pkgs.fetchurl { 137 - url = "https://supermaven-public.s3.amazonaws.com/sm-agent/v2/8/linux-musl/x86_64/sm-agent"; 138 - hash = "sha256-ibnrpykmc0Ao5Hh3aAWVxdnqzPLCtIyQxoOU1vWrCXQ="; 139 - executable = true; 140 - name = "supermaven-binary"; 141 }) 142 ]; 143 - }); 144 145 default = config.packages.neovim; 146 };
··· 17 inputs.harpoon-nvim.flake = false; 18 inputs.stay-in-place-nvim.url = "github:gbprod/stay-in-place.nvim"; 19 inputs.stay-in-place-nvim.flake = false; 20 21 outputs = inputs: 22 inputs.flake-parts.lib.mkFlake {inherit inputs;} ({config, ...}: { ··· 40 ... 41 }: { 42 packages = { 43 + neovim = inputs.tolerable.makeNightlyNeovimConfig "candy" { 44 + inherit pkgs; 45 + src = lib.fileset.toSource { 46 + root = ./.; 47 + fileset = ./candy; 48 + }; 49 + path = with pkgs; [ 50 + curl 51 + git 52 + stylua 53 + prettierd 54 + black 55 + alejandra 56 + taplo 57 + lua-language-server 58 + nil 59 + statix 60 + nodePackages.typescript-language-server 61 + tailwindcss-language-server 62 + nodePackages.sql-formatter 63 + gopls 64 + golangci-lint-langserver 65 + golangci-lint 66 + pyright 67 + tinymist 68 + ]; 69 + config = { 70 + plugins = let 71 + opt = plugin: { 72 + inherit plugin; 73 + optional = true; 74 + }; 75 + in 76 + with pkgs.vimPlugins; [ 77 + lz-n 78 + nvim-treesitter.withAllGrammars 79 + nvim-lspconfig 80 + catppuccin-nvim 81 + kanagawa-nvim 82 + mini-nvim 83 + luasnip 84 + (opt conform-nvim) 85 + plenary-nvim 86 + which-key-nvim 87 + (pkgs.vimUtils.buildVimPlugin { 88 + src = inputs.harpoon-nvim; 89 + name = "harpoon"; 90 + doCheck = false; 91 }) 92 + rustaceanvim 93 + nvim-web-devicons 94 + typescript-tools-nvim 95 + direnv-vim 96 + vim-dotenv 97 + (opt nvim-spider) 98 + vim-fugitive 99 + gitsigns-nvim 100 + vim-gnupg 101 + fidget-nvim 102 + presence-nvim 103 + vim-wakatime 104 + 105 + # nvim-cmp 106 + nvim-cmp 107 + cmp-nvim-lsp 108 + cmp-cmdline 109 + cmp-async-path 110 + cmp-buffer 111 + luasnip 112 + cmp_luasnip 113 ]; 114 + }; 115 + }; 116 117 default = config.packages.neovim; 118 };
-29
patches/use-env-for-supermaven-binary-path.patch
··· 1 - From 369654628e2ac1a5471a3f2f546a172121749f83 Mon Sep 17 00:00:00 2001 2 - From: marshmallow <marshycity@gmail.com> 3 - Date: Fri, 6 Sep 2024 17:54:08 +1000 4 - Subject: [PATCH 1/1] use env for supermaven binary path 5 - 6 - --- 7 - lua/supermaven-nvim/binary/binary_fetcher.lua | 6 +----- 8 - 1 file changed, 1 insertion(+), 5 deletions(-) 9 - 10 - diff --git a/lua/supermaven-nvim/binary/binary_fetcher.lua b/lua/supermaven-nvim/binary/binary_fetcher.lua 11 - index fc6572c..2eba9d6 100644 12 - --- a/lua/supermaven-nvim/binary/binary_fetcher.lua 13 - +++ b/lua/supermaven-nvim/binary/binary_fetcher.lua 14 - @@ -121,11 +121,7 @@ function BinaryFetcher:fetch_binary() 15 - end 16 - 17 - function BinaryFetcher:local_binary_path() 18 - - if self:platform() == "windows" then 19 - - return self:local_binary_parent_path() .. "/sm-agent.exe" 20 - - else 21 - - return self:local_binary_parent_path() .. "/sm-agent" 22 - - end 23 - + return vim.env.SUPERMAVEN_BINARY 24 - end 25 - 26 - function BinaryFetcher:local_binary_parent_path() 27 - -- 28 - 2.45.2 29 -
···