diff --git a/flake.lock b/flake.lock index 18e6a93..d4eb50b 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1743119709, - "narHash": "sha256-tlJY7MfAena/yi3lmd7y7vQGpLma4Q1BLtO4dvzF/Vs=", + "lastModified": 1742773104, + "narHash": "sha256-dAhrL+gEjNN5U/Sosy7IrX0Y0qPA0U7Gp9TBhqEliNU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "f8861a4b09a181dd88f6626d0202d9225ae85d65", + "rev": "d74460da63a8c08a69a1f143b04f2ab1a6b2f5c2", "type": "gitlab" }, "original": { @@ -312,11 +312,11 @@ ] }, "locked": { - "lastModified": 1743136572, - "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", + "lastModified": 1742957044, + "narHash": "sha256-gwW0tBIA77g6qq45y220drTy0DmThF3fJMwVFUtYV9c=", "owner": "nix-community", "repo": "home-manager", - "rev": "1efd2503172016a6742c87b47b43ca2c8145607d", + "rev": "ce287a5cd3ef78203bc78021447f937a988d9f6f", "type": "github" }, "original": { @@ -334,18 +334,18 @@ ] }, "locked": { - "lastModified": 1740884653, - "narHash": "sha256-L0eN/hFRH1JSDvmuBOXBfETU07WckA7b3UFxHRVdp3M=", - "owner": "fx-chun", - "repo": "hydra", - "rev": "99e3ad325cb829ff10a024659fd1b62316c06a1f", - "type": "github" + "lastModified": 1743278932, + "narHash": "sha256-Is+C1Dnjsy1NKx5lRjTalrTOnDe6Bm24A/xNcAglrmE=", + "ref": "add-gitea-pulls", + "rev": "c4e22da1fab292d1a712f23d015c55b567e64a39", + "revCount": 4339, + "type": "git", + "url": "https://nayeonie.com/ahuston-0/hydra" }, "original": { - "owner": "fx-chun", "ref": "add-gitea-pulls", - "repo": "hydra", - "type": "github" + "type": "git", + "url": "https://nayeonie.com/ahuston-0/hydra" } }, "hyprland-contrib": { @@ -391,11 +391,11 @@ ] }, "locked": { - "lastModified": 1739899400, - "narHash": "sha256-q/RgA4bB7zWai4oPySq9mch7qH14IEeom2P64SXdqHs=", + "lastModified": 1742919147, + "narHash": "sha256-I6Oekogi6tkSrtyAbBMzjx9iKi4x0o21fdOQqVf49Qc=", "owner": "NixOS", "repo": "nix", - "rev": "e310c19a1aeb1ce1ed4d41d5ab2d02db596e0918", + "rev": "ceec04f1e24ca34deaca26e7c9d8cd90ba38f81c", "type": "github" }, "original": { @@ -479,11 +479,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743167577, - "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", + "lastModified": 1742806253, + "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", + "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", "type": "github" }, "original": { @@ -502,11 +502,11 @@ ] }, "locked": { - "lastModified": 1743178092, - "narHash": "sha256-fOMsQpcdIbj+wOexiCSEW2J4Erqd0LRV25aYiOx4QRw=", + "lastModified": 1742933600, + "narHash": "sha256-CkFIV8hyXq6q6p4rksQtlFoNyrtwXyUrY7ilCyDgEmo=", "owner": "SuperSandro2000", "repo": "nixos-modules", - "rev": "77ff511df92a9d4a828bdf032b8f48e7c3d99b50", + "rev": "6d1da83b2352ae4c72960b10154290434f5bd779", "type": "github" }, "original": { @@ -517,11 +517,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743210622, - "narHash": "sha256-AagCXne3DGJARB7kxCjcBgJddT/J2CC7SSe7I6kFqso=", + "lastModified": 1742919349, + "narHash": "sha256-V3jQhu3s48mgGClvKkWhYM1+cSTFGFm4ztDkK7S69JY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "800863744b6d0ef3c748a094a15e7f9d361f62fb", + "rev": "6ea2759c633a3e25f3b4e2f52fb6bf9d6a01c532", "type": "github" }, "original": { @@ -548,11 +548,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1742751704, + "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", "type": "github" }, "original": { @@ -639,11 +639,11 @@ ] }, "locked": { - "lastModified": 1743215516, - "narHash": "sha256-52qbrkG65U1hyrQWltgHTgH4nm0SJL+9TWv2UDCEPNI=", + "lastModified": 1742956365, + "narHash": "sha256-Slrqmt6kJ/M7Z/ce4ebQWsz2aeEodrX56CsupOEPoz0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "524463199fdee49338006b049bc376b965a2cfed", + "rev": "a0e3395c63cdbc9c1ec17915f8328c077c79c4a1", "type": "github" }, "original": { @@ -700,11 +700,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1743075971, - "narHash": "sha256-8fSI6C19ZTcHgvoLK17wfEEVI08tgnZfSLgVe3E/22w=", + "lastModified": 1742926290, + "narHash": "sha256-63joFDrDekkI8papsDPwObKCCYSZ7t/1t94M398BxLY=", "owner": "danth", "repo": "stylix", - "rev": "2fb8321ea16c595e0208b22021ddaf1f471c634a", + "rev": "61a5f77f2202f3a79797089752713e16b1ab5b10", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1203729..fdeae91 100644 --- a/flake.nix +++ b/flake.nix @@ -60,7 +60,7 @@ }; hydra = { - url = "github:fx-chun/hydra/add-gitea-pulls"; + url = "git+https://nayeonie.com/ahuston-0/hydra?ref=add-gitea-pulls"; inputs = { nixpkgs.follows = "nixpkgs"; }; diff --git a/systems/palatine-hill/attic/default.nix b/systems/palatine-hill/attic/default.nix index 1fc9e29..28c1b47 100644 --- a/systems/palatine-hill/attic/default.nix +++ b/systems/palatine-hill/attic/default.nix @@ -62,58 +62,58 @@ # borrowing from https://github.com/Shawn8901/nix-configuration/blob/4b8d1d44f47aec60feb58ca7b7ab5ed000506e90/modules/nixos/private/hydra.nix # configured default webstore for this on root user separately - # systemd = { - # services = { - # attic-watch-store = { - # wantedBy = [ "multi-user.target" ]; - # after = [ - # "network-online.target" - # "docker.service" - # "atticd.service" - # ]; - # requires = [ - # "network-online.target" - # "docker.service" - # "atticd.service" - # ]; - # description = "Upload all store content to binary cache"; - # serviceConfig = { - # User = "root"; - # Restart = "always"; - # ExecStart = "${pkgs.attic-client}/bin/attic watch-store cache-nix-dot"; - # }; - # }; - # attic-sync-hydra = { - # after = [ - # "network-online.target" - # "docker.service" - # "atticd.service" - # ]; - # requires = [ - # "network-online.target" - # "docker.service" - # "atticd.service" - # ]; - # description = "Force resync of hydra derivations with attic"; - # serviceConfig = { - # Type = "oneshot"; - # User = "root"; - # ExecStart = "${config.nix.package}/bin/nix ${./sync-attic.bash}"; - # }; - # }; - # }; + systemd = { + services = { + attic-watch-store = { + wantedBy = [ "multi-user.target" ]; + after = [ + "network-online.target" + "docker.service" + "atticd.service" + ]; + requires = [ + "network-online.target" + "docker.service" + "atticd.service" + ]; + description = "Upload all store content to binary cache"; + serviceConfig = { + User = "root"; + Restart = "always"; + ExecStart = "${pkgs.attic-client}/bin/attic watch-store cache-nix-dot"; + }; + }; + attic-sync-hydra = { + after = [ + "network-online.target" + "docker.service" + "atticd.service" + ]; + requires = [ + "network-online.target" + "docker.service" + "atticd.service" + ]; + description = "Force resync of hydra derivations with attic"; + serviceConfig = { + Type = "oneshot"; + User = "root"; + ExecStart = "${config.nix.package}/bin/nix ${./sync-attic.bash}"; + }; + }; + }; - # timers = { - # attic-sync-hydra = { - # wantedBy = [ "timers.target" ]; - # timerConfig = { - # OnBootSec = 600; - # OnUnitActiveSec = 86400; - # Unit = "attic-sync-hydra.service"; - # }; - # }; - # }; - # }; + timers = { + attic-sync-hydra = { + wantedBy = [ "timers.target" ]; + timerConfig = { + OnBootSec = 600; + OnUnitActiveSec = 86400; + Unit = "attic-sync-hydra.service"; + }; + }; + }; + }; sops = { secrets = { diff --git a/systems/palatine-hill/attic/sync-attic.bash b/systems/palatine-hill/attic/sync-attic.bash index 57ecdd0..eaa1128 100644 --- a/systems/palatine-hill/attic/sync-attic.bash +++ b/systems/palatine-hill/attic/sync-attic.bash @@ -6,5 +6,5 @@ sync_directories=( ) 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