From 2284149fd573e9ced6c1058f8ce5e40baf9cf6f5 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sat, 7 Jan 2023 12:44:28 -0800 Subject: feat(home/packages): add tool masked-emails --- flake.lock | 393 +++++++++++++++++++++++++++++++------ flake.nix | 8 + home/packages/default.nix | 1 + nix/mkHomeManagerConfiguration.nix | 1 + 4 files changed, 343 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index 9054561..c405dd8 100644 --- a/flake.lock +++ b/flake.lock @@ -47,13 +47,37 @@ "crane_2": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ - "sendsms", + "masked-emails", "nixpkgs" ], "rust-overlay": "rust-overlay_3" }, + "locked": { + "lastModified": 1672095661, + "narHash": "sha256-7NTsdCn3qsvU7A+1/7tY8pxbq0DYy1pFYNpzN6he9lI=", + "owner": "ipetkov", + "repo": "crane", + "rev": "98894bb39b03bfb379c5e10523cd61160e1ac782", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_3": { + "inputs": { + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "sendsms", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_5" + }, "locked": { "lastModified": 1668047118, "narHash": "sha256-F4xP7dAU6ca+hYa3qF0CtnwfQJT3YH4qEh/IxO+p9t0=", @@ -68,15 +92,15 @@ "type": "github" } }, - "crane_3": { + "crane_4": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_5", + "flake-compat": "flake-compat_6", + "flake-utils": "flake-utils_6", "nixpkgs": [ "x509-tools", "nixpkgs" ], - "rust-overlay": "rust-overlay_5" + "rust-overlay": "rust-overlay_7" }, "locked": { "lastModified": 1667522439, @@ -98,11 +122,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1667047790, - "narHash": "sha256-hSZykZpxo8b/IwCD8hChvLXu9HlDZBiFZWRYHypgOjs=", + "lastModified": 1673116741, + "narHash": "sha256-7rJYbsrG7zM9U/3xTlCaDr7RhM5iArsg7Hfhxg1hkX0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "feea89fbc310afc87dff52ae0a1bc4afabfcbd43", + "rev": "738b3cfffacf4234d6b6a0b39ce2355574687074", "type": "github" }, "original": { @@ -128,6 +152,54 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1650374568, @@ -143,7 +215,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1650374568, @@ -161,11 +233,11 @@ }, "flake-utils": { "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": { @@ -190,6 +262,21 @@ } }, "flake-utils_3": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -204,7 +291,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -219,7 +306,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -236,11 +323,11 @@ }, "futils": { "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": { @@ -276,6 +363,49 @@ "url": "https://git.fcuny.net/fcuny/gh-ssh-keys" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "masked-emails", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -284,11 +414,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1670253003, - "narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=", + "lastModified": 1672244468, + "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=", "owner": "nix-community", "repo": "home-manager", - "rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3", + "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706", "type": "github" }, "original": { @@ -298,16 +428,43 @@ "type": "github" } }, + "masked-emails": { + "inputs": { + "crane": "crane_2", + "flake-utils": [ + "futils" + ], + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks": "pre-commit-hooks_2", + "rust-overlay": "rust-overlay_4" + }, + "locked": { + "lastModified": 1673123718, + "narHash": "sha256-GPIzZPmpb98+bOs9JFWGCuLlFLx94RDOfpDv/EvnDk4=", + "ref": "main", + "rev": "41754ecf296add1151ea57bdef251b3f48ae44f9", + "revCount": 5, + "type": "git", + "url": "https://git.fcuny.net/fcuny/masked-emails" + }, + "original": { + "ref": "main", + "type": "git", + "url": "https://git.fcuny.net/fcuny/masked-emails" + } + }, "naersk": { "inputs": { "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1662220400, - "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=", + "lastModified": 1671096816, + "narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=", "owner": "nix-community", "repo": "naersk", - "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3", + "rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114", "type": "github" }, "original": { @@ -318,11 +475,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1666926733, - "narHash": "sha256-+gYfOEnQVISPDRNoWm2VJD5OEuTUySt48RchLpvm61o=", + "lastModified": 1672997035, + "narHash": "sha256-DNaNjsGMRYefBTAxFIrVOB2ok477cj1FTpqnu/mKRf4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f44ba1be526c8da9e79a5759feca2365204003f6", + "rev": "f1ffcf798e93b169321106a4aef79526a2b4bd0a", "type": "github" }, "original": { @@ -330,13 +487,45 @@ "type": "indirect" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1671271954, + "narHash": "sha256-cSvu+bnvN08sOlTBWbBrKaBHQZq8mvk8bgpt0ZJ2Snc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d513b448cc2a6da2c8803e3c197c9fc7e67b19e3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1671271954, + "narHash": "sha256-cSvu+bnvN08sOlTBWbBrKaBHQZq8mvk8bgpt0ZJ2Snc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d513b448cc2a6da2c8803e3c197c9fc7e67b19e3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1666926733, - "narHash": "sha256-+gYfOEnQVISPDRNoWm2VJD5OEuTUySt48RchLpvm61o=", + "lastModified": 1672997035, + "narHash": "sha256-DNaNjsGMRYefBTAxFIrVOB2ok477cj1FTpqnu/mKRf4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f44ba1be526c8da9e79a5759feca2365204003f6", + "rev": "f1ffcf798e93b169321106a4aef79526a2b4bd0a", "type": "github" }, "original": { @@ -346,11 +535,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1671718464, - "narHash": "sha256-yZpj27iPsaDKVyIezCJAoOsg46FCcnq2J9RkrqQH0s8=", + "lastModified": 1673100377, + "narHash": "sha256-mT76pTd0YFxT6CwtPhDgHJhuIgLY+ZLSMiQpBufwMG4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "050bad7de82834f25b2bd1769ef2813c35062ad0", + "rev": "9f11a2df77cb945c115ae2a65f53f38121597d73", "type": "github" }, "original": { @@ -362,11 +551,11 @@ }, "nur": { "locked": { - "lastModified": 1667056711, - "narHash": "sha256-rwbRZLpVzoQhM2vCt0YFvL1PoosfIZqknAshfD1bt6o=", + "lastModified": 1673120793, + "narHash": "sha256-qcWEuZ57sSJ1Vxu3ZyjlQv/ijigS0k3A7W3/wDazftk=", "owner": "nix-community", "repo": "NUR", - "rev": "248c0ebe4a3c450fa1aa90b3c4a7a847a61fe574", + "rev": "811ec3c87437484e677dcf9a9f2011887e97ebaf", "type": "github" }, "original": { @@ -402,19 +591,50 @@ }, "pre-commit-hooks_2": { "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": [ + "masked-emails", + "flake-utils" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "masked-emails", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1672734157, + "narHash": "sha256-uwUBnv0bN1SO4QVIo8KUx/jxRYCy7cW8kzZa+Qsrw9k=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "d0ce0a861260493c6c21f16f59d25076f73cb931", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_3": { + "inputs": { + "flake-compat": "flake-compat_4", "flake-utils": [ "futils" ], + "gitignore": "gitignore_2", "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1666604592, - "narHash": "sha256-Bxy7xeVAwC0yxFaeYZM7N9Us/ebxpMC9TCceKEFeay4=", + "lastModified": 1672912243, + "narHash": "sha256-QnQeKUjco2kO9J4rBqIBPp5XcOMblIMnmyhpjeaJBYc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "1b436f36e2812c589e6d830e3223059ea9661100", + "rev": "a4548c09eac4afb592ab2614f4a150120b29584c", "type": "github" }, "original": { @@ -424,7 +644,7 @@ "type": "github" } }, - "pre-commit-hooks_3": { + "pre-commit-hooks_4": { "inputs": { "flake-utils": [ "sendsms", @@ -449,7 +669,7 @@ "type": "github" } }, - "pre-commit-hooks_4": { + "pre-commit-hooks_5": { "inputs": { "flake-utils": [ "x509-tools", @@ -481,10 +701,11 @@ "futils": "futils", "gh-ssh-keys": "gh-ssh-keys", "home-manager": "home-manager", + "masked-emails": "masked-emails", "naersk": "naersk", "nixpkgs": "nixpkgs_3", "nur": "nur", - "pre-commit-hooks": "pre-commit-hooks_2", + "pre-commit-hooks": "pre-commit-hooks_3", "rust": "rust", "sendsms": "sendsms", "x509-tools": "x509-tools" @@ -492,17 +713,17 @@ }, "rust": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1667011705, - "narHash": "sha256-ohupiBVlXCkdQpvG79akjCILZEb+7DetDVepljR0pNI=", + "lastModified": 1673058265, + "narHash": "sha256-FFigGHIO9BQeIIKjH5dcpB+ey5CSgfy47wHPGeOhCps=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "34d76c0a001d81a0fac342698ce7926da37b8ea5", + "rev": "802ff3314663ec7114f29a6e8b200dfc892023f8", "type": "github" }, "original": { @@ -564,6 +785,58 @@ } }, "rust-overlay_3": { + "inputs": { + "flake-utils": [ + "masked-emails", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "masked-emails", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1670034122, + "narHash": "sha256-EqmuOKucPWtMvCZtHraHr3Q3bgVszq1x2PoZtQkUuEk=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a0d5773275ecd4f141d792d3a0376277c0fc0b65", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { + "inputs": { + "flake-utils": [ + "masked-emails", + "flake-utils" + ], + "nixpkgs": [ + "masked-emails", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1672712534, + "narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_5": { "inputs": { "flake-utils": [ "sendsms", @@ -590,7 +863,7 @@ "type": "github" } }, - "rust-overlay_4": { + "rust-overlay_6": { "inputs": { "flake-utils": [ "sendsms", @@ -615,7 +888,7 @@ "type": "github" } }, - "rust-overlay_5": { + "rust-overlay_7": { "inputs": { "flake-utils": [ "x509-tools", @@ -642,7 +915,7 @@ "type": "github" } }, - "rust-overlay_6": { + "rust-overlay_8": { "inputs": { "flake-utils": [ "x509-tools", @@ -669,22 +942,22 @@ }, "sendsms": { "inputs": { - "crane": "crane_2", + "crane": "crane_3", "flake-utils": [ "futils" ], "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks_3", - "rust-overlay": "rust-overlay_4" + "pre-commit-hooks": "pre-commit-hooks_4", + "rust-overlay": "rust-overlay_6" }, "locked": { - "lastModified": 1668913928, - "narHash": "sha256-l8rmzMW0py0Q8Mrxc0Fw+ZFG0R08dS7WqghEllBbd9Y=", + "lastModified": 1669084050, + "narHash": "sha256-yyCn7MpkFW2UHIbWcqja9IbvUjdlILD7w8zIqdmnPFA=", "ref": "main", - "rev": "43200a050e9e85a3b8cf717e59efb84d9314a6b8", - "revCount": 5, + "rev": "87c690117ace78b19f1535595cb68aced1fd04b1", + "revCount": 6, "type": "git", "url": "https://git.fcuny.net/fcuny/sendsms" }, @@ -711,15 +984,15 @@ }, "x509-tools": { "inputs": { - "crane": "crane_3", + "crane": "crane_4", "flake-utils": [ "futils" ], "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks_4", - "rust-overlay": "rust-overlay_6" + "pre-commit-hooks": "pre-commit-hooks_5", + "rust-overlay": "rust-overlay_8" }, "locked": { "lastModified": 1668381652, diff --git a/flake.nix b/flake.nix index d4adb95..8633bda 100644 --- a/flake.nix +++ b/flake.nix @@ -62,6 +62,14 @@ nixpkgs.follows = "nixpkgs"; }; }; + + masked-emails = { + url = "git+https://git.fcuny.net/fcuny/masked-emails?ref=main"; + inputs = { + flake-utils.follows = "futils"; + nixpkgs.follows = "nixpkgs"; + }; + }; }; # Output config, or config for NixOS system diff --git a/home/packages/default.nix b/home/packages/default.nix index 810efaa..7c8da03 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -46,6 +46,7 @@ in # tools from external repositories x509-info gh-ssh-keys + masked-emails ] ++ cfg.additionalPackages); } diff --git a/nix/mkHomeManagerConfiguration.nix b/nix/mkHomeManagerConfiguration.nix index 67cee3c..9f92cbb 100644 --- a/nix/mkHomeManagerConfiguration.nix +++ b/nix/mkHomeManagerConfiguration.nix @@ -31,6 +31,7 @@ inputs.home-manager.lib.homeManagerConfiguration { inputs.rust.overlays.default inputs.gh-ssh-keys.overlay inputs.x509-tools.overlay + inputs.masked-emails.overlay (final: prev: { tools = import "${self}/tools" { pkgs = prev; inherit naersk; }; -- cgit 1.4.1