plugins: cleanup lib usage in several plugins

- ccc
- cmake-tools
- baleia
- auto-save
- vim-css-color
- virt-column
- bacon
- coq-nvim
- dressing
- competitest
- direnv
- committia
- indent-o-matic
- guess-indent
- lsp-status
- octo
- lazygit

plugins/by-name/octo/default.nix

@@ -1,11 +1,13 @@
 {
   lib,
-  helpers,
   pkgs,
   ...
 }:
-with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+let
+  inherit (lib) types;
+  inherit (lib.nixvim) defaultNullOpts;
+in
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "octo";
   originalName = "octo.nvim";
   package = "octo-nvim";
@@ -13,16 +15,16 @@ helpers.neovim-plugin.mkNeovimPlugin {
   maintainers = [ lib.maintainers.svl ];
 
   settingsOptions = {
-    use_local_fs = helpers.defaultNullOpts.mkBool false ''
+    use_local_fs = defaultNullOpts.mkBool false ''
       Use local files on right side of reviews.
     '';
 
-    enable_builtin = helpers.defaultNullOpts.mkBool false ''
+    enable_builtin = defaultNullOpts.mkBool false ''
       Shows a list of builtin actions when no action is provided.
     '';
 
     default_remote =
-      helpers.defaultNullOpts.mkListOf types.str
+      defaultNullOpts.mkListOf types.str
         [
           "upstream"
           "origin"
@@ -31,23 +33,23 @@ helpers.neovim-plugin.mkNeovimPlugin {
           Order to try remotes
         '';
 
-    ssh_aliases = helpers.defaultNullOpts.mkAttrsOf types.str { } ''
+    ssh_aliases = defaultNullOpts.mkAttrsOf types.str { } ''
       SSH aliases.
     '';
 
     picker_config = {
-      use_emojis = helpers.defaultNullOpts.mkBool false ''
+      use_emojis = defaultNullOpts.mkBool false ''
         Use emojis in picker. Only used by "fzf-lua" picker for now.
       '';
 
       mappings =
         let
           mkMappingOption = lhs: desc: {
-            lhs = helpers.defaultNullOpts.mkStr lhs ''
+            lhs = defaultNullOpts.mkStr lhs ''
               Key to map.
             '';
 
-            desc = helpers.defaultNullOpts.mkStr desc ''
+            desc = defaultNullOpts.mkStr desc ''
               Description of the mapping.
             '';
           };
@@ -71,54 +73,54 @@ helpers.neovim-plugin.mkNeovimPlugin {
         };
     };
 
-    reaction_viewer_hint_icon = helpers.defaultNullOpts.mkStr "" ''
+    reaction_viewer_hint_icon = defaultNullOpts.mkStr "" ''
       Marker for user reactions.
     '';
 
-    user_icon = helpers.defaultNullOpts.mkStr " " ''
+    user_icon = defaultNullOpts.mkStr " " ''
       User Icon.
     '';
 
-    timeline_marker = helpers.defaultNullOpts.mkStr "" ''
+    timeline_marker = defaultNullOpts.mkStr "" ''
       Timeline marker.
     '';
 
-    timeline_indent = helpers.defaultNullOpts.mkStr "2" ''
+    timeline_indent = defaultNullOpts.mkStr "2" ''
       Timeline indentation.
     '';
 
-    right_bubble_delimiter = helpers.defaultNullOpts.mkStr "" ''
+    right_bubble_delimiter = defaultNullOpts.mkStr "" ''
       Bubble delimiter.
     '';
 
-    left_bubble_delimiter = helpers.defaultNullOpts.mkStr "" ''
+    left_bubble_delimiter = defaultNullOpts.mkStr "" ''
       Bubble delimiter.
     '';
 
-    github_hostname = helpers.defaultNullOpts.mkStr "" ''
+    github_hostname = defaultNullOpts.mkStr "" ''
       Github Enterprise host.
     '';
 
-    snippet_context_lines = helpers.defaultNullOpts.mkInt 4 ''
+    snippet_context_lines = defaultNullOpts.mkInt 4 ''
       Number of lines around commented lines.
     '';
 
-    gh_env = helpers.defaultNullOpts.mkAttributeSet { } ''
+    gh_env = defaultNullOpts.mkAttributeSet { } ''
       Extra environment variables to pass on to GitHub CLI, can be a table or function returning a table.
     '';
 
-    timeout = helpers.defaultNullOpts.mkInt 5000 ''
+    timeout = defaultNullOpts.mkInt 5000 ''
       Timeout for requests between the remote server.
     '';
 
     ui = {
-      use_sign_column = helpers.defaultNullOpts.mkBool true ''
+      use_sign_column = defaultNullOpts.mkBool true ''
         Show "modified" marks on the sign column.
       '';
     };
 
     picker =
-      helpers.defaultNullOpts.mkEnumFirstDefault
+      defaultNullOpts.mkEnumFirstDefault
         [
           "telescope"
           "fzf-lua"
@@ -130,7 +132,7 @@ helpers.neovim-plugin.mkNeovimPlugin {
     issues = {
       order_by = {
         field =
-          helpers.defaultNullOpts.mkEnumFirstDefault
+          defaultNullOpts.mkEnumFirstDefault
             [
               "CREATED_AT"
               "COMMENTS"
@@ -140,7 +142,7 @@ helpers.neovim-plugin.mkNeovimPlugin {
               See GitHub's [`IssueOrderField`](https://docs.github.com/en/graphql/reference/enums#issueorderfield) documentation.
             '';
         direction =
-          helpers.defaultNullOpts.mkEnumFirstDefault
+          defaultNullOpts.mkEnumFirstDefault
             [
               "DESC"
               "ASC"
@@ -174,11 +176,11 @@ helpers.neovim-plugin.mkNeovimPlugin {
 
   extraConfig =
     cfg:
-    mkMerge [
+    lib.mkMerge [
       { extraPackages = [ cfg.ghPackage ]; }
-      (mkIf (cfg.settings.picker == null || cfg.settings.picker == "telescope") {
-        plugins.telescope.enable = mkDefault true;
+      (lib.mkIf (cfg.settings.picker == null || cfg.settings.picker == "telescope") {
+        plugins.telescope.enable = lib.mkDefault true;
       })
-      (mkIf (cfg.settings.picker == "fzf-lua") { plugins.fzf-lua.enable = mkDefault true; })
+      (lib.mkIf (cfg.settings.picker == "fzf-lua") { plugins.fzf-lua.enable = lib.mkDefault true; })
     ];
 }