From ad0d5ed0f8f35c274d7d284c0d033e712a6d05b9 Mon Sep 17 00:00:00 2001
From: Mohammad Rafiq <rafiq@rrv.sh>
Date: Tue, 17 Jun 2025 13:45:19 +0800
Subject: [PATCH] fix(snippets): move snippets configuration to nvf module

---
 flake.lock                                    |  6 +-
 flake.nix                                     |  6 --
 .../rafiq/cli/editor/_nvf/snippets.nix        | 21 +++++++
 .../x86_64-linux/rafiq/cli/editor/default.nix | 57 +------------------
 4 files changed, 26 insertions(+), 64 deletions(-)

diff --git a/flake.lock b/flake.lock
index b1627bc..7214994 100644
--- a/flake.lock
+++ b/flake.lock
@@ -474,11 +474,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750133435,
-        "narHash": "sha256-/LN8xFhCDHA3jOoYnhl2oCBAOAgUHis2kOVxlfA96p0=",
+        "lastModified": 1750138565,
+        "narHash": "sha256-rewitXfshw4O6U9Yeasz4TjBbIUE3zdNMimc8TYtnSg=",
         "owner": "rrvsh",
         "repo": "nvf",
-        "rev": "50c881019c87b494b0ec6bb0a2f4b0e43af946c6",
+        "rev": "2c74994c5c5da1f363e67bc9ecad7e73c48d2208",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index bdb21fd..42a60a2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -81,12 +81,6 @@
         sops-nix.nixosModules.sops
         stylix.nixosModules.stylix
         stable-diffusion-webui-nix.nixosModules.default
-        {
-          nix.settings.substituters = [ "https://nvf.cachix.org" ];
-          nix.settings.trusted-public-keys = [
-            "nvf.cachix.org-1:GMQWiUhZ6ux9D5CvFFMwnc2nFrUHTeGaXRlVBXo+naI="
-          ];
-        }
       ];
       homes.modules = with inputs; [
         impermanence.homeManagerModules.impermanence
diff --git a/homes/x86_64-linux/rafiq/cli/editor/_nvf/snippets.nix b/homes/x86_64-linux/rafiq/cli/editor/_nvf/snippets.nix
index e423539..de3959b 100644
--- a/homes/x86_64-linux/rafiq/cli/editor/_nvf/snippets.nix
+++ b/homes/x86_64-linux/rafiq/cli/editor/_nvf/snippets.nix
@@ -4,5 +4,26 @@
     enable = true;
     setupOpts.enable_autosnippets = true;
     providers = with pkgs.vimPlugins; [ vim-snippets ];
+    customSnippets.snipmate = {
+      all = [
+        {
+          trigger = "if";
+          body = "if $1 else $2";
+        }
+      ];
+      nix = [
+        {
+          trigger = "mkOption";
+          body = ''
+            mkOption {
+              type = $1;
+              default = $2;
+              description = $3;
+              example = $4;
+            }
+          '';
+        }
+      ];
+    };
   };
 }
diff --git a/homes/x86_64-linux/rafiq/cli/editor/default.nix b/homes/x86_64-linux/rafiq/cli/editor/default.nix
index 57b9fa1..9551e11 100644
--- a/homes/x86_64-linux/rafiq/cli/editor/default.nix
+++ b/homes/x86_64-linux/rafiq/cli/editor/default.nix
@@ -1,66 +1,13 @@
 { lib, pkgs, ... }:
 let
-  inherit (lib) singleton replicate;
-  inherit (lib.strings)
-    concatMapStringsSep
-    removeSuffix
-    concatStrings
-    stringAsChars
-    ;
-  inherit (lib.attrsets) mapAttrsToList;
-  inherit (pkgs) writeTextFile;
-  indent =
-    n: s:
-    let
-      indentString = concatStrings (replicate n " ");
-      sep = "\n" + indentString;
-    in
-    indentString + stringAsChars (c: if c == "\n" then sep else c) (removeSuffix "\n" s);
-
+  inherit (lib) singleton;
 in
 {
   home.sessionVariables.EDITOR = "nvim";
   persistDirs = singleton ".local/share/nvf";
   programs.nvf.enable = true;
   programs.nvf.settings.vim = {
-    startPlugins =
-      [ pkgs.pantheon.snippets ]
-      ++ (mapAttrsToList
-        (
-          name: value:
-          writeTextFile {
-            name = "${name}.snippets";
-            text = concatMapStringsSep "\n" (x: ''
-              snippet ${x.trigger} ${x.description}
-              ${indent 2 x.body}
-            '') value;
-            destination = "/snippets/${name}.snippets";
-          }
-        )
-        {
-          all = [
-            {
-              trigger = "if";
-              description = "";
-              body = "if $1 else $2";
-            }
-          ];
-          nix = [
-            {
-              trigger = "mkOption";
-              description = "";
-              body = ''
-                mkOption {
-                  type = $1;
-                  default = $2;
-                  description = $3;
-                  example = $4;
-                }
-              '';
-            }
-          ];
-        }
-      );
+    startPlugins = [ pkgs.pantheon.snippets ];
 
     hideSearchHighlight = true;
     syntaxHighlighting = true;