ref: update url for some inputs to the flake

2 files changed, 235 insertions, 132 deletions

diff --git a/flake.lock b/flake.lock
index 6dd389a..2271e0d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,6 +20,54 @@
         "type": "github"
       }
     },
+    "crane": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "gh-ssh-keys",
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1667522439,
+        "narHash": "sha256-1tDYoumL5337T4BkC87iRXbAfeyeeOXa5WAbeP/ENqQ=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "b70e77d2e2d480a3a0bce3ecd2d981679588b23f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
+    "crane_2": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_4",
+        "nixpkgs": [
+          "x509-tools",
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay_3"
+      },
+      "locked": {
+        "lastModified": 1667522439,
+        "narHash": "sha256-1tDYoumL5337T4BkC87iRXbAfeyeeOXa5WAbeP/ENqQ=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "b70e77d2e2d480a3a0bce3ecd2d981679588b23f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
     "emacs-overlay": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -39,6 +87,38 @@
         "type": "github"
       }
     },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1659877975,
@@ -56,11 +136,11 @@
     },
     "flake-utils_2": {
       "locked": {
-        "lastModified": 1656928814,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
         "type": "github"
       },
       "original": {
@@ -86,11 +166,11 @@
     },
     "flake-utils_4": {
       "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
         "type": "github"
       },
       "original": {
@@ -116,28 +196,29 @@
     },
     "gh-ssh-keys": {
       "inputs": {
+        "crane": "crane",
         "flake-utils": [
           "futils"
         ],
-        "naersk": "naersk",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay"
+        "pre-commit-hooks": "pre-commit-hooks",
+        "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1666406674,
-        "narHash": "sha256-tDhEFsJpMjf56xiI217qGzNrogXZRJ6Ba7lmukU0UY8=",
+        "lastModified": 1667878209,
+        "narHash": "sha256-4mnemHrJSR6m/AcxqPGLzQDShuI3blzfxpoJsdb4uLk=",
         "ref": "main",
-        "rev": "a7f3234679c81a46324a1979c1bc5e7752473c2e",
-        "revCount": 16,
+        "rev": "62de89282cbe3c94879665ee24f885f7d5b175d7",
+        "revCount": 39,
         "type": "git",
-        "url": "ssh://git@github.com/fcuny/gh-ssh-keys"
+        "url": "https://git.fcuny.net/fcuny/gh-ssh-keys"
       },
       "original": {
         "ref": "main",
         "type": "git",
-        "url": "ssh://git@github.com/fcuny/gh-ssh-keys"
+        "url": "https://git.fcuny.net/fcuny/gh-ssh-keys"
       }
     },
     "home-manager": {
@@ -168,24 +249,6 @@
       "locked": {
         "lastModified": 1662220400,
         "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=",
-        "owner": "nmattia",
-        "repo": "naersk",
-        "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nmattia",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
-    "naersk_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1662220400,
-        "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=",
         "owner": "nix-community",
         "repo": "naersk",
         "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
@@ -197,24 +260,6 @@
         "type": "github"
       }
     },
-    "naersk_3": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_6"
-      },
-      "locked": {
-        "lastModified": 1662220400,
-        "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=",
-        "owner": "nmattia",
-        "repo": "naersk",
-        "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nmattia",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1666926733,
@@ -231,36 +276,6 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1664676151,
-        "narHash": "sha256-Z1SgO3HP2yGVkOne67Tv7BtGDC7oXw2cbDwVP8KjyT0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "8e0f159ff2d17faabbce0d60b14f50710e882eab",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1659102345,
-        "narHash": "sha256-Vbzlz254EMZvn28BhpN8JOi5EuKqnHZ3ujFYgFcSGvk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "11b60e4f80d87794a2a4a8a256391b37c59a1ea7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
         "lastModified": 1666926733,
         "narHash": "sha256-+gYfOEnQVISPDRNoWm2VJD5OEuTUySt48RchLpvm61o=",
         "owner": "NixOS",
@@ -273,7 +288,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1667051795,
         "narHash": "sha256-S47/UGqErL4XxoQiDDtuE3EcRM614OWubyJDnADM0HU=",
@@ -289,36 +304,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1666215963,
-        "narHash": "sha256-+kSNzDXqoEVEryrJ9WrvGSvi784xPMXkk7jTJPFdT/k=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e66821278399ba9565178ce3b525e72275fe004e",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1665296151,
-        "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nur": {
       "locked": {
         "lastModified": 1667056711,
@@ -337,6 +322,31 @@
     "pre-commit-hooks": {
       "inputs": {
         "flake-utils": [
+          "gh-ssh-keys",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "gh-ssh-keys",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1667760143,
+        "narHash": "sha256-+X5CyeNEKp41bY/I1AJgW/fn69q5cLJ1bgiaMMCKB3M=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "06f48d63d473516ce5b8abe70d15be96a0147fcd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks_2": {
+      "inputs": {
+        "flake-utils": [
           "futils"
         ],
         "nixpkgs": [
@@ -358,6 +368,31 @@
         "type": "github"
       }
     },
+    "pre-commit-hooks_3": {
+      "inputs": {
+        "flake-utils": [
+          "x509-tools",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "x509-tools",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1667760143,
+        "narHash": "sha256-+X5CyeNEKp41bY/I1AJgW/fn69q5cLJ1bgiaMMCKB3M=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "06f48d63d473516ce5b8abe70d15be96a0147fcd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -365,10 +400,10 @@
         "futils": "futils",
         "gh-ssh-keys": "gh-ssh-keys",
         "home-manager": "home-manager",
-        "naersk": "naersk_2",
-        "nixpkgs": "nixpkgs_5",
+        "naersk": "naersk",
+        "nixpkgs": "nixpkgs_3",
         "nur": "nur",
-        "pre-commit-hooks": "pre-commit-hooks",
+        "pre-commit-hooks": "pre-commit-hooks_2",
         "rust": "rust",
         "x509-tools": "x509-tools"
       }
@@ -396,8 +431,41 @@
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_3"
+        "flake-utils": [
+          "gh-ssh-keys",
+          "crane",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "gh-ssh-keys",
+          "crane",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1667487142,
+        "narHash": "sha256-bVuzLs1ZVggJAbJmEDVO9G6p8BH3HRaolK70KXvnWnU=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "cf668f737ac986c0a89e83b6b2e3c5ddbd8cf33b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_2": {
+      "inputs": {
+        "flake-utils": [
+          "gh-ssh-keys",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "gh-ssh-keys",
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1664679821,
@@ -413,10 +481,43 @@
         "type": "github"
       }
     },
-    "rust-overlay_2": {
+    "rust-overlay_3": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_7"
+        "flake-utils": [
+          "x509-tools",
+          "crane",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "x509-tools",
+          "crane",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1667487142,
+        "narHash": "sha256-bVuzLs1ZVggJAbJmEDVO9G6p8BH3HRaolK70KXvnWnU=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "cf668f737ac986c0a89e83b6b2e3c5ddbd8cf33b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_4": {
+      "inputs": {
+        "flake-utils": [
+          "x509-tools",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "x509-tools",
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1666234887,
@@ -434,27 +535,29 @@
     },
     "x509-tools": {
       "inputs": {
+        "crane": "crane_2",
         "flake-utils": [
           "futils"
         ],
-        "naersk": "naersk_3",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay_2"
+        "pre-commit-hooks": "pre-commit-hooks_3",
+        "rust-overlay": "rust-overlay_4"
       },
       "locked": {
-        "lastModified": 1666665340,
-        "narHash": "sha256-lrMOzyQ1MnbVPViWgBrS0kM7Cupjup81cKQ0OM/eadQ=",
-        "owner": "fcuny",
-        "repo": "x509-info",
-        "rev": "80e1db79a95a245542d4a9ddc6eac13d717c4ac8",
-        "type": "github"
+        "lastModified": 1667878210,
+        "narHash": "sha256-iF2y7kS9sQNucsQGMLAwqwhHF+kZAXhe1bViFRdi+u0=",
+        "ref": "main",
+        "rev": "2c3f5199b41b731c61e38dc9b050a94e8c839eb0",
+        "revCount": 21,
+        "type": "git",
+        "url": "https://git.fcuny.net/fcuny/x509-info"
       },
       "original": {
-        "owner": "fcuny",
-        "repo": "x509-info",
-        "type": "github"
+        "ref": "main",
+        "type": "git",
+        "url": "https://git.fcuny.net/fcuny/x509-info"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 8e4fb65..235eca4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -40,7 +40,7 @@
     };
 
     gh-ssh-keys = {
-      url = "git+ssh://git@github.com/fcuny/gh-ssh-keys?ref=main";
+      url = "git+https://git.fcuny.net/fcuny/gh-ssh-keys?ref=main";
       inputs = {
         flake-utils.follows = "futils";
         nixpkgs.follows = "nixpkgs";
@@ -48,7 +48,7 @@
     };
 
     x509-tools = {
-      url = "github:fcuny/x509-info";
+      url = "git+https://git.fcuny.net/fcuny/x509-info?ref=main";
       inputs = {
         flake-utils.follows = "futils";
         nixpkgs.follows = "nixpkgs";