Merge branch 'NotAShelf:main' into feature-language-tex

flake.lock

@@ -1,21 +1,5 @@
 {
   "nodes": {
-    "blink-cmp": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739129359,
-        "narHash": "sha256-nUrXXiJ7NRxS21H53U323lwEKdo08Y011l8XskXC/vw=",
-        "owner": "saghen",
-        "repo": "blink.cmp",
-        "rev": "b2485c76cb7877de6fe9c8670af59ba3d72fd74d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "saghen",
-        "repo": "blink.cmp",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -137,7 +121,6 @@
     },
     "root": {
       "inputs": {
-        "blink-cmp": "blink-cmp",
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
         "mnw": "mnw",

flake.nix

@@ -98,10 +98,5 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
-
-    blink-cmp = {
-      url = "github:saghen/blink.cmp";
-      flake = false;
-    };
   };
 }

flake/legacyPackages.nix

@@ -1,4 +1,8 @@
-{inputs, ...}: {
+{
+  inputs,
+  self,
+  ...
+}: {
   perSystem = {
     system,
     inputs',
@@ -9,14 +13,21 @@
       overlays = [
         inputs.self.overlays.default
 
-        (final: _: {
+        (final: prev: {
           # Build nil from source to get most recent
           # features as they are added.
           nil = inputs'.nil.packages.default;
-          blink-cmp = final.callPackage ./legacyPackages/blink-cmp.nix {
-            src = inputs.blink-cmp;
-            version = inputs.blink-cmp.shortRev or inputs.blink-cmp.shortDirtyRev or "dirty";
-          };
+          blink-cmp = let
+            pin = self.pins.blink-cmp;
+          in
+            final.callPackage ./legacyPackages/blink-cmp.nix {
+              inherit (pin) version;
+              src = prev.fetchFromGitHub {
+                inherit (pin.repository) owner repo;
+                rev = pin.revision;
+                sha256 = pin.hash;
+              };
+            };
         })
       ];
     };

flake/legacyPackages/blink-cmp.nix

@@ -10,16 +10,16 @@
     pname = "blink-fuzzy-lib";
     inherit version src;
 
-    env = {
-      # TODO: remove this if plugin stops using nightly rust
-      RUSTC_BOOTSTRAP = true;
-    };
+    # TODO: remove this if plugin stops using nightly rust
+    env.RUSTC_BOOTSTRAP = true;
+
     nativeBuildInputs = [git];
     cargoLock = {
       lockFile = "${src}/Cargo.lock";
       allowBuiltinFetchGit = true;
     };
   };
+
   libExt =
     if hostPlatform.isDarwin
     then "dylib"

modules/plugins/assistant/chatgpt/config.nix

@@ -30,17 +30,19 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = [
-        "chatgpt"
-      ];
+      startPlugins = ["chatgpt-nvim"];
+
       pluginRC.chagpt = entryAnywhere ''
         require("chatgpt").setup(${toLuaObject cfg.setupOpts})
       '';
-      maps.normal = mkMerge [
-        (mkSetBinding mappings.chatGpt "<cmd>ChatGPT<CR>")
-        maps
-      ];
-      maps.visual = maps;
+
+      maps = {
+        visual = maps;
+        normal = mkMerge [
+          (mkSetBinding mappings.chatGpt "<cmd>ChatGPT<CR>")
+          maps
+        ];
+      };
     };
   };
 }

modules/plugins/languages/csharp.nix

@@ -75,8 +75,8 @@
   };
 
   extraServerPlugins = {
-    omnisharp = ["omnisharp-extended"];
-    csharp_ls = ["csharpls-extended"];
+    omnisharp = ["omnisharp-extended-lsp-nvim"];
+    csharp_ls = ["csharpls-extended-lsp-nvim"];
   };
 
   cfg = config.vim.languages.csharp;

modules/plugins/languages/dart.nix

@@ -137,7 +137,7 @@ in {
       vim.startPlugins =
         if ftcfg.enableNoResolvePatch
         then ["flutter-tools-patched"]
-        else ["flutter-tools"];
+        else ["flutter-tools-nvim"];
 
       vim.pluginRC.flutter-tools = entryAnywhere ''
         require('flutter-tools').setup {

modules/plugins/languages/elixir.nix

@@ -112,7 +112,7 @@ in {
     })
 
     (mkIf cfg.elixir-tools.enable {
-      vim.startPlugins = ["elixir-tools"];
+      vim.startPlugins = ["elixir-tools-nvim"];
       vim.pluginRC.elixir-tools = entryAnywhere ''
         local elixir = require("elixir")
         local elixirls = require("elixir.elixirls")

modules/plugins/languages/ts.nix

@@ -230,7 +230,7 @@ in {
 
     # Extensions
     (mkIf cfg.extensions."ts-error-translator".enable {
-      vim.startPlugins = ["ts-error-translator"];
+      vim.startPlugins = ["ts-error-translator-nvim"];
       vim.pluginRC.ts-error-translator = entryAnywhere ''
         require("ts-error-translator").setup(${toLuaObject cfg.extensions.ts-error-translator.setupOpts})
       '';

modules/plugins/notes/orgmode/config.nix

@@ -13,9 +13,7 @@ in {
   config = mkIf cfg.enable (mkMerge [
     {
       vim = {
-        startPlugins = [
-          "orgmode-nvim"
-        ];
+        startPlugins = ["orgmode"];
 
         binds.whichKey.register = pushDownDefault {
           "<leader>o" = "+Notes";

modules/plugins/session/nvim-session-manager/config.nix

@@ -15,7 +15,7 @@ in {
     vim = {
       startPlugins =
         [
-          "nvim-session-manager"
+          "neovim-session-manager"
           "plenary-nvim"
         ]
         ++ optionals cfg.usePicker ["dressing-nvim"];

modules/plugins/visuals/cellular-automaton/config.nix

@@ -13,7 +13,7 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["cellular-automaton"];
+      startPlugins = ["cellular-automaton-nvim"];
 
       maps.normal = mkBinding cfg.mappings.makeItRain "<cmd>CellularAutomaton make_it_rain<CR>" "Make it rain";
 

modules/plugins/visuals/tiny-devicons-auto-colors/config.nix

@@ -11,7 +11,7 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["tiny-devicons-auto-colors" "nvim-web-devicons"];
+      startPlugins = ["tiny-devicons-auto-colors-nvim" "nvim-web-devicons"];
 
       pluginRC.tiny-devicons-auto-colors = entryAnywhere ''
         require("tiny-devicons-auto-colors").setup(${toLuaObject cfg.setupOpts})

npins/sources.json

@@ -36,6 +36,21 @@
       "url": "https://github.com/rrethy/base16-nvim/archive/6ac181b5733518040a33017dde654059cd771b7c.tar.gz",
       "hash": "0q47jbh6abn2hql9ghi9ayx3l8pdrdcdrnf4qfk7cp0v1bl7y48r"
     },
+    "blink-cmp": {
+      "type": "GitRelease",
+      "repository": {
+        "type": "GitHub",
+        "owner": "saghen",
+        "repo": "blink.cmp"
+      },
+      "pre_releases": false,
+      "version_upper_bound": null,
+      "release_prefix": null,
+      "version": "v0.11.0",
+      "revision": "7a70199efe4e333a3693ba3e56ddbec3b9c9c330",
+      "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v0.11.0",
+      "hash": "1j3sj03i72iw5npwwksc7w7axv8z0nbgi11adkfng9ak73kn1gdq"
+    },
     "blink-compat": {
       "type": "Git",
       "repository": {