Add local git uri support for userPlugins and the abbility for userPlugins to specify their own derivation

README.md

@@ -121,4 +121,4 @@ not be possible.
 
 ## Disclaimer
 Using Vencord violates Discord's terms of service. Read more about
-it at [their github](https://github.com/Vendicated/Vencord)
+it at [their github](https://github.com/Vendicated/Vencord)

docs/main.md

@@ -190,4 +190,4 @@ programs.nixcord.vesktop.settings
 programs.nixcord.vesktop.state
     # Settings to be placed in vesktop.configDir/state.json
     # type: attrs
-```
+```

docs/plugins.md

@@ -2003,4 +2003,4 @@ programs.nixcord.config.plugins.webRichPresence.enable
 ```nix
 programs.nixcord.config.plugins.webScreenShareFixes.enable
     # Removes 2500kbps bitrate cap on chromium and vesktop clients.
-```
+```

hm-module.nix

@@ -6,7 +6,6 @@
 }:
 let
   cfg = config.programs.nixcord;
-
   inherit (lib)
     mkEnableOption
     mkOption
@@ -16,36 +15,122 @@ let
     attrsets
     lists
     ;
+
+  vencordPkgs = pkgs.callPackage ./vencord.nix { unstable = cfg.discord.vencord.unstable; };
+
+  applyPostPatch = pkg: pkg.overrideAttrs (oldAttrs: {
+      postPatch = ''
+        ln -s ${userPluginsDirectory} src/userplugins
+      '';
+    });
+
+  patchedVencord = (applyPostPatch vencordPkgs);
 
   dop = with types; coercedTo package (a: a.outPath) pathInStore;
 
-  recursiveUpdateAttrsList =
-    list:
-    if (builtins.length list <= 1) then
-      (builtins.elemAt list 0)
+  regexDir = "^/.*$";
+
+  # Define regular expressions for GitHub and Git URLs
+  regexGithub = "github:([[:alnum:].-]+)/([[:alnum:]/-]+)/([0-9a-f]{40})";
+  regexGit = "git[+]file:///([^/]+/)*([^/?]+)(\\?ref=[a-f0-9]{40})?$";
+
+  # Define coercion functions for GitHub and Git
+  coerceGithub = value: let
+    matches = builtins.match regexGithub value;
+    owner = builtins.elemAt matches 0;
+    repo = builtins.elemAt matches 1;
+    rev = builtins.elemAt matches 2;
+  in builtins.fetchGit {
+    url = "https://github.com/${owner}/${repo}";
+    inherit rev;
+  };
+
+  coerceGit = value: let
+    # Match using regex, assuming regexGit is defined and captures groups correctly
+    matches = builtins.match regexGit value;
+
+    # Set rev only if matches are found
+    rev = if matches != null then
+      let
+        rawRev = builtins.elemAt matches 2;
+      in
+        if rawRev != null && builtins.substring 0 5 rawRev == "?ref="
+        then builtins.substring 5 (builtins.stringLength rawRev) rawRev
+        else null
+    else null;
+
+    # Set filepath only if matches are found
+    filepath = if matches != null then
+      let
+        startOffset = 4;  # Remove 4 characters from the beginning
+        endOffset = 45;   # Remove 45 characters from the end
+        fullLength = builtins.stringLength value;
+        adjustedPathLength = fullLength - startOffset - endOffset;
+      in
+        builtins.substring startOffset adjustedPathLength value
+    else null;
+
+  in if filepath != null then
+    # Call fetchGit only if filepath is valid
+    builtins.fetchGit (
+      let
+        # Only include rev if it's non-null and non-empty
+        revCondition = if rev != null && rev != "" then { rev = rev; } else {};
+      in {
+        url = filepath;
+        ref = "main";
+      } // revCondition  
+    )
+  else
+    throw "Failed to extract a valid filepath from the given value";
+
+  pluginMapper = plugin: 
+    if builtins.match regexGithub plugin != null then
+      coerceGithub plugin
+    else if builtins.match regexGit plugin != null then
+      coerceGit plugin
+    else if builtins.match regexDir plugin != null then
+      # If it's a directory, treat it as a path in the Nix store or simply as a directory path
+      builtins.path { 
+        name = "plugin"; 
+        path = builtins.toPath plugin; 
+      }
+    else if lib.attrsets.isDerivation plugin then
+      plugin
     else
-      recursiveUpdateAttrsList (
-        [
-          (attrsets.recursiveUpdate (builtins.elemAt list 0) (builtins.elemAt list 1))
-        ]
-        ++ (lists.drop 2 list)
-      );
+      builtins.path { 
+        name = "plugin";
+        path = builtins.toPath plugin;
+      };
 
-  applyPostPatch =
-    pkg:
-    pkg.overrideAttrs {
-      postPatch = lib.concatLines (
-        lib.optional (cfg.userPlugins != { }) "mkdir -p src/userplugins"
-        ++ lib.mapAttrsToList (
-          name: path:
-          "ln -s ${lib.escapeShellArg path} src/userplugins/${lib.escapeShellArg name} && ls src/userplugins"
-        ) cfg.userPlugins
-      );
-    };
 
-  defaultVencord = applyPostPatch (
-    pkgs.callPackage ./vencord.nix { unstable = cfg.discord.vencord.unstable; }
-  );
+  recursiveUpdateAttrsList = list:
+    if (builtins.length list <= 1) then (builtins.elemAt list 0) else
+      recursiveUpdateAttrsList ([
+        (attrsets.recursiveUpdate (builtins.elemAt list 0) (builtins.elemAt list 1))
+      ] ++ (lists.drop 2 list)); 
+
+  pluginDerivations = lib.mapAttrs (_: plugin: pluginMapper plugin) cfg.userPlugins;
+  apiPath = vencordPkgs.src;
+  buildDirs = pluginDerivations: lib.mapAttrsToList (name: pluginDir:
+    let
+      fullPath = "${pluginDir}";
+
+      # Check for a Nix expression and build if present
+      buildIfExists = if builtins.pathExists "${fullPath}/default.nix" || builtins.pathExists "${fullPath}/shell.nix" then
+        import fullPath { 
+        inherit pkgs;
+        }
+
+      else
+        pluginDir;
+    in
+      # Return an attribute set with a `name` and `path` for linkFarm
+      { name = name; path = buildIfExists; }
+  ) pluginDerivations;
+  # Build the user plugins directory with linkFarm
+  userPluginsDirectory = pkgs.linkFarm "userPlugins" (buildDirs pluginDerivations);
+
 in
 {
   options.programs.nixcord = {
@@ -84,7 +169,7 @@ in
         };
         package = mkOption {
           type = types.package;
-          default = defaultVencord;
+          default = patchedVencord;
           description = ''
             The Vencord package to use
           '';
@@ -230,30 +315,23 @@ in
         for both vencord and vesktop
       '';
     };
-    userPlugins =
-      let
-        regex = "github:([[:alnum:].-]+)/([[:alnum:]/-]+)/([0-9a-f]{40})";
-        coerce =
-          value:
-          let
-            matches = builtins.match regex value;
-            owner = builtins.elemAt matches 0;
-            repo = builtins.elemAt matches 1;
-            rev = builtins.elemAt matches 2;
-          in
-          builtins.fetchGit {
-            url = "https://github.com/${owner}/${repo}";
-            inherit rev;
-          };
-      in
-      mkOption {
-        type = with types; attrsOf (coercedTo (strMatching regex) coerce dop);
-        description = "User plugin to fetch and install. Note that any json required must be enabled in extraConfig";
-        default = { };
-        example = {
-          someCoolPlugin = "github:someUser/someCoolPlugin/someHashHere";
-        };
+    userPlugins = lib.mkOption {
+      description = "User plugin to fetch and install. Note that any JSON required must be enabled in extraConfig.";
+
+      # Define the type of userPlugins with validation
+      type = types.attrsOf (types.oneOf [
+        (types.strMatching regexGithub)   # GitHub URL pattern
+        (types.strMatching regexGit)      # Git URL pattern
+        types.package                      # Nix packages
+        types.path                         # Nix paths
+      ]);
+
+      # Example usage of the userPlugins option
+      example = {
+        someCoolPlugin = "github:someUser/someCoolPlugin/someHashHere";  # GitHub example
+        anotherCoolPlugin = "git+file:///path/to/repo?rev=abcdef1234567890abcdef1234567890abcdef12";  # File path example
       };
+    };
     parseRules = {
       upperNames = mkOption {
         type = with types; listOf str;
@@ -315,7 +393,7 @@ in
       {
         assertions = [
           {
-            assertion = !(cfg.discord.vencord.package != defaultVencord && cfg.discord.vencord.unstable);
+            assertion = !(cfg.discord.vencord.package != patchedVencord && cfg.discord.vencord.unstable);
             message = "programs.nixcord.discord.vencord: Cannot set both 'package' and 'unstable = true'. Choose one or the other.";
           }
         ];

plugins.nix

@@ -3337,4 +3337,4 @@ in
     # Required for Vesktop
     # Enabling doesn't cause problems for normal client
   };
-}
+}

vencord.nix

@@ -15,13 +15,13 @@
 }:
 
 let
-  stableVersion = "1.11.2";
-  stableHash = "sha256-18CzWAcBotIdzXFPIptBo20KZxXDVhM7AwwlCnPz+Wk=";
+  stableVersion = "1.11.4";
+  stableHash = "sha256-A2vv3ubT+3ksqgLC+RvyGQGlw2GUD3qOyU0ZmQdbC3U=";
   stablePnpmDeps = "sha256-ZUwtNtOmxjhOBpYB7vuytunGBRSuVxdlQsceRmeyhhI=";
 
-  unstableVersion = "1.11.2-unstable-2025-01-23";
-  unstableRev = "43501bad07632b586950b5bddfb81e5823786ce9";
-  unstableHash = "sha256-18CzWAcBotIdzXFPIptBo20KZxXDVhM7AwwlCnPz+Wk=";
+  unstableVersion = "1.11.4-unstable-2025-02-12";
+  unstableRev = "205e07d2c5b908f29d2a463845d7a1417a4678ad";
+  unstableHash = "sha256-A2vv3ubT+3ksqgLC+RvyGQGlw2GUD3qOyU0ZmQdbC3U=";
   unstablePnpmDeps = "sha256-ZUwtNtOmxjhOBpYB7vuytunGBRSuVxdlQsceRmeyhhI=";
 in
 stdenv.mkDerivation (finalAttrs: {