fixes :)
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
parent
3955dd70aa
commit
195c1facd8
@ -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}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user