@@ -34,7 +34,7 @@ {{- with .Declarations }}           <dt>Declared</dt>
           {{- range . }}
             <dd>
-              <a href="file://{{ . }}">{{ . }}</a>
+              <a href="{{ .URL }}">{{ .Name }}</a>
             </dd>
           {{- end }}
         {{- end }}

@@ -1,17 +1,45 @@-{ pkgs ? import <nixpkgs> { }
+{ nixpkgs ? <nixpkgs>
+, pkgs ? import nixpkgs { }
 , system ? builtins.currentSystem
 , stateVersion ? pkgs.lib.version
 , ...
 }:
 let
   inherit (pkgs) lib;
-  nixos = pkgs.nixos ({ lib, pkgs, config, ... }: {
+  inherit (lib) hasPrefix removePrefix;
+
+  nixos = pkgs.nixos ({ lib, ... }: {
     nixpkgs.hostPlatform = system;
     system.stateVersion = lib.versions.majorMinor stateVersion;
   });
 
+  inherit (nixos.config.system.nixos) revision;
+
+  gitHubDeclaration = user: repo: ref: subpath:
+    # Default to `master` if we don't know what revision the system
+    # configuration is using (custom nixpkgs, etc.).
+    let urlRef = if ref != null then ref else "master";
+    in {
+      url = "https://github.com/${user}/${repo}/blob/${urlRef}/${subpath}";
+      name = "<${repo}/${subpath}>";
+    };
+
   doc = pkgs.nixosOptionsDoc {
     inherit (nixos) options;
+    transformOptions = opt: opt // {
+      declarations =
+        map
+          (decl:
+            if hasPrefix (toString nixpkgs) (toString decl)
+            then
+              gitHubDeclaration "NixOS" "nixpkgs" revision
+                (removePrefix "/"
+                  (removePrefix (toString nixpkgs) (toString decl)))
+            else if decl == "lib/modules.nix" then
+              gitHubDeclaration "NixOS" "nixpkgs" revision decl
+            else decl)
+          opt.declarations;
+    };
   };
 in
 doc.optionsJSON

@@ -47,9 +47,14 @@ 	return nil
 }
 
+type Link struct {
+	Name string
+	URL  string `json:"url"`
+}
+
 type NixOption struct {
 	Option          string
-	Declarations    []string
+	Declarations    []Link
 	Default         NixValue
 	Description     HTML
 	Example         NixValue