Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
ahuston-0 2024-04-17 20:50:57 -04:00 committed by Alice Huston
parent 3955dd70aa
commit 195c1facd8
3 changed files with 13 additions and 7 deletions

View File

@ -28,13 +28,16 @@ let
flake = "github:ahuston-0/nix-dotfiles-hydra/${branch}";
};
desc = prJobsets // { "main" = mkFlakeJobset "main"; };
desc = prJobsets // {
"main" = mkFlakeJobset "main";
};
log = {
pulls = prs;
jobsets = desc;
};
in {
in
{
jobsets = pkgs.runCommand "spec-jobsets.json" { } ''
cat >$out <<EOF
${builtins.toJSON desc}

View File

@ -344,8 +344,11 @@
packages = [
self.formatter.${system}
nixpkgs.legacyPackages.${system}.deadnix
<<<<<<< HEAD
nixpkgs.legacyPackages.${system}.treefmt
nixpkgs.legacyPackages.${system}.pre-commit
=======
>>>>>>> 7502153 (fixes :))
];
shellHook = (nix-pre-commit.lib.${system}.mkConfig { inherit pkgs config; }).shellHook;
}

View File

@ -37,11 +37,11 @@
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
# services.fwupd.package =
# (import (builtins.fetchTarball {
# url = "https://github.com/NixOS/nixpkgs/archive/bb2009ca185d97813e75736c2b8d1d8bb81bde05.tar.gz";
# sha256 = "sha256:003qcrsq5g5lggfrpq31gcvj82lb065xvr7bpfa8ddsw8x4dnysk";
# }) { inherit (pkgs) system; }).fwupd;
services.fwupd.package =
(import (builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/bb2009ca185d97813e75736c2b8d1d8bb81bde05.tar.gz";
sha256 = "sha256:003qcrsq5g5lggfrpq31gcvj82lb065xvr7bpfa8ddsw8x4dnysk";
}) { inherit (pkgs) system; }).fwupd;
services.fprintd.enable = true;