diff --git a/flake.lock b/flake.lock index cd3c0b2..8febf1b 100644 --- a/flake.lock +++ b/flake.lock @@ -3,21 +3,21 @@ "agenix": { "inputs": { "darwin": "darwin", + "home-manager": "home-manager", "nixpkgs": [ - "ragenix", "nixpkgs" ] }, "locked": { - "lastModified": 1682101079, - "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", - "owner": "ryantm", + "lastModified": 1700097833, + "narHash": "sha256-Nzr92hHCzSXOYBbO2LCJhb4Tykgo5NVuYSzcLQByubk=", + "owner": "uku3lig", "repo": "agenix", - "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", + "rev": "da400b2f61620e858078359d787006e1366fd03c", "type": "github" }, "original": { - "owner": "ryantm", + "owner": "uku3lig", "repo": "agenix", "type": "github" } @@ -43,40 +43,9 @@ "type": "github" } }, - "crane_2": { - "inputs": { - "flake-compat": "flake-compat_3", - "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" ] @@ -128,22 +97,6 @@ "type": "github" } }, - "flake-compat_3": { - "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": [ @@ -200,24 +153,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "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" - } - }, "getchvim": { "inputs": { "nixpkgs": [ @@ -287,6 +222,27 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1682203081, + "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -439,39 +395,15 @@ "type": "github" } }, - "ragenix": { - "inputs": { - "agenix": "agenix", - "crane": "crane_2", - "flake-utils": "flake-utils_3", - "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", "flake-parts": "flake-parts", "getchvim": "getchvim", - "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": { @@ -499,31 +431,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, @@ -553,21 +460,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 2cdece8..c043f84 100644 --- a/flake.nix +++ b/flake.nix @@ -23,8 +23,8 @@ }; }; - ragenix = { - url = "github:yaxitech/ragenix"; + agenix = { + url = "github:uku3lig/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/secrets/desktop/rootPassword.age b/secrets/desktop/rootPassword.age index de4ba56..d1dc86a 100644 --- a/secrets/desktop/rootPassword.age +++ b/secrets/desktop/rootPassword.age @@ -1,11 +1,11 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDRQMGFOdyBYTnBt -VG5mQjhQRnpNUnNIUXlEd1Z4YWNOMUczZ25nZFRTelZHQm40aWpFCm82VDF2NElO -SmhpR1hUT20wVmlycGJ2YVlxY2lZNzR1cW02VGk2SzlvN00KLT4gRS1ncmVhc2Ug -cyBFKXcKVnlHNXpFdWVkTnVDOWNEWU15empzNUpwY2d3L0s2VnZBclF5eHZwNEly -ay9tTVlPVEl3SVE0Q2p4a3QrQ01JWAp6ZHJDR29HZFpmSXYvbG9NCi0tLSBKMTNM -aTNmN3l6dUs1Qi9PTlE3WE1KYUlZOUcyZVdvcS82SjM5U0tMSndZCjendvKUz/jp -l+3DDw4ZEaODSdhmSZ8lZ6oG7qaccqYbm7of0CZmFtRnns1K89wkNOzmjaM2TwtO -9N9m2nMmze/Cf5U2Po15WvbmR6CVMNISAGbTx7jzqbK0ibrLFrXM1ahNnI+XXFzR -phdwBYRITi67DkzdiZLypCOCpSeiVcVyWrK8YDtC3BtGkME= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDRQMGFOdyBHMzNS +OGNDcFdjaFl0czhHbGRLK2RacUplZzZPeTlsbTZFdjR1UXF5TDE4CitGdzVIMElX +UHRmYmZzVE5YY3J0VzFnbUJqNGlvVGw5RXEySnJ4UzRPaHcKLT4gQS1ncmVhc2Ug +QjQ+I2UxIFgoZE5gaWUgPmNqMCApVTRFInRrCmRZdkJLTFpPU25QRk42T1piR0Vw +Z0xrOVJVY3BXTmMKLS0tIHBSSDBqSWxISXh3Q1ErK0Y4YW8yamVpQXNhQ2hxMmZY +N2J3N1NuOUxYcW8K3vxFXBdoRbsRu46x2wkht529KxYMkj0ZhuSU8DTQAtH5JMIw +NSO0CpHRzFmHleoba8K4DSGy7V2gIVFZn13KIP5adtzOnMV3S41uC+FxLFK5sph0 +HiZNZi/CqhMJh5QuEJDLMQjwQ8vh2ffLBThmO5LqkIRFJJPpeieD3inVBIX+Y0Y2 +z9gx9jzaLA== -----END AGE ENCRYPTED FILE----- diff --git a/secrets/desktop/userPassword.age b/secrets/desktop/userPassword.age index e2f4795..faca72d 100644 --- a/secrets/desktop/userPassword.age +++ b/secrets/desktop/userPassword.age @@ -1,11 +1,11 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDRQMGFOdyA5Q2NT -YTRvT1lpQmk0czVqRWY1S3ZWaC94dXovbkhkNm0wZWswanpoUjNZCllIVEtLSzVq -d3Z6dWVPck41RTY3cDM5VlB2QlRCRVZlbmVxU1ZJblVIbXcKLT4gMS4mPidNLWdy -ZWFzZSBPbXlzR10kCkdDOFQ2UCs0a0s4NEFjM2dTUVlxMDhIN3pvdTcrbkpWK1Qw -ZGl3dmNRazM2WlJ1NFdablZpMklGQkdBazQrVzAKTTA3eWJEcDBKRHZiS1ZvVTZl -VDAzZU5CU2htdUcvT2gxZDNKCi0tLSAxN29ROXVMNWZ3YnJQR0VQMWIvanpuaUxK -dTY0M3VUZXhWRTh6ZXNVYkdzCk6b13jgvSYOq85RpkonJLHrm4xZPOBi2KRhBG2Y -ySeQYDBEurP4dalNgskEwQPKNygrW+SJD3rhmCEs+y4s7u6lJ4snxz5s9USNsGnX -75AdrShqTDVENu30DEQoypc9fYLvkie/fg9G7rw= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDRQMGFOdyBnSzhu +cGYwM3VFajVCOGhGa3hTcktTa1VhbkplZFhnc3ppZXlSWExFRUI4Ci9qT3MydUt0 +NzVsWUZMcDZ6U3htMkIyUXg0eWNnMXR0ZzF4UVlEdkMxNHMKLT4gLiVZLWdyZWFz +ZSAmPTZnbEsgezU7YHx+IGY8XzQtayA2WApjMlZ5M1FYVFg3MjRydlZwam9XUGYv +Y2swNHBsZXdsZDUrb2tjNEpyOUtuck5wL0tSTHh0akxBckJvRWt6RitvCmM0ZS9s +Skh1bWg5by84L3VEV0tXdnM3MSs5ZW4xSnorWUgzbHFPUQotLS0gSjMrVVc2S2oy +Sy9GMUY1WUlYZ3gxZmFTOHl6K01PMjV2ejR3Umtyb3VPMAptrFOjuXbeqLlmYz16 +qY2HtGPorPUszQcd4ZSJMM7thcPHxsohLsvmCpRGrSMkY5B5ehbSu6GkdZYpBuON +x98uVRNYoXP9t3Kv+V9jOVWZnnU6A29dBQ2xQGl40Au/8tmwdGgqZMLtLdOZ -----END AGE ENCRYPTED FILE----- diff --git a/systems/default.nix b/systems/default.nix index 441e715..4552892 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -24,7 +24,7 @@ nixos = with inputs; [ ./common.nix - ragenix.nixosModules.default + agenix.nixosModules.default ]; desktop = with inputs; diff --git a/systems/desktop.nix b/systems/desktop.nix index 1f87284..fe44c9d 100644 --- a/systems/desktop.nix +++ b/systems/desktop.nix @@ -3,7 +3,7 @@ pkgs, config, getchvim, - ragenix, + agenix, ... }: let username = "leo"; @@ -144,7 +144,7 @@ in { osu-lazer-bin gnome.file-roller getchvim.packages.${system}.default - ragenix.packages.${system}.default + agenix.packages.${system}.default ]; services = {