diff --git a/flake.lock b/flake.lock index f56e58a..e92288b 100644 --- a/flake.lock +++ b/flake.lock @@ -3,21 +3,22 @@ "agenix": { "inputs": { "darwin": "darwin", + "home-manager": "home-manager", "nixpkgs": [ - "ragenix", "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1682101079, - "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", - "owner": "ryantm", + "lastModified": 1704904989, + "narHash": "sha256-PkYsmQGhx1G1wlxiXkB4D2w1btE+J2d+TGEHKmx0z9k=", + "owner": "uku3lig", "repo": "agenix", - "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", + "rev": "2bb2c0d64b99b3c97d7254b751099218742ed4f2", "type": "github" }, "original": { - "owner": "ryantm", + "owner": "uku3lig", "repo": "agenix", "type": "github" } @@ -58,50 +59,19 @@ "type": "github" } }, - "crane_2": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": [ - "ragenix", - "flake-utils" - ], - "nixpkgs": [ - "ragenix", - "nixpkgs" - ], - "rust-overlay": [ - "ragenix", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1681680516, - "narHash": "sha256-EB8Adaeg4zgcYDJn9sR6UMjN/OHdIiMMK19+3LmmXQY=", - "owner": "ipetkov", - "repo": "crane", - "rev": "54b63c8eae4c50172cb50b612946ff1d2bc1c75c", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ - "ragenix", "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -127,22 +97,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -165,7 +119,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1705309234, @@ -181,24 +135,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -222,6 +158,27 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -346,39 +303,15 @@ "type": "github" } }, - "ragenix": { - "inputs": { - "agenix": "agenix", - "crane": "crane_2", - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1682237245, - "narHash": "sha256-xbBR7LNK+d5Yi/D6FXQGc1R6u2VV2nwr/Df5iaEbOEQ=", - "owner": "yaxitech", - "repo": "ragenix", - "rev": "281f68c3d477904f79ff1cd5807a8c226cd80a50", - "type": "github" - }, - "original": { - "owner": "yaxitech", - "repo": "ragenix", - "type": "github" - } - }, "root": { "inputs": { + "agenix": "agenix", "catppuccin": "catppuccin", "flake-parts": "flake-parts", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable_2", - "ragenix": "ragenix" + "nixpkgs-stable": "nixpkgs-stable_2" } }, "rust-overlay": { @@ -406,31 +339,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "ragenix", - "flake-utils" - ], - "nixpkgs": [ - "ragenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1682129965, - "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "2c417c0460b788328220120c698630947547ee83", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index d210121..b6f6559 100644 --- a/flake.nix +++ b/flake.nix @@ -30,8 +30,8 @@ }; }; - ragenix = { - url = "github:yaxitech/ragenix"; + agenix = { + url = "github:uku3lig/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/modules/common.nix b/modules/common.nix index 186e151..91881c1 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -3,7 +3,7 @@ pkgs, config, nixpkgs, - ragenix, + agenix, ... }: { age = { @@ -27,7 +27,7 @@ systemPackages = with pkgs; let inherit (pkgs.stdenv.hostPlatform) system; in [ - ragenix.packages.${system}.default + agenix.packages.${system}.default neovim git curl diff --git a/secrets/etna/rootPassword.age b/secrets/etna/rootPassword.age index 3a60944..121d4b1 100644 --- a/secrets/etna/rootPassword.age +++ b/secrets/etna/rootPassword.age @@ -1,14 +1,12 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXM1ZINU1XQWpZNmgwWlVS -SElLcmdnMkRLeHdrakhNYnV4RVRtWFJxZ0FRCjVEK2V4a0NabU92M1I1OW53OWcx -TVhBaFNCRC85Q2M1SHU1aGsyNGpQUTAKLT4gWDI1NTE5IFJQTnhGTmtCUmI1b2c3 -ZStYUE4wMmdiM0RxZGdXbndKdFhQeFg5NnN0bGsKTG51THd6dnkwOWdyc0VZVjJx -dUxSdjRra0ViWjU3V1NEaHZEUE5KTmJaRQotPiBYMjU1MTkgbkZRbzlxYTlDYks5 -L1RiMWFkSFppT0gxVkZ5M1FOb2xCUThseEUvNmhnWQpqcXBpb2VMSWxveVNCM1ZU -NHVodktXRnJ5bThHSHpZbG1EVnI1bzlLTTRRCi0+IDU0TCh6dy1ncmVhc2UKN1lP -NWJTbGg5NFNoUlc1cFZ4aG93ME1BYW5kZVBkR2ZUZzdtWWMrRE5TSUxCNFErSnZo -OC93N3ROK01qCi0tLSBVamc0NUtSVE1VSnJVLzlLdGVkend2dzF1K2YwbHBRTzZ6 -SjNIcGpmcFlvCoAAST+ISOC6zGaDsE5ErwavjCMUUL6MSBTs6E4kwwjPi5xGx4cd -d06c0Jb8Hzzl4TYvfJZKuW6j4KnmXTB7cHhZo1t4IhdlRQaaexDeNbFoxnB+pbKb -+jajioojpN9kKQY= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBQTFmTGtnUHRPUCtaTllq +bEZWSkJhbmhsNHY0d3p0aXpUa1hNUStpa3l3Ck1FMm1HdXdjMlNPbk1Bc1BoMjd4 +Y0hiZ2E5YWsxeEIxK0M0cTJISHNiN1kKLT4gWDI1NTE5IFJjQXZDLzdTWE9SMC84 +WTlobU1SM3E0ZytXYm5aNVhvVEFxRzVvU3AvUzAKQUNPRFVscTFUZm1HVkNlU0V3 +SUpaUVEvaVlqTDFBUjNzSW1lTXF2R0J0OAotPiBYMjU1MTkgOXYyQUVZVlorTWlV +Tk9ZcXhvTUlJL0NYUU9tR25QYllGOGZGckZvQjhGTQp2UWtSMk1WMHphbHlLZjVN +TkM5eS9OcndLbHZqd2ZPRGo0eDhad3VBdjRrCi0tLSBmdC81YUR3dWhmWnp4NE1x +Y1ZjcVgvYmI1OGozdHV3VWN5UmNCRHBCTlZZCmDa17HFlelXqNx0gxEF5iigax4x +/8EScQ68eS0Pux+YhrZmMh6RAZWvQ2nY7rKjt1Hx3fefBVZzURviE9Qa3oWfy5dD +hxazvwLEFWthVmQVKDJnRUJFERnxDrk44Np5LH0= -----END AGE ENCRYPTED FILE----- diff --git a/secrets/fuji/rootPassword.age b/secrets/fuji/rootPassword.age index f73f458..9b97a0c 100644 --- a/secrets/fuji/rootPassword.age +++ b/secrets/fuji/rootPassword.age @@ -1,12 +1,11 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5dFR0dUVuTThzMFZTTlht -bnlPNkJ0YlV1WnA3TnNXdkJSMG4rT1JBMFVjCmdjWTR5cmZZcXlNSmJETVNVT1VF -UU1tY0ZsQzNqTE1rMXowcUpFaG9oUjAKLT4gWDI1NTE5IFNpVjA0blVIWHBlT1R3 -M3Y5T3lHaGV2c3JaREN0V1BVd0RsQWcwNjdmU0EKTnVVUEFxMWpHclZjWCtIR1lH -cUJHM3lMc1FCdVY5VTBIUGc0LzI4dFgxawotPiBnSCt6SCotZ3JlYXNlIH0KVzZr -WURzcXlHemRLOFlEcTU2WERjRDV6bWpvT0NnT2ZvR2lySDRFCi0tLSA0UDY2RG5X -MmtwZmp6VWwvT2ZvMzFRKzg5SGxkZmsvSGFhKzN2U2VoOFVFCiXEs907Y0YetyFF -0IfFzesKLjF7NWA81HeYRkK6RRk2CYDHfXOyVQdLVjUYZR3IAMmZfhxdZ2JDE5ul -WFmStlS8kpCDJjqjV5j65/BUz3NySaId7/Qh87ac5oOGLb3A5JUYU56xvBB5EOPA -17T1zatrQFbZ+b2m591Ol82qLIwpu/j4DKCH2Pnm8aw= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0NHFLV0lOeWNmQUxuVjRy +ZlJUMm1IdEdLMGRYRWVLUkQ1eFovY1VWYnpZCmxXcHdlT3NLb2J6b1MxR1lLa0lm +OTY4RVpzUmx2a2xXVVlra2NZbTlodWcKLT4gWDI1NTE5IHpEc2VjNGNBVVpOOEFt +TG4xVkRQaW82THRuUW1RcjdTOS9TVXhjUTIwVFUKTi9ZZ2lDR3hSYUsrcU9xVGxU +NmZWOXVFclg3d001QzNZWloyTzA2a0ViUQotLS0gU3J6SU5yWEk3UWo5NVZKM08w +a01sRXVleUFZZXoyT2VNTVdGVjEzK0kvQQpjYP5Ov3yz+dqOvSE0LZRPG66Wn4Zo +Bza3B8K2U7/WTUm3hBmaTFdrndlINwq4mbdFTMa4eQnPaJzn7ZHgxwUlfjRebQlx +p+e89K3eKzVHQfg9/d8j2f6GE5Mh3uk/vJ/eiZQKWDdbPPDa3RVxoTPUQ+1Hph11 +1VzIexgRvMFtNgMvSwb7Y/VVrboI -----END AGE ENCRYPTED FILE----- diff --git a/secrets/kilimandjaro/rootPassword.age b/secrets/kilimandjaro/rootPassword.age index fde975d..28f0e39 100644 --- a/secrets/kilimandjaro/rootPassword.age +++ b/secrets/kilimandjaro/rootPassword.age @@ -1,14 +1,11 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4ZmFZU1FvMDlaRWNRNXZo -TEFUWEhJem9IanZHTGVienJJcXpnNVhjQ2pnCnNVdlVpWmFhRXZSS284QkdpYnVq -SEtRZURONFFLT1U3by9lUythV3RRRUEKLT4gWDI1NTE5IDlPVEF5SFJQYmRobUQv -Zk5YaFFDWUthc3cxdjlqZE8zR1hZUHArUWRwU00KaG1qZWY0OGwrWlN6cS9GY1pL -emhVZ2k4bTF6YWp4SklhSkNGSFIvQ2M5bwotPiA4bTopWCY7Ni1ncmVhc2UgdFs5 -S1xaeFIgfk1MTApnOE10WVphZnRTd0ZKbDdGcTlvWlY3RHN0YjhRcDN3eGlNRVFk -eDZBU3RJNitZZnpmTkFsOEh3d1Ywamd3TEV1CjBJZkhQYU9iRVVGMzhnaFdBZG1D -ZUNjdEpTNDV4NEhxdWpEUU9CWDRlQ2RYVGcKLS0tIEJQQy8waFVvK0FqaklDOUZD -c3BabjA4QXJ0RTVlazl0VkJGbkNoQy9zZEEKM6mW4mDz0aWpe1x2tkpzcjdjqe0i -trBwj6kaUh3mDoUfdMLZ3FDVqi7je9jFQIBMVctzZNKMOADgbGDTli7m0wGZBWSL -i8bTv1I9tgny46Kc2jvP2xOPgfTFKU87pRf133Nt1sbxL+LT0tgcPUDuEMTf3E7U -g5FXSN7Kk/aaZ/h2U2rRddn54ypLyw== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZZ1J4ay9lL2F5Vi9DK3cv +LzVwdWVkVkxCbVg4NkdJbnhwMjFsdC91VkNzCkFiNzV4U3VUMmY3SUNtQ2lGMUpK +bGR4WWREcllhaFF1RkJMdFhDWStXSzgKLT4gWDI1NTE5IFAxUFBVb3ROV3FSeTRM +MUJJWWZmTHFKekJVb25sOXdyWm5yMnhOcTFHQjQKd05qMXBDdnBPd3JXRis0bnlj +c3pQOHY0a1I5d1k1MW90dHdNOVNnYTZBdwotLS0gbFIzcDlWTGo4cmFvVWNKbFkx +TVU1azB0MG5FUnVuQzV3OXMxVXBhTFQvVQrYbYP3gOFdWZNwpFe3Nwp1g6oTHfg3 +mnv1u1ZdD/Y+SbJncCJrzp3eB/xWCnHTlTWDQh0hpMthYspfDwnQExTamKdD80Zh +rqyFMsri3QrQUBbAPT2ars/AmDKDq4epZ8jEk7rp0b1EsXvunJg2U0XSSfb1Ht91 +F0A4pbtHMGQeqVVqZyMWRvgwFj24 -----END AGE ENCRYPTED FILE----- diff --git a/secrets/tailscaleKey.age b/secrets/tailscaleKey.age index 46a2591..aa8939b 100644 --- a/secrets/tailscaleKey.age +++ b/secrets/tailscaleKey.age @@ -1,12 +1,12 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBbEI1TTVWeE9VSTBBTmdU -dkxkdlh0bzRiTEJsamRBOC9yTTU4ZzViN3lvClZpQVFYL0h1cERadDFjbUZjT1F4 -ZmNzbEtrNWxNbURPK0xtSzhzaE9URkEKLT4gWDI1NTE5IHpYOGFTcTc2RGxvSnhC -MTk3aloxV0s0cTNPSkV3QXUxVW5PTkl4M3B3VmsKMmovM1NMeFVwTG5TVjNoMDRn -VVg4a2Q2Uk5leW5IM1JWbDBiL0lCU3E5YwotPiBmJnlOSiEwaS1ncmVhc2UgISB2 -JXpBaWBCCndwOCttYTRQV3Q3L2h4MXBWaENEQzlCZktndmhpQVduL0ExaFRzYzlv -bG5NMnJZREltekFsc21tVjZCb3FnCi0tLSBpNjBoTU9kaVpjclZmYS85YUJwbVBo -NHhJRDI4TytKa0hTUHdHcE9zV2pJCuXL+3f4X0WqOtdkf4aa4I+4j6aYzN71aUPd -gefAEG7Nrl1XiGX01K0dYfm8rnWmf1tNhfXpmq9eU7KTfLvK8bTrqOuKQtJqXnOp -ansfY2eWuGNDu1LdlbGIrg== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1bUlNbldTaVMramw2Mm82 +ZmhicHNvbmJBVS9HK3hnY0tQYTdUbGF0dVNVCmJlT2pLUng2VDNPbXN0TklEWjdQ +c2JxaXNpeUEzaGVnbUdTblY0YTVuVEUKLT4gWDI1NTE5IHh3TEhmQ2trTVN1SjBZ +T3h3Z2lyeTlhUk80R0srMVpta3Roc2hIYkxwVEUKZlFRSmQ0TU5CdzlZVjNWc3li +WktwRTlLSXo3bHo2emRXYWxhZEVqWTVKZwotPiBYMjU1MTkgMmdpZlNFQjRabjFT +U0dSSGlTbmxGMjg2aTFFY3NabG41S2lWOUxrSklIbwpsREhtMHBsS3psTFVSdHBw +OFQ1S0pVRmRZOVVKVm01RkpzMlc0UGhQTTFBCi0tLSByaUQvRzFEb2NoOEhOaUVW +N251dnE0T3JCR1o3cmlteHRLaFBYY0pxcVZNCnewr74CXrbt3q/rcykNmGGpBsEo +HmkCStLCI+Kw8cK/YnM6ZGss8uYnYAZLCOLDGKAotzJysSFpyVM5thI+HwU8lMAy +M+asHYrzr2wbby93XF8MRJ0hAYTSDA== -----END AGE ENCRYPTED FILE----- diff --git a/secrets/userPassword.age b/secrets/userPassword.age index 9b1ca53..6978e89 100644 --- a/secrets/userPassword.age +++ b/secrets/userPassword.age @@ -1,12 +1,12 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4amN5eXNianBtOTRpQ2hj -clhMVUwweXRkblYyS1VjdllRRTIrZ25KM25jClhkT0kxaUVWWTEzTk5wU012WEFl -Skc1K01BdXFMVG82emo5SXRRdEIzcFEKLT4gWDI1NTE5IE9NaHl2OXd6ZXlMdXVB -aklzZ0FIN3JKOWpkVkV3RHlRLzZXSjdQNlNRMDgKUHA4U1FTdTBKTkd3cEVUTUFO -Ujc0cmNEMjZsVDJCNkNsczVTMGJnOHFzcwotPiBnQSJJRy1ncmVhc2UKMUxPQm5G -blhzWTBWYmQ5dTZJWjdTNnZJQTY0L3p6S3ZVa3FLNVR1UENVVVRVYUJteG1IdGtU -MEpoSnBEQ1hBMQpZakdHOE12YQotLS0gTm93cXJoNEVUVjRzQlpDaHA0UVIyNXFr -MG9OYUFBekJ3TUdqVTlEcm1pbwoV2hJ7OZJ9OWVyn0Ma1LCS0vm+Lq5pVxodl6dX -mLwd9jT2ELKelt1CDkzTESToZw6FeFifC14Jv8H9z0+IwThBT9kptQ9xIsvtJ5vH -+yUTtxcz6oWJA8f8xRGh1FvWrUf1g7xhMkzVstPv +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZVStpZXVtMk8ycCtZcUox +c2EvZm95ZEl5dFc3N0tpN054THlxdFYwTTBRCjZRdk9WalU4RUQyWkV5WXhqVzVM +WlZoZkVmOWFocnFNWE5TRGV3MWJDSVEKLT4gWDI1NTE5IE0xaFB5ZWhUQkY2Rkxs +ZUw5N1QwT01tcysxUWdMTlU3SHM0U1YxMURYUU0KRWhkRTNaRW1NK3ZocGN3TS9W +L1c0Vm14WFFDMHN6THpTUWVuK0sybG9KdwotPiBYMjU1MTkgMWhmWklOeGlidU5n +RTUwYzZqK3RvQ2p1YkE2UVcxa3NsN3FYcjJXdjMxbwpBOXhSUXo4MFNvdU5KWjBo +cTExWkNSV1NReU5Hbjl1TGVhanA3ZkU0anNBCi0tLSBhWE5KR01RTU5GV3VyRWdR +L3ZoU3dWZWlIdUozTHZ1cG14Mnc3QkVSb1I0CqA5suU70fj9A2KCVUdKB2H9KqIp +qzGN/0TvanQS2Q021lSrjs3z+FYIFqRtuFek921vqT3rEjoVvYTHWRDIrAKTAzKn +4Co9jyFkycSoK7YXztZxbe+X00Xrrd2nj86L+ao1W6s2bc2yySU= -----END AGE ENCRYPTED FILE----- diff --git a/systems/default.nix b/systems/default.nix index e198357..d231c3d 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -24,7 +24,7 @@ nixos = with inputs; [ ../modules/common.nix - ragenix.nixosModules.default + agenix.nixosModules.default home-manager.nixosModules.home-manager ];