Compare commits
4 commits
e6ba569b36
...
3a471433ed
Author | SHA1 | Date | |
---|---|---|---|
Bruno BELANYI | 3a471433ed | ||
Bruno BELANYI | f8325cc9c7 | ||
Bruno BELANYI | cd1173d2f6 | ||
Bruno BELANYI | e319eaf09f |
|
@ -135,7 +135,13 @@
|
||||||
inherit (self.checks.${system}.pre-commit) shellHook;
|
inherit (self.checks.${system}.pre-commit) shellHook;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
packages =
|
||||||
|
let
|
||||||
packages = import ./pkgs { inherit pkgs; };
|
packages = import ./pkgs { inherit pkgs; };
|
||||||
|
isSystem = pkg: builtins.elem system pkg.meta.platforms;
|
||||||
|
finalPackages = lib.flip lib.filterAttrs packages (_: isSystem);
|
||||||
|
in
|
||||||
|
finalPackages;
|
||||||
}) // {
|
}) // {
|
||||||
overlay = self.overlays.pkgs;
|
overlay = self.overlays.pkgs;
|
||||||
|
|
||||||
|
|
|
@ -2,13 +2,17 @@
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
|
throwOnCanary =
|
||||||
|
let
|
||||||
canaryHash = builtins.hashFile "sha256" ./canary;
|
canaryHash = builtins.hashFile "sha256" ./canary;
|
||||||
expectedHash =
|
expectedHash =
|
||||||
"9df8c065663197b5a1095122d48e140d3677d860343256abd5ab6e4fb4c696ab";
|
"9df8c065663197b5a1095122d48e140d3677d860343256abd5ab6e4fb4c696ab";
|
||||||
|
in
|
||||||
|
if canaryHash != expectedHash
|
||||||
|
then throw "Secrets are not readable. Have you run `git-crypt unlock`?"
|
||||||
|
else id;
|
||||||
in
|
in
|
||||||
if canaryHash != expectedHash then
|
throwOnCanary {
|
||||||
abort "Secrets are not readable. Have you run `git-crypt unlock`?"
|
|
||||||
else {
|
|
||||||
options.my.secrets = mkOption {
|
options.my.secrets = mkOption {
|
||||||
type = types.attrs;
|
type = types.attrs;
|
||||||
};
|
};
|
||||||
|
|
|
@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation rec {
|
||||||
description = "A simple script to query a password from bitwarden";
|
description = "A simple script to query a password from bitwarden";
|
||||||
homepage = "https://gitea.belanyi.fr/ambroisie/nix-config";
|
homepage = "https://gitea.belanyi.fr/ambroisie/nix-config";
|
||||||
license = with licenses; [ mit ];
|
license = with licenses; [ mit ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.linux;
|
||||||
maintainers = with maintainers; [ ambroisie ];
|
maintainers = with maintainers; [ ambroisie ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +1,18 @@
|
||||||
{ lib, pkgs, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
|
throwOnCanary =
|
||||||
|
let
|
||||||
canaryHash = builtins.hashFile "sha256" ./canary;
|
canaryHash = builtins.hashFile "sha256" ./canary;
|
||||||
expectedHash =
|
expectedHash =
|
||||||
"9df8c065663197b5a1095122d48e140d3677d860343256abd5ab6e4fb4c696ab";
|
"9df8c065663197b5a1095122d48e140d3677d860343256abd5ab6e4fb4c696ab";
|
||||||
|
in
|
||||||
|
if canaryHash != expectedHash
|
||||||
|
then throw "Secrets are not readable. Have you run `git-crypt unlock`?"
|
||||||
|
else id;
|
||||||
in
|
in
|
||||||
if canaryHash != expectedHash then
|
throwOnCanary {
|
||||||
abort "Secrets are not readable. Have you run `git-crypt unlock`?"
|
|
||||||
else {
|
|
||||||
options.my.secrets = mkOption {
|
options.my.secrets = mkOption {
|
||||||
type = types.attrs;
|
type = types.attrs;
|
||||||
};
|
};
|
||||||
|
@ -50,6 +54,6 @@ else {
|
||||||
root.hashedPassword = fileContents ./users/root/password.txt;
|
root.hashedPassword = fileContents ./users/root/password.txt;
|
||||||
};
|
};
|
||||||
|
|
||||||
wireguard = pkgs.callPackage ./wireguard { };
|
wireguard = import ./wireguard { inherit lib; };
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue