switch to agenix

for some unknown reason ragenix sometimes doesn't compile, oh well
also, using my own fork because ryantm's doesn't armor age files
This commit is contained in:
uku 2023-11-16 01:45:49 +01:00
parent d85a02c68b
commit 55096c3b4d
Signed by: uku
GPG key ID: 7D01D7B105E77166
6 changed files with 53 additions and 161 deletions

View file

@ -3,21 +3,21 @@
"agenix": { "agenix": {
"inputs": { "inputs": {
"darwin": "darwin", "darwin": "darwin",
"home-manager": "home-manager",
"nixpkgs": [ "nixpkgs": [
"ragenix",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1682101079, "lastModified": 1700097833,
"narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", "narHash": "sha256-Nzr92hHCzSXOYBbO2LCJhb4Tykgo5NVuYSzcLQByubk=",
"owner": "ryantm", "owner": "uku3lig",
"repo": "agenix", "repo": "agenix",
"rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", "rev": "da400b2f61620e858078359d787006e1366fd03c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "ryantm", "owner": "uku3lig",
"repo": "agenix", "repo": "agenix",
"type": "github" "type": "github"
} }
@ -43,40 +43,9 @@
"type": "github" "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": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"ragenix",
"agenix", "agenix",
"nixpkgs" "nixpkgs"
] ]
@ -128,22 +97,6 @@
"type": "github" "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": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -200,24 +153,6 @@
"type": "github" "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": { "getchvim": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -287,6 +222,27 @@
} }
}, },
"home-manager": { "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": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -439,39 +395,15 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"agenix": "agenix",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"getchvim": "getchvim", "getchvim": "getchvim",
"home-manager": "home-manager", "home-manager": "home-manager_2",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2"
"ragenix": "ragenix"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -499,31 +431,6 @@
"type": "github" "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": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -553,21 +460,6 @@
"repo": "default", "repo": "default",
"type": "github" "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", "root": "root",

View file

@ -23,8 +23,8 @@
}; };
}; };
ragenix = { agenix = {
url = "github:yaxitech/ragenix"; url = "github:uku3lig/agenix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View file

@ -1,11 +1,11 @@
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDRQMGFOdyBYTnBt YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDRQMGFOdyBHMzNS
VG5mQjhQRnpNUnNIUXlEd1Z4YWNOMUczZ25nZFRTelZHQm40aWpFCm82VDF2NElO OGNDcFdjaFl0czhHbGRLK2RacUplZzZPeTlsbTZFdjR1UXF5TDE4CitGdzVIMElX
SmhpR1hUT20wVmlycGJ2YVlxY2lZNzR1cW02VGk2SzlvN00KLT4gRS1ncmVhc2Ug UHRmYmZzVE5YY3J0VzFnbUJqNGlvVGw5RXEySnJ4UzRPaHcKLT4gQS1ncmVhc2Ug
cyBFKXcKVnlHNXpFdWVkTnVDOWNEWU15empzNUpwY2d3L0s2VnZBclF5eHZwNEly QjQ+I2UxIFgoZE5gaWUgPmNqMCApVTRFInRrCmRZdkJLTFpPU25QRk42T1piR0Vw
ay9tTVlPVEl3SVE0Q2p4a3QrQ01JWAp6ZHJDR29HZFpmSXYvbG9NCi0tLSBKMTNM Z0xrOVJVY3BXTmMKLS0tIHBSSDBqSWxISXh3Q1ErK0Y4YW8yamVpQXNhQ2hxMmZY
aTNmN3l6dUs1Qi9PTlE3WE1KYUlZOUcyZVdvcS82SjM5U0tMSndZCjendvKUz/jp N2J3N1NuOUxYcW8K3vxFXBdoRbsRu46x2wkht529KxYMkj0ZhuSU8DTQAtH5JMIw
l+3DDw4ZEaODSdhmSZ8lZ6oG7qaccqYbm7of0CZmFtRnns1K89wkNOzmjaM2TwtO NSO0CpHRzFmHleoba8K4DSGy7V2gIVFZn13KIP5adtzOnMV3S41uC+FxLFK5sph0
9N9m2nMmze/Cf5U2Po15WvbmR6CVMNISAGbTx7jzqbK0ibrLFrXM1ahNnI+XXFzR HiZNZi/CqhMJh5QuEJDLMQjwQ8vh2ffLBThmO5LqkIRFJJPpeieD3inVBIX+Y0Y2
phdwBYRITi67DkzdiZLypCOCpSeiVcVyWrK8YDtC3BtGkME= z9gx9jzaLA==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----

View file

@ -1,11 +1,11 @@
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDRQMGFOdyA5Q2NT YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDRQMGFOdyBnSzhu
YTRvT1lpQmk0czVqRWY1S3ZWaC94dXovbkhkNm0wZWswanpoUjNZCllIVEtLSzVq cGYwM3VFajVCOGhGa3hTcktTa1VhbkplZFhnc3ppZXlSWExFRUI4Ci9qT3MydUt0
d3Z6dWVPck41RTY3cDM5VlB2QlRCRVZlbmVxU1ZJblVIbXcKLT4gMS4mPidNLWdy NzVsWUZMcDZ6U3htMkIyUXg0eWNnMXR0ZzF4UVlEdkMxNHMKLT4gLiVZLWdyZWFz
ZWFzZSBPbXlzR10kCkdDOFQ2UCs0a0s4NEFjM2dTUVlxMDhIN3pvdTcrbkpWK1Qw ZSAmPTZnbEsgezU7YHx+IGY8XzQtayA2WApjMlZ5M1FYVFg3MjRydlZwam9XUGYv
ZGl3dmNRazM2WlJ1NFdablZpMklGQkdBazQrVzAKTTA3eWJEcDBKRHZiS1ZvVTZl Y2swNHBsZXdsZDUrb2tjNEpyOUtuck5wL0tSTHh0akxBckJvRWt6RitvCmM0ZS9s
VDAzZU5CU2htdUcvT2gxZDNKCi0tLSAxN29ROXVMNWZ3YnJQR0VQMWIvanpuaUxK Skh1bWg5by84L3VEV0tXdnM3MSs5ZW4xSnorWUgzbHFPUQotLS0gSjMrVVc2S2oy
dTY0M3VUZXhWRTh6ZXNVYkdzCk6b13jgvSYOq85RpkonJLHrm4xZPOBi2KRhBG2Y Sy9GMUY1WUlYZ3gxZmFTOHl6K01PMjV2ejR3Umtyb3VPMAptrFOjuXbeqLlmYz16
ySeQYDBEurP4dalNgskEwQPKNygrW+SJD3rhmCEs+y4s7u6lJ4snxz5s9USNsGnX qY2HtGPorPUszQcd4ZSJMM7thcPHxsohLsvmCpRGrSMkY5B5ehbSu6GkdZYpBuON
75AdrShqTDVENu30DEQoypc9fYLvkie/fg9G7rw= x98uVRNYoXP9t3Kv+V9jOVWZnnU6A29dBQ2xQGl40Au/8tmwdGgqZMLtLdOZ
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----

View file

@ -24,7 +24,7 @@
nixos = with inputs; [ nixos = with inputs; [
./common.nix ./common.nix
ragenix.nixosModules.default agenix.nixosModules.default
]; ];
desktop = with inputs; desktop = with inputs;

View file

@ -3,7 +3,7 @@
pkgs, pkgs,
config, config,
getchvim, getchvim,
ragenix, agenix,
... ...
}: let }: let
username = "leo"; username = "leo";
@ -144,7 +144,7 @@ in {
osu-lazer-bin osu-lazer-bin
gnome.file-roller gnome.file-roller
getchvim.packages.${system}.default getchvim.packages.${system}.default
ragenix.packages.${system}.default agenix.packages.${system}.default
]; ];
services = { services = {