modules/notes: switch to explicit lib calls

modules/notes/orgmode/config.nix

@@ -3,42 +3,46 @@
   lib,
   ...
 }: let
-  inherit (lib) mkIf mkMerge nvim pushDownDefault;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.binds) pushDownDefault;
 
   cfg = config.vim.notes.orgmode;
 in {
   config = mkIf cfg.enable (mkMerge [
     {
-      vim.startPlugins = [
-        "orgmode-nvim"
-      ];
+      vim = {
+        startPlugins = [
+          "orgmode-nvim"
+        ];
 
-      vim.binds.whichKey.register = pushDownDefault {
-        "<leader>o" = "+Notes";
+        binds.whichKey.register = pushDownDefault {
+          "<leader>o" = "+Notes";
+        };
+
+        luaConfigRC.orgmode = entryAnywhere ''
+          -- Load custom treesitter grammar for org filetype
+          require('orgmode').setup_ts_grammar()
+
+          -- Treesitter configuration
+          require('nvim-treesitter.configs').setup {
+
+            -- If TS highlights are not enabled at all, or disabled via `disable` prop,
+            -- highlighting will fallback to default Vim syntax highlighting
+            highlight = {
+              enable = true,
+              -- Required for spellcheck, some LaTex highlights and
+              -- code block highlights that do not have ts grammar
+              additional_vim_regex_highlighting = {'org'},
+            },
+          }
+
+          require('orgmode').setup({
+            org_agenda_files = ${cfg.orgAgendaFiles},
+            org_default_notes_file = '${cfg.orgDefaultNotesFile}',
+          })
+        '';
       };
-
-      vim.luaConfigRC.orgmode = nvim.dag.entryAnywhere ''
-        -- Load custom treesitter grammar for org filetype
-        require('orgmode').setup_ts_grammar()
-
-        -- Treesitter configuration
-        require('nvim-treesitter.configs').setup {
-
-          -- If TS highlights are not enabled at all, or disabled via `disable` prop,
-          -- highlighting will fallback to default Vim syntax highlighting
-          highlight = {
-            enable = true,
-            -- Required for spellcheck, some LaTex highlights and
-            -- code block highlights that do not have ts grammar
-            additional_vim_regex_highlighting = {'org'},
-          },
-        }
-
-        require('orgmode').setup({
-          org_agenda_files = ${cfg.orgAgendaFiles},
-          org_default_notes_file = '${cfg.orgDefaultNotesFile}',
-        })
-      '';
     }
 
     (mkIf cfg.treesitter.enable {

modules/notes/orgmode/default.nix

@@ -1,4 +1,4 @@
-_: {
+{
   imports = [
     ./orgmode.nix
     ./config.nix

modules/notes/orgmode/orgmode.nix

@@ -4,27 +4,28 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkEnableOption types mkOption nvim;
+  inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.types) str;
+  inherit (lib.nvim.types) mkGrammarOption;
 in {
   options.vim.notes.orgmode = {
     enable = mkEnableOption "nvim-orgmode: Neovim plugin for Emac Orgmode. Get the best of both worlds";
 
     orgAgendaFiles = mkOption {
-      type = types.str;
+      type = str;
       default = "{'~/Documents/org/*', '~/my-orgs/**/*'}";
       description = "List of org files to be used as agenda files.";
     };
 
     orgDefaultNotesFile = mkOption {
-      type = types.str;
+      type = str;
       default = "~/Documents/org/refile.org";
       description = "Default org file to be used for notes.";
     };
 
     treesitter = {
       enable = mkEnableOption "Orgmode treesitter" // {default = config.vim.languages.enableTreesitter;};
-
-      orgPackage = nvim.types.mkGrammarOption pkgs "org";
+      orgPackage = mkGrammarOption pkgs "org";
     };
   };
 }