From 9462a1103733f37c16b6afa86929213f1623673e Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 23 Feb 2024 18:58:21 +0300
Subject: [PATCH] plugins/comments: move to new explicit lib format

---
 .../plugins/comments/comment-nvim/config.nix  | 75 ++++++++++---------
 .../plugins/comments/comment-nvim/default.nix |  2 +-
 2 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/modules/plugins/comments/comment-nvim/config.nix b/modules/plugins/comments/comment-nvim/config.nix
index ea2f1e19..1c931683 100644
--- a/modules/plugins/comments/comment-nvim/config.nix
+++ b/modules/plugins/comments/comment-nvim/config.nix
@@ -3,48 +3,53 @@
   lib,
   ...
 }: let
-  inherit (lib) mkIf mkMerge mkExprBinding mkBinding nvim;
+  inherit (lib.options) mkIf;
+  inherit (lib.modules) mkMerge;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.binds) mkExprBinding mkBinding;
 
   cfg = config.vim.comments.comment-nvim;
-  self = import ./comment-nvim.nix {
-    inherit lib;
-  };
-  mappings = self.options.vim.comments.comment-nvim.mappings;
+  self = import ./comment-nvim.nix {inherit lib;};
+  inherit (self.options.vim.comments.comment-nvim) mappings;
 in {
   config = mkIf cfg.enable {
-    vim.startPlugins = [
-      "comment-nvim"
-    ];
+    vim = {
+      startPlugins = [
+        "comment-nvim"
+      ];
 
-    vim.maps.normal = mkMerge [
-      (mkBinding cfg.mappings.toggleOpLeaderLine "<Plug>(comment_toggle_linewise)" mappings.toggleOpLeaderLine.description)
-      (mkBinding cfg.mappings.toggleOpLeaderBlock "<Plug>(comment_toggle_blockwise)" mappings.toggleOpLeaderBlock.description)
+      maps = {
+        normal = mkMerge [
+          (mkBinding cfg.mappings.toggleOpLeaderLine "<Plug>(comment_toggle_linewise)" mappings.toggleOpLeaderLine.description)
+          (mkBinding cfg.mappings.toggleOpLeaderBlock "<Plug>(comment_toggle_blockwise)" mappings.toggleOpLeaderBlock.description)
 
-      (mkExprBinding cfg.mappings.toggleCurrentLine ''
-          function()
-            return vim.api.nvim_get_vvar('count') == 0 and '<Plug>(comment_toggle_linewise_current)'
-                    or '<Plug>(comment_toggle_linewise_count)'
-          end
-        ''
-        mappings.toggleCurrentLine.description)
-      (mkExprBinding cfg.mappings.toggleCurrentBlock ''
-          function()
-            return vim.api.nvim_get_vvar('count') == 0 and '<Plug>(comment_toggle_blockwise_current)'
-                    or '<Plug>(comment_toggle_blockwise_count)'
-          end
-        ''
-        mappings.toggleCurrentBlock.description)
-    ];
+          (mkExprBinding cfg.mappings.toggleCurrentLine ''
+              function()
+                return vim.api.nvim_get_vvar('count') == 0 and '<Plug>(comment_toggle_linewise_current)'
+                        or '<Plug>(comment_toggle_linewise_count)'
+              end
+            ''
+            mappings.toggleCurrentLine.description)
+          (mkExprBinding cfg.mappings.toggleCurrentBlock ''
+              function()
+                return vim.api.nvim_get_vvar('count') == 0 and '<Plug>(comment_toggle_blockwise_current)'
+                        or '<Plug>(comment_toggle_blockwise_count)'
+              end
+            ''
+            mappings.toggleCurrentBlock.description)
+        ];
 
-    vim.maps.visualOnly = mkMerge [
-      (mkBinding cfg.mappings.toggleSelectedLine "<Plug>(comment_toggle_linewise_visual)" mappings.toggleSelectedLine.description)
-      (mkBinding cfg.mappings.toggleSelectedBlock "<Plug>(comment_toggle_blockwise_visual)" mappings.toggleSelectedBlock.description)
-    ];
+        visualOnly = mkMerge [
+          (mkBinding cfg.mappings.toggleSelectedLine "<Plug>(comment_toggle_linewise_visual)" mappings.toggleSelectedLine.description)
+          (mkBinding cfg.mappings.toggleSelectedBlock "<Plug>(comment_toggle_blockwise_visual)" mappings.toggleSelectedBlock.description)
+        ];
+      };
 
-    vim.luaConfigRC.comment-nvim = nvim.dag.entryAnywhere ''
-      require('Comment').setup({
-        mappings = { basic = false, extra = false, },
-      })
-    '';
+      luaConfigRC.comment-nvim = entryAnywhere ''
+        require('Comment').setup({
+          mappings = { basic = false, extra = false, },
+        })
+      '';
+    };
   };
 }
diff --git a/modules/plugins/comments/comment-nvim/default.nix b/modules/plugins/comments/comment-nvim/default.nix
index db4eb424..6a6dbcb6 100644
--- a/modules/plugins/comments/comment-nvim/default.nix
+++ b/modules/plugins/comments/comment-nvim/default.nix
@@ -1,4 +1,4 @@
-_: {
+{
   imports = [
     ./config.nix
     ./comment-nvim.nix