mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-10 23:00:39 +02:00
Code Activity

feat: inherit agenix-rekey apps

Browse source
This commit is contained in:
oddlama 2023-01-31 01:18:04 +01:00
parent fa8c14607c
commit 1dd36e9f6b
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
3 changed files with 36 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

44
flake.lock generated
View file

@ -3,15 +3,16 @@
"agenix": { "agenix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"ragenix",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1675030834, "lastModified": 1673301561,
"narHash": "sha256-e1/7Z7rVRqy2NuEOxrRm560wc/Kn8NU7gz8CDfmu9F0=", "narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "49798e535ebc07fec82256b283d35be36d8c6c9a", "rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,22 +23,14 @@
}, },
"agenix-rekey": { "agenix-rekey": {
"inputs": { "inputs": {
"agenix": [ "flake-utils": "flake-utils"
"agenix"
],
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1675114231, "lastModified": 1675123691,
"narHash": "sha256-lIPXmd2JRNv1D0CUmv8/djiIUZnm04MIHxLR7sm1PPo=", "narHash": "sha256-MyB+eQtV6/YRy1briQhVGOGW2FgvaEzco2epXCNEy+k=",
"owner": "oddlama", "owner": "oddlama",
"repo": "agenix-rekey", "repo": "agenix-rekey",
"rev": "60829dfc172260dcff7bce9e03b24dd686a0a512", "rev": "378105cc33e1b8245d002fa895f506414e21d258",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -89,6 +82,20 @@
} }
}, },
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"id": "flake-utils",
"type": "indirect"
}
},
"flake-utils_2": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -239,9 +246,7 @@
}, },
"ragenix": { "ragenix": {
"inputs": { "inputs": {
"agenix": [ "agenix": "agenix",
"agenix"
],
"flake-utils": [ "flake-utils": [
"flake-utils" "flake-utils"
], ],
@ -266,11 +271,10 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix",
"agenix-rekey": "agenix-rekey", "agenix-rekey": "agenix-rekey",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"home-manager": "home-manager", "home-manager": "home-manager",
"impermanence": "impermanence", "impermanence": "impermanence",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",

29
flake.nix
View file

@ -33,19 +33,9 @@
inputs.flake-compat.follows = "flake-compat"; inputs.flake-compat.follows = "flake-compat";
}; };
agenix = { agenix-rekey.url = "github:oddlama/agenix-rekey";
url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs";
};
ragenix = { ragenix = {
url = "github:yaxitech/ragenix"; url = "github:yaxitech/ragenix";
inputs.agenix.follows = "agenix";
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs";
};
agenix-rekey = {
url = "github:oddlama/agenix-rekey";
inputs.agenix.follows = "agenix";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -58,6 +48,7 @@
self, self,
nixpkgs, nixpkgs,
flake-utils, flake-utils,
agenix-rekey,
... ...
} @ inputs: } @ inputs:
{ {
@ -67,25 +58,27 @@
homeConfigurations = import ./nix/home-manager.nix inputs; homeConfigurations = import ./nix/home-manager.nix inputs;
nixosConfigurations = import ./nix/nixos.nix inputs; nixosConfigurations = import ./nix/nixos.nix inputs;
} }
// flake-utils.lib.eachDefaultSystem (localSystem: rec { // flake-utils.lib.eachDefaultSystem (system: rec {
checks = import ./nix/checks.nix inputs localSystem; checks = import ./nix/checks.nix inputs system;
devShells.default = import ./nix/dev-shell.nix inputs localSystem; devShells.default = import ./nix/dev-shell.nix inputs system;
packages = let packages = let
hostDrvs = import ./nix/host-drvs.nix inputs localSystem; hostDrvs = import ./nix/host-drvs.nix inputs system;
default = default =
if builtins.hasAttr "${localSystem}" hostDrvs if builtins.hasAttr "${system}" hostDrvs
then {default = self.packages.${localSystem}.${localSystem};} then {default = self.packages.${system}.${system};}
else {}; else {};
in in
hostDrvs // default; hostDrvs // default;
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit localSystem; inherit system;
overlays = [ overlays = [
self.overlays.default self.overlays.default
]; ];
config.allowUnfree = true; config.allowUnfree = true;
}; };
apps = agenix-rekey.defineApps inputs system;
}); });
} }

2
nix/nixos.nix
View file

@ -35,7 +35,7 @@
nixRegistry nixRegistry
home-manager.nixosModules.default home-manager.nixosModules.default
#impermanence.nixosModules.default #impermanence.nixosModules.default
ragenix.nixosModules.default ragenix.nixosModules.age
agenix-rekey.nixosModules.default agenix-rekey.nixosModules.default
]; ];
specialArgs = { specialArgs = {