ahuston-0/nix-dotfiles
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

fixes :)

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.hydra/jobsets.nix
View File

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

3
flake.nix
View File

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

10
users/alice/systems/artemision/configuration.nix
View File

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