yeehaw

modules/default.nix

@@ -1,4 +1,5 @@
 {
+  self,
   inputs,
   lib,
 }: {
@@ -23,7 +24,7 @@
     specialArgs =
       extraSpecialArgs
       // {
-        inherit inputs;
+        inherit self inputs;
         modulesPath = toString ./.;
       };
     modules = concatLists [

modules/plugins/lsp/lsp-signature/config.nix

@@ -12,7 +12,7 @@ in {
   config = mkIf (cfg.enable && cfg.lspSignature.enable) {
     vim = {
       startPlugins = [
-        "lsp-signature"
+        "lsp-signature-nvim"
       ];
 
       lsp.lspSignature.setupOpts = {

modules/plugins/lsp/null-ls/config.nix

@@ -14,7 +14,7 @@ in {
     {
       vim = {
         startPlugins = [
-          "none-ls"
+          "none-ls-nvim"
           "plenary-nvim"
         ];
 

modules/plugins/lsp/trouble/config.nix

@@ -14,7 +14,7 @@ in {
   config = mkIf (cfg.enable && cfg.trouble.enable) {
     vim = {
       lazy.plugins.trouble = {
-        package = "trouble";
+        package = "trouble-nvim";
         setupModule = "trouble";
         inherit (cfg.trouble) setupOpts;
 

modules/plugins/notes/todo-comments/config.nix

@@ -15,7 +15,7 @@ in {
   config = mkIf cfg.enable {
     vim = {
       startPlugins = [
-        "todo-comments"
+        "todo-comments-nvim"
       ];
 
       maps.normal = mkMerge [

modules/plugins/statusline/lualine/config.nix

@@ -34,7 +34,7 @@ in {
     })
     (mkIf cfg.enable {
       vim = {
-        startPlugins = ["lualine"];
+        startPlugins = ["lualine-nvim"];
         pluginRC.lualine = entryAnywhere ''
           local lualine = require('lualine')
           lualine.setup ${toLuaObject cfg.setupOpts}

modules/plugins/ui/smartcolumn/config.nix

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

modules/plugins/utility/binds/which-key/config.nix

@@ -14,7 +14,7 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["which-key"];
+      startPlugins = ["which-key-nvim"];
 
       pluginRC.whichkey = entryAnywhere ''
         local wk = require("which-key")

modules/plugins/utility/telescope/config.nix

@@ -19,7 +19,7 @@ in {
       startPlugins = ["plenary-nvim"];
 
       lazy.plugins.telescope = {
-        package = "telescope";
+        package = "telescope-nvim";
         setupModule = "telescope";
         inherit (cfg) setupOpts;
 

modules/plugins/visuals/highlight-undo/config.nix

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

modules/plugins/visuals/indent-blankline/config.nix

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

modules/wrapper/build/config.nix

@@ -1,8 +1,9 @@
 {
+  self,
   inputs,
-  lib,
   config,
   pkgs,
+  lib,
   ...
 }
 : let
@@ -15,15 +16,15 @@
   vimOptions = config.vim;
 
   noBuildPlug = pname: let
-    input = inputs."plugin-${pname}";
-    version = input.shortRev or input.shortDirtyRev or "dirty";
+    pin = self.pins.${pname};
+    version = pin.revision or "dirty";
   in {
     # vim.lazy.plugins relies on pname, so we only set that here
     # version isn't needed for anything, but inherit it anyway for correctness
     inherit pname version;
     outPath = path {
       name = "${pname}-0-unstable-${version}";
-      path = input.outPath;
+      path = pin.outPath;
     };
     passthru.vimPlugin = false;
   };