From 688e8e2ece3b094f09110a04756edff76dd98901 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Wed, 1 May 2024 02:01:47 +0300
Subject: [PATCH] modules/fn: use content instead of settings

move content to content.extra
---
 modules/fn.nix               | 14 ++++++++------
 modules/plugins/gitsigns.nix |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/fn.nix b/modules/fn.nix
index 3c21f4d..3e36be0 100644
--- a/modules/fn.nix
+++ b/modules/fn.nix
@@ -9,12 +9,14 @@ let
         default = [ ];
       };
       content = mkOption {
-        type = with types; nullOr attrs;
-        default = null;
-      };
-      settings = mkOption {
         type = types.functionTo (lib.types.submoduleWith {
           modules = [
+            {
+              options.extra = with lib; mkOption {
+                type = with types; nullOr attrs;
+                default = null;
+              };
+            }
             ./vim/keymap.nix
             # ./vim/opts.nix
           ];
@@ -34,10 +36,10 @@ let
       lambda = with lib.nix2lua;
         let
           fnArgs = builtins.listToAttrs (map (v: { name = v; value = raw v; }) config.args);
-          innerCfg = config.settings fnArgs;
+          innerCfg = config.content fnArgs;
         in
         lambda config.args (lib.flatten [
-          config.content
+          innerCfg.extra
 
           (lib.flip map innerCfg.vim.keymap.set ({ mode, lhs, rhs, ... } @ vars:
             let
diff --git a/modules/plugins/gitsigns.nix b/modules/plugins/gitsigns.nix
index 90a69b1..1f5762b 100644
--- a/modules/plugins/gitsigns.nix
+++ b/modules/plugins/gitsigns.nix
@@ -21,7 +21,7 @@ let cfg = config.plugins.gitsigns; in
   config = lib.mkIf cfg.enable {
     fn.gitsigns-nvim-on-attach = {
       args = [ "bufnr" ];
-      settings = { bufnr }: {
+      content = { bufnr }: {
         vim.keymap.set = map (attrs: attrs // { buffer = bufnr; }) cfg.keymap.set;
       };
     };