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

move to own hydra flake #64

Merged
ahuston-0 merged 3 commits from feature/self-hydra into main 2025-03-30 14:36:55 -04:00
Conversation 1 Commits 3 Files Changed 4 +89 -89
4 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
flake.lock generated
View File

@ -78,11 +78,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1743119709, "lastModified": 1742773104,
"narHash": "sha256-tlJY7MfAena/yi3lmd7y7vQGpLma4Q1BLtO4dvzF/Vs=", "narHash": "sha256-dAhrL+gEjNN5U/Sosy7IrX0Y0qPA0U7Gp9TBhqEliNU=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "f8861a4b09a181dd88f6626d0202d9225ae85d65", "rev": "d74460da63a8c08a69a1f143b04f2ab1a6b2f5c2",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -312,11 +312,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743136572, "lastModified": 1742957044,
"narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", "narHash": "sha256-gwW0tBIA77g6qq45y220drTy0DmThF3fJMwVFUtYV9c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1efd2503172016a6742c87b47b43ca2c8145607d", "rev": "ce287a5cd3ef78203bc78021447f937a988d9f6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -334,18 +334,18 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740884653, "lastModified": 1743278932,
"narHash": "sha256-L0eN/hFRH1JSDvmuBOXBfETU07WckA7b3UFxHRVdp3M=", "narHash": "sha256-Is+C1Dnjsy1NKx5lRjTalrTOnDe6Bm24A/xNcAglrmE=",
"owner": "fx-chun", "ref": "add-gitea-pulls",
"repo": "hydra", "rev": "c4e22da1fab292d1a712f23d015c55b567e64a39",
"rev": "99e3ad325cb829ff10a024659fd1b62316c06a1f", "revCount": 4339,
"type": "github" "type": "git",
"url": "https://nayeonie.com/ahuston-0/hydra"
}, },
"original": { "original": {
"owner": "fx-chun",
"ref": "add-gitea-pulls", "ref": "add-gitea-pulls",
"repo": "hydra", "type": "git",
"type": "github" "url": "https://nayeonie.com/ahuston-0/hydra"
} }
}, },
"hyprland-contrib": { "hyprland-contrib": {
@ -391,11 +391,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739899400, "lastModified": 1742919147,
"narHash": "sha256-q/RgA4bB7zWai4oPySq9mch7qH14IEeom2P64SXdqHs=", "narHash": "sha256-I6Oekogi6tkSrtyAbBMzjx9iKi4x0o21fdOQqVf49Qc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "e310c19a1aeb1ce1ed4d41d5ab2d02db596e0918", "rev": "ceec04f1e24ca34deaca26e7c9d8cd90ba38f81c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -479,11 +479,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1743167577, "lastModified": 1742806253,
"narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -502,11 +502,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743178092, "lastModified": 1742933600,
"narHash": "sha256-fOMsQpcdIbj+wOexiCSEW2J4Erqd0LRV25aYiOx4QRw=", "narHash": "sha256-CkFIV8hyXq6q6p4rksQtlFoNyrtwXyUrY7ilCyDgEmo=",
"owner": "SuperSandro2000", "owner": "SuperSandro2000",
"repo": "nixos-modules", "repo": "nixos-modules",
"rev": "77ff511df92a9d4a828bdf032b8f48e7c3d99b50", "rev": "6d1da83b2352ae4c72960b10154290434f5bd779",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -517,11 +517,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1743210622, "lastModified": 1742919349,
"narHash": "sha256-AagCXne3DGJARB7kxCjcBgJddT/J2CC7SSe7I6kFqso=", "narHash": "sha256-V3jQhu3s48mgGClvKkWhYM1+cSTFGFm4ztDkK7S69JY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "800863744b6d0ef3c748a094a15e7f9d361f62fb", "rev": "6ea2759c633a3e25f3b4e2f52fb6bf9d6a01c532",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -548,11 +548,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1742937945, "lastModified": 1742751704,
"narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -639,11 +639,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743215516, "lastModified": 1742956365,
"narHash": "sha256-52qbrkG65U1hyrQWltgHTgH4nm0SJL+9TWv2UDCEPNI=", "narHash": "sha256-Slrqmt6kJ/M7Z/ce4ebQWsz2aeEodrX56CsupOEPoz0=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "524463199fdee49338006b049bc376b965a2cfed", "rev": "a0e3395c63cdbc9c1ec17915f8328c077c79c4a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -700,11 +700,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1743075971, "lastModified": 1742926290,
"narHash": "sha256-8fSI6C19ZTcHgvoLK17wfEEVI08tgnZfSLgVe3E/22w=", "narHash": "sha256-63joFDrDekkI8papsDPwObKCCYSZ7t/1t94M398BxLY=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "2fb8321ea16c595e0208b22021ddaf1f471c634a", "rev": "61a5f77f2202f3a79797089752713e16b1ab5b10",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@ -60,7 +60,7 @@
}; };
hydra = { hydra = {
url = "github:fx-chun/hydra/add-gitea-pulls"; url = "git+https://nayeonie.com/ahuston-0/hydra?ref=add-gitea-pulls";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
}; };

102
systems/palatine-hill/attic/default.nix
View File

@ -62,58 +62,58 @@
# borrowing from https://github.com/Shawn8901/nix-configuration/blob/4b8d1d44f47aec60feb58ca7b7ab5ed000506e90/modules/nixos/private/hydra.nix # borrowing from https://github.com/Shawn8901/nix-configuration/blob/4b8d1d44f47aec60feb58ca7b7ab5ed000506e90/modules/nixos/private/hydra.nix
# configured default webstore for this on root user separately # configured default webstore for this on root user separately
# systemd = { systemd = {
# services = { services = {
# attic-watch-store = { attic-watch-store = {
# wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
# after = [ after = [
# "network-online.target" "network-online.target"
# "docker.service" "docker.service"
# "atticd.service" "atticd.service"
# ]; ];
# requires = [ requires = [
# "network-online.target" "network-online.target"
# "docker.service" "docker.service"
# "atticd.service" "atticd.service"
# ]; ];
# description = "Upload all store content to binary cache"; description = "Upload all store content to binary cache";
# serviceConfig = { serviceConfig = {
# User = "root"; User = "root";
# Restart = "always"; Restart = "always";
# ExecStart = "${pkgs.attic-client}/bin/attic watch-store cache-nix-dot"; ExecStart = "${pkgs.attic-client}/bin/attic watch-store cache-nix-dot";
# }; };
# }; };
# attic-sync-hydra = { attic-sync-hydra = {
# after = [ after = [
# "network-online.target" "network-online.target"
# "docker.service" "docker.service"
# "atticd.service" "atticd.service"
# ]; ];
# requires = [ requires = [
# "network-online.target" "network-online.target"
# "docker.service" "docker.service"
# "atticd.service" "atticd.service"
# ]; ];
# description = "Force resync of hydra derivations with attic"; description = "Force resync of hydra derivations with attic";
# serviceConfig = { serviceConfig = {
# Type = "oneshot"; Type = "oneshot";
# User = "root"; User = "root";
# ExecStart = "${config.nix.package}/bin/nix ${./sync-attic.bash}"; ExecStart = "${config.nix.package}/bin/nix ${./sync-attic.bash}";
# }; };
# }; };
# }; };
# timers = { timers = {
# attic-sync-hydra = { attic-sync-hydra = {
# wantedBy = [ "timers.target" ]; wantedBy = [ "timers.target" ];
# timerConfig = { timerConfig = {
# OnBootSec = 600; OnBootSec = 600;
# OnUnitActiveSec = 86400; OnUnitActiveSec = 86400;
# Unit = "attic-sync-hydra.service"; Unit = "attic-sync-hydra.service";
# }; };
# }; };
# }; };
# }; };
sops = { sops = {
secrets = { secrets = {

2
systems/palatine-hill/attic/sync-attic.bash
View File

@ -6,5 +6,5 @@ sync_directories=(
) )
for dir in "${sync_directories[@]}"; do for dir in "${sync_directories[@]}"; do
find "$dir" -regex ".*\.drv$" -exec attic push cache-nix-dot '{}' \; find "$dir" -regex ".*\.drv$" -exec attic push nix-cache '{}' \;
done done