diff --git a/flake.lock b/flake.lock index df702a1..5390070 100644 --- a/flake.lock +++ b/flake.lock @@ -15,11 +15,11 @@ ] }, "locked": { - "lastModified": 1685309025, - "narHash": "sha256-pZxMM3AMP/ojwhrFD0A2ML4NOgehlBLGHseInnO5evc=", + "lastModified": 1686620679, + "narHash": "sha256-Ck/r3f+W9mOn3cHn5ii/fogBiJtosFnDaOQveaJ0zVU=", "owner": "zhaofengli", "repo": "attic", - "rev": "b1fb790b5f2afaaa1b2f7f18979b8318abe604bb", + "rev": "4fedffe6a1020edfcfa7bef18d21321d4983b3a7", "type": "github" }, "original": { @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1685948350, - "narHash": "sha256-1FldJ059so0X/rScdbIiOlQbjjSNCCTdj2cUr5pHU4A=", + "lastModified": 1686747123, + "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=", "owner": "serokell", "repo": "deploy-rs", - "rev": "65211db63ba1199f09b4c9f27e5eba5ec50d76ac", + "rev": "724463b5a94daa810abfc64a4f87faef4e00f984", "type": "github" }, "original": { @@ -146,16 +146,31 @@ "type": "github" } }, + "flake-compat_4": { + "locked": { + "lastModified": 1688025799, + "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -171,11 +186,11 @@ ] }, "locked": { - "lastModified": 1685599623, - "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", + "lastModified": 1687871164, + "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=", "owner": "nix-community", "repo": "home-manager", - "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", + "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38", "type": "github" }, "original": { @@ -209,11 +224,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1686306040, - "narHash": "sha256-pkS/Cz4yLUsl3ITipjmAolRpK7PS4c893VtUNMdHWf8=", + "lastModified": 1689357751, + "narHash": "sha256-72rOd/X5dyO/5fxmeXz5oT13/Di5C71nyEj534rU2T4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "cf37922d4285689990a648bc02aecb90a07a36ba", + "rev": "459afcc47f7a8fd0b85c4b89645099e2643732b3", "type": "github" }, "original": { @@ -248,11 +263,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1685950944, - "narHash": "sha256-59by/hDMxPhq2KLRdjL5n5HoQjbfLdpykOa7BG6gEYw=", + "lastModified": 1687552413, + "narHash": "sha256-mTOKGRi8mJVzJEnTaHpni5Whi1ohoWguLaD6Hs+ruZE=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "64d0ebd66652a5614b645b1ffb4d592ba50d532a", + "rev": "a1d9ab7584485fe0b4a992abf19486a72179d4b2", "type": "github" }, "original": { @@ -271,11 +286,11 @@ ] }, "locked": { - "lastModified": 1684177642, - "narHash": "sha256-WUYUKvmlVsrgFf7kDc7s/FeCF3CsEZU/5tgqbYd1sgY=", + "lastModified": 1688227218, + "narHash": "sha256-hlZlGblw7PDRlC4dBJVC3hwy+HZbXC+Mq4jbXP94ya4=", "owner": "JulienMalka", "repo": "Linkal", - "rev": "4db8e2d9f51c96ae537bfd31fb52467ffb7b86a3", + "rev": "354b464cd6b6263f41b19ba05ab5163d0e8203db", "type": "github" }, "original": { @@ -312,11 +327,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1685532165, - "narHash": "sha256-xHH9WbE9uya2B+j5w82HzpZVeErBt03/jtmWVRox0EU=", + "lastModified": 1689122205, + "narHash": "sha256-ZmV4ADgbcwRWKot3ZWSoV0FeWwgp50gYoMlS5aEibUY=", "owner": "oxalica", "repo": "nil", - "rev": "dcd38b96c91a2d07552f824a6480e00dc7b4948a", + "rev": "a7ab280e8607b52c25d899cdf7532db1ff71262f", "type": "github" }, "original": { @@ -332,11 +347,11 @@ ] }, "locked": { - "lastModified": 1685764721, - "narHash": "sha256-CIy1iwQTEKfZRrid4gBLA+r/LPGA9IUFo0lKJVyECGI=", + "lastModified": 1688874465, + "narHash": "sha256-BUwl+tq40EjkufTZkqf3lWFzxOA/mYBTHz+p5uJtjaY=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "669ca1f2e2bc401abab6b837ae9c51503edc9b49", + "rev": "757114749d4613cf71f3748e780a1be8a67a5d3c", "type": "github" }, "original": { @@ -369,15 +384,16 @@ }, "nixos-apple-silicon": { "inputs": { + "flake-compat": "flake-compat_4", "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1686194558, - "narHash": "sha256-ZEgCpLJ95TJ66A8QPgaetafhw9G7/mq8vZZFX2672Xg=", + "lastModified": 1689219568, + "narHash": "sha256-03oq6imX0mOidSmjoLjt/mSE2/6D6d4q0/UQcPn5/Zc=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "6b08b1821c45601c6833c9e5e391c0ab777631a5", + "rev": "07eef29d1214b40da45ff2fae5d7e7498a0dd8ab", "type": "github" }, "original": { @@ -388,11 +404,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685655444, - "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", + "lastModified": 1688500189, + "narHash": "sha256-djYYiY4lzJOlXOnTHytH6BUugrxHDZjuGxTSrU4gt4M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", + "rev": "78419edadf0fabbe5618643bd850b2f2198ed060", "type": "github" }, "original": { @@ -452,27 +468,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1685931219, - "narHash": "sha256-8EWeOZ6LKQfgAjB/USffUSELPRjw88A+xTcXnOUvO5M=", + "lastModified": 1689008574, + "narHash": "sha256-VFMgyHDiqsGDkRg73alv6OdHJAqhybryWHv77bSCGIw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7409480d5c8584a1a83c422530419efe4afb0d19", + "rev": "4a729ce4b1fe5ec4fffc71c67c96aa5184ebb462", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "7409480d5c8584a1a83c422530419efe4afb0d19", + "rev": "4a729ce4b1fe5ec4fffc71c67c96aa5184ebb462", "type": "github" } }, "nixpkgs_5": { "locked": { - "lastModified": 1686237827, - "narHash": "sha256-fAZB+Zkcmc+qlauiFnIH9+2qgwM0NO/ru5pWEw3tDow=", + "lastModified": 1689209875, + "narHash": "sha256-8AVcBV1DiszaZzHFd5iLc8HSLfxRAuqcU0QdfBEF3Ag=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "81ed90058a851eb73be835c770e062c6938c8a9e", + "rev": "fcc147b1e9358a8386b2c4368bd928e1f63a7df2", "type": "github" }, "original": { @@ -541,11 +557,11 @@ ] }, "locked": { - "lastModified": 1685413459, - "narHash": "sha256-+ELexqS2yN0wj1WnmWdF24OfjRBIgTN6Ltcpjvp2dEo=", + "lastModified": 1688783586, + "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9b3284e2412f76bd68ff46f8cf1c7af44d7ffac0", + "rev": "7a29283cc242c2486fc67f60b431ef708046d176", "type": "github" }, "original": { @@ -557,11 +573,11 @@ "rust-overlay_3": { "flake": false, "locked": { - "lastModified": 1686105195, - "narHash": "sha256-tBTKW+oqfT86Mvq/nm8Tkk3pzhJFXJWXJrj71cTF7lE=", + "lastModified": 1686795910, + "narHash": "sha256-jDa40qRZ0GRQtP9EMZdf+uCbvzuLnJglTUI2JoHfWDc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1279a72003f5e4b08c8eca1101d8f57452a539f9", + "rev": "5c2b97c0a9bc5217fc3dfb1555aae0fb756d99f9", "type": "github" }, "original": { @@ -608,11 +624,11 @@ ] }, "locked": { - "lastModified": 1685848844, - "narHash": "sha256-Iury+/SVbAwLES76QJSiKFiQDzmf/8Hsq8j54WF2qyw=", + "lastModified": 1689149796, + "narHash": "sha256-3FCUdayBHcxk6BZOxEIfa5UxbXNQzTc/VlN7ociI2Dw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a522e12ee35e50fa7d902a164a9796e420e6e75b", + "rev": "88b964df6981e4844c07be8c192aa6bdca768a10", "type": "github" }, "original": { @@ -638,11 +654,11 @@ }, "unstable": { "locked": { - "lastModified": 1686226982, - "narHash": "sha256-nLuiPoeiVfqqzeq9rmXxpybh77VS37dsY/k8N2LoxVg=", + "lastModified": 1689282004, + "narHash": "sha256-VNhuyb10c9SV+3hZOlxwJwzEGytZ31gN9w4nPCnNvdI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a64b73e07d4aa65cfcbda29ecf78eaf9e72e44bd", + "rev": "e74e68449c385db82de3170288a28cd0f608544f", "type": "github" }, "original": { @@ -656,11 +672,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1685803001, - "narHash": "sha256-yxq/U9zL1ssFZtgT27A96UKteCiKb3zSmbA/dokK76U=", + "lastModified": 1686753331, + "narHash": "sha256-KovjVFwcuoUO0eu/UiWrnD3+m/K+SHSAVIz4xF9K1XA=", "owner": "wlroots", "repo": "wlroots", - "rev": "b61d5922f1d0910a848deb100570ad8587aea38d", + "rev": "7e7633abf09b362d0bad9e3fc650fd692369291d", "type": "gitlab" }, "original": { diff --git a/flake.nix b/flake.nix index 9edc725..e26beda 100644 --- a/flake.nix +++ b/flake.nix @@ -231,13 +231,20 @@ ipv4 = { public = "78.194.168.230"; local = "192.168.1.4"; vpn = "100.100.45.17"; }; ipv6 = { public = "2a01:e34:ec2a:8e60:d250:99ff:fefa:b76"; vpn = "fd7a:115c:a1e0::11"; }; }; - saves = { + saves-paris = { inherit tld; - subdomains = [ "saves.luj" ]; + subdomains = [ "saves-paris.luj" ]; ipv4 = { public = "78.194.168.230"; local = "192.168.4.5"; vpn = "100.100.45.4"; }; ipv6 = { public = "2a01:e34:ec2a:8e60:3af3:abff:fe6a:1f54"; vpn = "fd7a:115c:a1e0::4"; }; }; + saves-lyon = { + inherit tld; + subdomains = [ "saves-lyon.luj" ]; + ipv4 = { vpn = "100.100.45.20"; }; + ipv6 = { vpn = "fd7a:115c:a1e0::14"; }; + }; + };