diff --git a/.github/workflows/build-hosts.yaml b/.github/workflows/build-hosts.yaml index 0eda010c..e7567949 100644 --- a/.github/workflows/build-hosts.yaml +++ b/.github/workflows/build-hosts.yaml @@ -63,25 +63,35 @@ jobs: attic-push-token: ${{ secrets.ATTIC_PUSH_TOKEN }} github-token: ${{ secrets.GITHUB_TOKEN }} + - name: Tailscale + if: ${{ startsWith(matrix.host.os, 'macos') }} + uses: tailscale/github-action@v4 + with: + oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }} + oauth-secret: ${{ secrets.TS_OAUTH_SECRET }} + tags: tag:ci + ping: tl-mm4 + - name: Create aarch64-linux builder if: ${{ startsWith(matrix.host.os, 'macos') }} env: BUILDER_PK: ${{secrets.AARCH64_BUILDER_PK}} - BUILDER_HOST: ${{secrets.AARCH64_BUILDER_HOSTNAME}} + BUILDER_HOST: tl-mm4 + BUILDER_PORT: 3022 run: | echo "$BUILDER_PK" | sudo tee /etc/nix/builder_ed25519 > /dev/null sudo chmod 600 /etc/nix/builder_ed25519 sudo mkdir -p /var/root/.ssh - ssh-keyscan -H "$BUILDER_HOST" | sudo tee -a /var/root/.ssh/known_hosts > /dev/null + ssh-keyscan -H -p "$BUILDER_PORT" "$BUILDER_HOST" | sudo tee -a /var/root/.ssh/known_hosts > /dev/null mkdir -p /etc/ssh/ - echo "Host linux-builder" | sudo tee -a /etc/ssh/ssh_config - echo " Hostname $BUILDER_HOST" | sudo tee -a /etc/ssh/ssh_config > /dev/null - echo " Port 22" | sudo tee -a /etc/ssh/ssh_config - echo " HostKeyAlias $BUILDER_HOST" | sudo tee -a /etc/ssh/ssh_config > /dev/null - echo " IdentityFile /etc/nix/builder_ed25519" | sudo tee -a /etc/ssh/ssh_config - echo " User gha-builder" | sudo tee -a /etc/ssh/ssh_config + echo "Host linux-builder" | sudo tee -a /etc/ssh/ssh_config + echo " Hostname $BUILDER_HOST" | sudo tee -a /etc/ssh/ssh_config > /dev/null + echo " Port $BUILDER_PORT" | sudo tee -a /etc/ssh/ssh_config + echo " HostKeyAlias [$BUILDER_HOST]:$BUILDER_PORT" | sudo tee -a /etc/ssh/ssh_config > /dev/null + echo " IdentityFile /etc/nix/builder_ed25519" | sudo tee -a /etc/ssh/ssh_config + echo " User gha-builder" | sudo tee -a /etc/ssh/ssh_config echo "ssh://linux-builder aarch64-linux /etc/nix/builder_ed25519 4 40 nixos-test,benchmark,kvm,big-parallel - -" | sudo tee /etc/nix/machines diff --git a/darwin/hosts/tl-mm4/aarch-builder.nix b/darwin/hosts/tl-mm4/aarch-builder.nix index c9e6b595..29ab4c1b 100644 --- a/darwin/hosts/tl-mm4/aarch-builder.nix +++ b/darwin/hosts/tl-mm4/aarch-builder.nix @@ -26,6 +26,7 @@ } profiles.common.remote-builder profiles.nixos.faster-linux + profiles.common.github-actions-builder ]; }; in { diff --git a/flake.lock b/flake.lock index 68dec237..39ae585b 100644 --- a/flake.lock +++ b/flake.lock @@ -249,11 +249,11 @@ ] }, "locked": { - "lastModified": 1784987084, - "narHash": "sha256-YmbTkjX8WV58oTGImAZRYkfnhGpdW2YhYV3vJPVXTRA=", + "lastModified": 1786916492, + "narHash": "sha256-kwR7CFhdXsXQH8V0VPeW0bF7i5n+aKhlxftQ9EGDYOQ=", "owner": "nix-community", "repo": "haumea", - "rev": "081970c89e6b8702c8af18e8dd32e5c95c90e319", + "rev": "3c4496e076bf4f85ebffe196df1419f13273d076", "type": "github" }, "original": { @@ -269,11 +269,11 @@ ] }, "locked": { - "lastModified": 1785119570, - "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=", + "lastModified": 1787146702, + "narHash": "sha256-YbRcLdU/yK4gWsQg7V8WTKZHfXL33g8+wSFUX3wyevs=", "owner": "nix-community", "repo": "home-manager", - "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d", + "rev": "173b7e8d40fdc8c296a9c99854314f17a3a1704c", "type": "github" }, "original": { @@ -290,11 +290,11 @@ ] }, "locked": { - "lastModified": 1786719456, - "narHash": "sha256-B74DLQs/VjlqyhnnX3tguWwghqJHWSJX30TKZuAljIg=", + "lastModified": 1787176219, + "narHash": "sha256-djoRr6jBpe35q/0JwAvXpFXg1Ktf+X54NU2RLR7wnHw=", "owner": "nix-community", "repo": "home-manager", - "rev": "83b7606dcf44abe3a94b86e8bb2b3355d22e8797", + "rev": "c53d643b3737e2fcd04e6cb3b3580ef50b2087a0", "type": "github" }, "original": { @@ -320,11 +320,11 @@ }, "latest": { "locked": { - "lastModified": 1786593342, - "narHash": "sha256-smTKQXMLLStzc8zJevMCckbk3My7SvbbLmPYZUJJKW4=", + "lastModified": 1787209939, + "narHash": "sha256-WvvHR4kSQLAbtouMC/ruZ5UpLwlUcY3K4FAllMN+yGk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6b5e5b7a6631f065bf6908986990b37d845f847f", + "rev": "391b592eb44808b3bd0cb80bb71b63a5a118b8bb", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1786674499, - "narHash": "sha256-BaOwIPt78vGE5Gju7DduQzYYBnBvSdZkPBRaJESis7s=", + "lastModified": 1787276820, + "narHash": "sha256-H2WpKgKFlbCnadGLJWJYmJXSfnJHtw57GiyCJsRmkd8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "e175b5a56f828415b9e273e37fc15d780dcec8a0", + "rev": "df89bf3ab92545d6932675cf9d742cb0e687f428", "type": "github" }, "original": { @@ -419,11 +419,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1786676056, - "narHash": "sha256-FJPecAiu49ChIQnGsN+tMDY9nnjlcfVRmgolfy4u49o=", + "lastModified": 1787278207, + "narHash": "sha256-qC1DixHE6xiN3yJXorX6gBc8NwSt6D+p7593acL7Bdk=", "owner": "nix-community", "repo": "nix4vscode", - "rev": "b4d4622f6a7b9e086037bb412ed2dcbcfbe00bbf", + "rev": "495169db5fa05742723016685c0045a09f172f98", "type": "github" }, "original": { @@ -494,11 +494,11 @@ "vpn-confinement": "vpn-confinement" }, "locked": { - "lastModified": 1786383226, - "narHash": "sha256-5cLjpODa1Valr3p00ReOnoiqQ3EKYjfsRZfpfcfdv0U=", + "lastModified": 1787357749, + "narHash": "sha256-wayhTe2qFg2uymd+R5dTRUaeTeXyqVAfYgsFoN2QmGU=", "owner": "kiriwalawren", "repo": "nixflix", - "rev": "e9c20f232d0e09e346578bf6f8a390c34952643e", + "rev": "60def597b891dfa7ef3b267a96985cfe1045156d", "type": "github" }, "original": { @@ -512,11 +512,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1786717298, - "narHash": "sha256-asdPlqtM0AweQ5YNLad6eY4tSYW55YNr1uyayf7mOMQ=", + "lastModified": 1787144466, + "narHash": "sha256-HHfv2/HkNSKbbSyU9iD/g8lbP6r4tl33sSw1W4rXCk0=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "2dda192987ab6815e44df0130f03d6c907b79134", + "rev": "0471accf8d0a8210b31d947497d179ecc99e0021", "type": "github" }, "original": { @@ -559,11 +559,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1786353041, - "narHash": "sha256-TVf9e3UZ+fScRSoakLYIiJU84p24QxOhhJvL8G5iJGw=", + "lastModified": 1786846226, + "narHash": "sha256-OqaxnAWelrc0KdMtSnVrLlYXJDpnl4RiCZDUzmmyWsg=", "owner": "nvmd", "repo": "nixos-raspberrypi", - "rev": "9a2bb77b1d7a953dbf7d278370f79bea66619f48", + "rev": "cf40a359b1e442ebd03878d219991c3267608d6b", "type": "github" }, "original": { @@ -586,11 +586,11 @@ ] }, "locked": { - "lastModified": 1786387522, - "narHash": "sha256-zQlJ7eE73KNAF4oZX99k2DwstyBGBrP9bJDOtRgqyfI=", + "lastModified": 1786991250, + "narHash": "sha256-dWwxLW6iv/TEosHxFbiTzwHYE1KIAF1OSf8jC+7jkAw=", "owner": "nabam", "repo": "nixos-rockchip", - "rev": "1db3253afab08efd46f5bb295d874a92f714b0e1", + "rev": "38d169c21c4e417894cafbb1a31e13c2248ecafd", "type": "github" }, "original": { @@ -673,11 +673,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1786756026, - "narHash": "sha256-p3TktAuoqPB93d/NYrSfe6hCk7wmckG9ziIQIYUAIk8=", + "lastModified": 1787360063, + "narHash": "sha256-dt4WdcvsA8/RCe+VZZwqU0X+XMM3wBbGCWA0/sFWzGo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b74e4a80209724a17f42429e830f5fbaefe17c1", + "rev": "2c423e03bbafcff28bfadc6781a4a8257f205cb5", "type": "github" }, "original": { @@ -689,11 +689,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1786089803, - "narHash": "sha256-ZuvZfVW2tB5tXYEcpcfhVXB3N4OhdZLOqOviy4OD4b4=", + "lastModified": 1786711500, + "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee48b147c18c7de1e6ec97dc74792be42724bed1", + "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d", "type": "github" }, "original": { @@ -705,11 +705,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1786711500, - "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=", + "lastModified": 1787204541, + "narHash": "sha256-OURZPknrTjQrlNyxPdqzyqmU/81Wes1CUP/Ft1Rv/YI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d", + "rev": "5880666fd9eb563038431edb35c2d0aa595884e6", "type": "github" }, "original": { @@ -795,8 +795,7 @@ "nvfetcher": "nvfetcher", "pyproject-nix": "pyproject-nix", "sops-nix": "sops-nix", - "terranix": "terranix", - "zsh-patina": "zsh-patina" + "terranix": "terranix" } }, "sops-nix": { @@ -923,26 +922,6 @@ "repo": "VPN-Confinement", "type": "github" } - }, - "zsh-patina": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1786736448, - "narHash": "sha256-rmMwJ9nNNKIng0tm9dT6TG0rgcOTiOtzl7WKfSp6lF0=", - "owner": "michel-kraemer", - "repo": "zsh-patina", - "rev": "e5f292517306612dc69f91c4a3067d319ac61fe6", - "type": "github" - }, - "original": { - "owner": "michel-kraemer", - "repo": "zsh-patina", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index b7523371..6897a61b 100644 --- a/flake.nix +++ b/flake.nix @@ -188,11 +188,6 @@ nixpkgs.follows = "nixpkgs"; }; }; - - zsh-patina = { - url = "github:michel-kraemer/zsh-patina"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; nixConfig = { diff --git a/nixos/hosts/aarch64/oracle/default.nix b/nixos/hosts/aarch64/oracle/default.nix index 20014122..cc083eab 100644 --- a/nixos/hosts/aarch64/oracle/default.nix +++ b/nixos/hosts/aarch64/oracle/default.nix @@ -8,10 +8,10 @@ ++ suites.minecraft-server ++ [ profiles.common.remote-builder + profiles.common.github-actions-builder ./hardware-configuration.nix ./minecraft-servers - ./github-actions-builder.nix ]; systemd.services.NetworkManager-wait-online.enable = false; diff --git a/nixos/hosts/x86_64/nas/media-server/arr-oauth.nix b/nixos/hosts/x86_64/nas/media-server/arr-oauth.nix index 1b5be91b..a1f4d2f5 100644 --- a/nixos/hosts/x86_64/nas/media-server/arr-oauth.nix +++ b/nixos/hosts/x86_64/nas/media-server/arr-oauth.nix @@ -74,30 +74,38 @@ in { }; nixflix = { - radarr.settings = { - auth = { - required = lib.mkForce "Enabled"; - method = lib.mkForce "External"; - }; - }; - sonarr.settings = { - auth = { - required = lib.mkForce "Enabled"; - method = lib.mkForce "External"; - }; - }; - sonarr-anime.settings = { - auth = { - required = lib.mkForce "Enabled"; - method = lib.mkForce "External"; - }; - }; - prowlarr.settings = { - auth = { - required = lib.mkForce "Enabled"; - method = lib.mkForce "External"; - }; - }; + radarr.config.hostConfig.authenticationMethod = "external"; + + sonarr.config.hostConfig.authenticationMethod = "external"; + + sonarr-anime.config.hostConfig.authenticationMethod = "external"; + + prowlarr.config.hostConfig.authenticationMethod = "external"; + + # radarr.settings = { + # auth = { + # required = lib.mkForce "Enabled"; + # method = lib.mkForce "External"; + # }; + # }; + # sonarr.settings = { + # auth = { + # required = lib.mkForce "Enabled"; + # method = lib.mkForce "External"; + # }; + # }; + # sonarr-anime.settings = { + # auth = { + # required = lib.mkForce "Enabled"; + # method = lib.mkForce "External"; + # }; + # }; + # prowlarr.settings = { + # auth = { + # required = lib.mkForce "Enabled"; + # method = lib.mkForce "External"; + # }; + # }; torrentClients.qbittorrent.serverConfig.Preferences.WebUI = { LocalHostAuth = lib.mkForce false; diff --git a/nixos/hosts/x86_64/nas/media-server/radarr.nix b/nixos/hosts/x86_64/nas/media-server/radarr.nix index e807ed81..113b10ea 100644 --- a/nixos/hosts/x86_64/nas/media-server/radarr.nix +++ b/nixos/hosts/x86_64/nas/media-server/radarr.nix @@ -1,5 +1,6 @@ { config, + options, inputs, lib, ... @@ -18,20 +19,14 @@ in { }; }; - nixflix.seerr.radarr.Radarr = { - activeProfileName = "1080p Balanced"; - - # default values (overriden because of how module created) - hostname = config.nixflix.radarr.connectionAddress; - port = config.nixflix.radarr.config.hostConfig.port or 7878; - inherit (config.nixflix.radarr.config) apiKey; - baseUrl = config.nixflix.radarr.config.hostConfig.urlBase; - activeDirectory = builtins.head (config.nixflix.radarr.mediaDirs or ["/data/media/movies"]); - isDefault = true; - externalUrl = - if config.nixflix.reverseProxy.enable - then "${config.nixflix.seerr.externalUrlScheme}://${config.nixflix.radarr.subdomain}.${config.nixflix.reverseProxy.domain}${config.nixflix.radarr.config.hostConfig.urlBase}" - else ""; + nixflix.seerr.radarr = let + inherit (options.nixflix.seerr.radarr.default) Radarr; + in { + Radarr = + Radarr + // { + activeProfileName = "1080p Balanced"; + }; }; sops.secrets = let diff --git a/nixos/hosts/x86_64/nas/media-server/sonarr.nix b/nixos/hosts/x86_64/nas/media-server/sonarr.nix index e75d9063..3657c689 100644 --- a/nixos/hosts/x86_64/nas/media-server/sonarr.nix +++ b/nixos/hosts/x86_64/nas/media-server/sonarr.nix @@ -1,5 +1,6 @@ { config, + options, inputs, lib, ... @@ -7,44 +8,20 @@ secret = key: config.sops.secrets.${key}.path; in { nixflix = { - seerr.sonarr = { - Sonarr = { - activeProfileName = "1080p Balanced"; - - # default values (overriden because of how module created) - hostname = config.nixflix.sonarr.connectionAddress; - port = config.nixflix.sonarr.config.hostConfig.port or 8989; - inherit (config.nixflix.sonarr.config) apiKey; - baseUrl = config.nixflix.sonarr.config.hostConfig.urlBase; - activeDirectory = builtins.head (config.nixflix.sonarr.mediaDirs or ["/data/media/tv"]); - activeAnimeDirectory = builtins.head (config.nixflix.sonarr.mediaDirs or ["/data/media/tv"]); - seriesType = "standard"; - animeSeriesType = "standard"; - isDefault = true; - externalUrl = - if config.nixflix.reverseProxy.enable - then "${config.nixflix.seerr.externalUrlScheme}://${config.nixflix.sonarr.subdomain}.${config.nixflix.reverseProxy.domain}${config.nixflix.sonarr.config.hostConfig.urlBase}" - else ""; - }; - - "Sonarr Anime" = { - # activeProfileName = "Anime 1080p"; + seerr.sonarr = let + defaults = options.nixflix.seerr.sonarr.default; + in { + Sonarr = + defaults.Sonarr + // { + activeProfileName = "1080p Balanced"; + }; - # default values (overriden because of how module created) - hostname = config.nixflix."sonarr-anime".connectionAddress; - port = config.nixflix.sonarr-anime.config.hostConfig.port or 8990; - inherit (config.nixflix.sonarr-anime.config) apiKey; - baseUrl = config.nixflix.sonarr-anime.config.hostConfig.urlBase; - activeDirectory = builtins.head (config.nixflix.sonarr-anime.mediaDirs or ["/data/media/anime"]); - activeAnimeDirectory = builtins.head (config.nixflix.sonarr-anime.mediaDirs or ["/data/media/anime"]); - seriesType = "standard"; - animeSeriesType = "anime"; - isDefault = false; - externalUrl = - if config.nixflix.reverseProxy.enable - then "${config.nixflix.seerr.externalUrlScheme}://${config.nixflix.sonarr-anime.subdomain}.${config.nixflix.reverseProxy.domain}${config.nixflix.sonarr-anime.config.hostConfig.urlBase}" - else ""; - }; + "Sonarr Anime" = + defaults."Sonarr Anime" + // { + activeProfileName = "Anime 1080p"; + }; }; sonarr = { diff --git a/nixos/hosts/x86_64/tl-wsl/default.nix b/nixos/hosts/x86_64/tl-wsl/default.nix index 55f9ca99..eef207b7 100644 --- a/nixos/hosts/x86_64/tl-wsl/default.nix +++ b/nixos/hosts/x86_64/tl-wsl/default.nix @@ -70,5 +70,10 @@ }; }; + environment.systemPackages = [ + pkgs.nixd + pkgs.alejandra + ]; + # boot.binfmt.emulatedSystems = ["aarch64-linux"]; } diff --git a/parts/klipper/packages/_deps-hash/mainsail-npm.nix b/parts/klipper/packages/_deps-hash/mainsail-npm.nix index 7e041be0..d3e1188b 100644 --- a/parts/klipper/packages/_deps-hash/mainsail-npm.nix +++ b/parts/klipper/packages/_deps-hash/mainsail-npm.nix @@ -1 +1 @@ -"sha256-BOKnhVO6y5Mf6drtPyhz+koGW/DNO5fIWiC3JKzLGQQ=" +"sha256-l1Os9SnzOfBFWU32lDe6HJepJf7xm8fesdAMrsgNpo8=" diff --git a/parts/klipper/sources/generated.json b/parts/klipper/sources/generated.json index 4a9f46ab..3ade743f 100644 --- a/parts/klipper/sources/generated.json +++ b/parts/klipper/sources/generated.json @@ -85,7 +85,7 @@ }, "klipper": { "cargoLock": null, - "date": "2026-08-13", + "date": "2026-08-21", "extract": null, "name": "klipper", "passthru": null, @@ -97,12 +97,12 @@ "name": null, "owner": "Klipper3d", "repo": "klipper", - "rev": "fe4eb8650bd7de4c2100a14eaf09b0965c430e29", - "sha256": "sha256-FvWPrU7Hsgso5FeX6WI0EphPm3xLHCC7FT/XSZQgsqc=", + "rev": "ac2a7f8b0e1ba61afe51e7e25583772d6e65e1fa", + "sha256": "sha256-0oi+RRzcHNQMMKhnuxJSkxw0Ct5tZSfo2j4VsFljLiM=", "sparseCheckout": [], "type": "github" }, - "version": "fe4eb8650bd7de4c2100a14eaf09b0965c430e29" + "version": "ac2a7f8b0e1ba61afe51e7e25583772d6e65e1fa" }, "klipper-cartographer": { "cargoLock": null, @@ -211,7 +211,7 @@ }, "klipper-happy-hare": { "cargoLock": null, - "date": "2026-08-11", + "date": "2026-08-16", "extract": null, "name": "klipper-happy-hare", "passthru": null, @@ -223,12 +223,12 @@ "name": null, "owner": "moggieuk", "repo": "Happy-Hare", - "rev": "3a81a87c5868c4b95894703f9d0af485ee9d367d", - "sha256": "sha256-kt2k2qy4W6CsWyF7jkovuAwt8/nLTPWMAAwcVq0i6T4=", + "rev": "d5cce9f96991b270ff570b7497bbf6b4463a82b9", + "sha256": "sha256-KUGNFXOXVt26z88lRNNCx/ksTsXZTBwCgREVbFEboqo=", "sparseCheckout": [], "type": "github" }, - "version": "3a81a87c5868c4b95894703f9d0af485ee9d367d" + "version": "d5cce9f96991b270ff570b7497bbf6b4463a82b9" }, "klipper-kamp": { "cargoLock": null, @@ -358,7 +358,7 @@ }, "klipper-screen": { "cargoLock": null, - "date": "2026-07-22", + "date": "2026-08-20", "extract": null, "name": "klipper-screen", "passthru": null, @@ -370,12 +370,12 @@ "name": null, "owner": "jordanruthe", "repo": "KlipperScreen", - "rev": "ed40799f92f8a5044082aee75b832a9e97084c7f", - "sha256": "sha256-MfOtLjF1bZMf1dFGWjZBvR4Ev4YYEnJs8fq2iTuAd90=", + "rev": "686d106a27e613b318f864a310e1ed53990b9d42", + "sha256": "sha256-gx1QJKmbBkg8YUkPKvbLIHZEGTd8e7J0UWHpOYWn6S4=", "sparseCheckout": [], "type": "github" }, - "version": "ed40799f92f8a5044082aee75b832a9e97084c7f" + "version": "686d106a27e613b318f864a310e1ed53990b9d42" }, "klipper-z-calibration": { "cargoLock": null, @@ -477,7 +477,7 @@ }, "mainsail": { "cargoLock": null, - "date": "2026-08-09", + "date": "2026-08-21", "extract": null, "name": "mainsail", "passthru": null, @@ -489,12 +489,12 @@ "name": null, "owner": "mainsail-crew", "repo": "mainsail", - "rev": "9c7df4ce53de43bc5d464d0eccac8a26ae2293ef", - "sha256": "sha256-i97+j2mWvrbu1u8Y5VvVjSURBWfYMAhS/nQLk+GDezg=", + "rev": "cce05e4958765b224c4b6c56b21dc76f31216626", + "sha256": "sha256-19RO4nHg2wQSHqK613BmOVrWD9rlpcC7k9IBAqw/Anw=", "sparseCheckout": [], "type": "github" }, - "version": "9c7df4ce53de43bc5d464d0eccac8a26ae2293ef" + "version": "cce05e4958765b224c4b6c56b21dc76f31216626" }, "mobileraker-companion": { "cargoLock": null, diff --git a/parts/klipper/sources/generated.nix b/parts/klipper/sources/generated.nix index b90f6767..9918753c 100644 --- a/parts/klipper/sources/generated.nix +++ b/parts/klipper/sources/generated.nix @@ -56,15 +56,15 @@ }; klipper = { pname = "klipper"; - version = "fe4eb8650bd7de4c2100a14eaf09b0965c430e29"; + version = "ac2a7f8b0e1ba61afe51e7e25583772d6e65e1fa"; src = fetchFromGitHub { owner = "Klipper3d"; repo = "klipper"; - rev = "fe4eb8650bd7de4c2100a14eaf09b0965c430e29"; + rev = "ac2a7f8b0e1ba61afe51e7e25583772d6e65e1fa"; fetchSubmodules = false; - sha256 = "sha256-FvWPrU7Hsgso5FeX6WI0EphPm3xLHCC7FT/XSZQgsqc="; + sha256 = "sha256-0oi+RRzcHNQMMKhnuxJSkxw0Ct5tZSfo2j4VsFljLiM="; }; - date = "2026-08-13"; + date = "2026-08-21"; }; klipper-cartographer = { pname = "klipper-cartographer"; @@ -127,15 +127,15 @@ }; klipper-happy-hare = { pname = "klipper-happy-hare"; - version = "3a81a87c5868c4b95894703f9d0af485ee9d367d"; + version = "d5cce9f96991b270ff570b7497bbf6b4463a82b9"; src = fetchFromGitHub { owner = "moggieuk"; repo = "Happy-Hare"; - rev = "3a81a87c5868c4b95894703f9d0af485ee9d367d"; + rev = "d5cce9f96991b270ff570b7497bbf6b4463a82b9"; fetchSubmodules = false; - sha256 = "sha256-kt2k2qy4W6CsWyF7jkovuAwt8/nLTPWMAAwcVq0i6T4="; + sha256 = "sha256-KUGNFXOXVt26z88lRNNCx/ksTsXZTBwCgREVbFEboqo="; }; - date = "2026-08-11"; + date = "2026-08-16"; }; klipper-kamp = { pname = "klipper-kamp"; @@ -210,15 +210,15 @@ }; klipper-screen = { pname = "klipper-screen"; - version = "ed40799f92f8a5044082aee75b832a9e97084c7f"; + version = "686d106a27e613b318f864a310e1ed53990b9d42"; src = fetchFromGitHub { owner = "jordanruthe"; repo = "KlipperScreen"; - rev = "ed40799f92f8a5044082aee75b832a9e97084c7f"; + rev = "686d106a27e613b318f864a310e1ed53990b9d42"; fetchSubmodules = false; - sha256 = "sha256-MfOtLjF1bZMf1dFGWjZBvR4Ev4YYEnJs8fq2iTuAd90="; + sha256 = "sha256-gx1QJKmbBkg8YUkPKvbLIHZEGTd8e7J0UWHpOYWn6S4="; }; - date = "2026-07-22"; + date = "2026-08-20"; }; klipper-z-calibration = { pname = "klipper-z-calibration"; @@ -276,15 +276,15 @@ }; mainsail = { pname = "mainsail"; - version = "9c7df4ce53de43bc5d464d0eccac8a26ae2293ef"; + version = "cce05e4958765b224c4b6c56b21dc76f31216626"; src = fetchFromGitHub { owner = "mainsail-crew"; repo = "mainsail"; - rev = "9c7df4ce53de43bc5d464d0eccac8a26ae2293ef"; + rev = "cce05e4958765b224c4b6c56b21dc76f31216626"; fetchSubmodules = false; - sha256 = "sha256-i97+j2mWvrbu1u8Y5VvVjSURBWfYMAhS/nQLk+GDezg="; + sha256 = "sha256-19RO4nHg2wQSHqK613BmOVrWD9rlpcC7k9IBAqw/Anw="; }; - date = "2026-08-09"; + date = "2026-08-21"; }; mobileraker-companion = { pname = "mobileraker-companion"; diff --git a/parts/overrides/default.nix b/parts/overrides/default.nix index 6ad67050..b59c7a32 100644 --- a/parts/overrides/default.nix +++ b/parts/overrides/default.nix @@ -61,12 +61,12 @@ in { ffmpeg_5-full #shell lefthook + zsh-patina # ncps unifi ; ncps = inputs.ncps.packages.${final.stdenv.hostPlatform.system}.default; - zsh-patina = inputs.zsh-patina.packages.${final.stdenv.hostPlatform.system}.default; jellarr = inputs.jellarr.packages.${final.stdenv.hostPlatform.system}.default; }; diff --git a/parts/raspberry-pi/sources/generated.json b/parts/raspberry-pi/sources/generated.json index 23c3cf10..e7b32fc3 100644 --- a/parts/raspberry-pi/sources/generated.json +++ b/parts/raspberry-pi/sources/generated.json @@ -8,15 +8,15 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-5vdCkXAg5vQ7VCcNcQZXY/LZLErPMtzPfddssogyssM=", + "sha256": "sha256-hjzDEoDTiOb+ueCNCyRrmLiN1qFv2B2e4V3T47Lsyes=", "type": "url", - "url": "https://github.com/video-dev/hls.js/releases/download/v1.7.0/release.zip" + "url": "https://github.com/video-dev/hls.js/releases/download/v1.7.1/release.zip" }, - "version": "v1.7.0" + "version": "v1.7.1" }, "libcamera": { "cargoLock": null, - "date": "2026-08-07", + "date": "2026-08-17", "extract": null, "name": "libcamera", "passthru": null, @@ -28,16 +28,16 @@ "name": null, "owner": "raspberrypi", "repo": "libcamera", - "rev": "ca0ba53ef1eec5e59dee7255863b943f5eaf6cfd", - "sha256": "sha256-i+CwRp5SEGHKMCpzIIySwm9n+/WDnpfrdit0/6D7PlA=", + "rev": "6c1dd9d55573010f710c9e190a73e7e76f0d9432", + "sha256": "sha256-r3ste6OwCrNvgD0oAQ+XaoWYPNVJihFW1moPDueNtnM=", "sparseCheckout": [], "type": "github" }, - "version": "ca0ba53ef1eec5e59dee7255863b943f5eaf6cfd" + "version": "6c1dd9d55573010f710c9e190a73e7e76f0d9432" }, "libcamera-apps": { "cargoLock": null, - "date": "2026-07-30", + "date": "2026-08-20", "extract": null, "name": "libcamera-apps", "passthru": null, @@ -49,12 +49,12 @@ "name": null, "owner": "raspberrypi", "repo": "libcamera-apps", - "rev": "9270b6013c4575dff2e0625c0f4b8ae750218b0f", - "sha256": "sha256-VYMC4WgRyJ0cTqBjSj4+FePyGokVoAvifyKgU6n1314=", + "rev": "200165a6f8e055aae613b927137b6ac7cceba37f", + "sha256": "sha256-zXVGwry9bpQejNfzBrhKECm6mGWwxY70uC3SzcKhyjs=", "sparseCheckout": [], "type": "github" }, - "version": "9270b6013c4575dff2e0625c0f4b8ae750218b0f" + "version": "200165a6f8e055aae613b927137b6ac7cceba37f" }, "mediamtx": { "cargoLock": null, @@ -70,12 +70,12 @@ "name": null, "owner": "bluenviron", "repo": "mediamtx", - "rev": "v1.20.0", - "sha256": "sha256-bnbuIf3GdT+TCUHzAqvsS9wLPjDUGunpJoQBJFY4aTo=", + "rev": "v1.20.1", + "sha256": "sha256-L9dRwOD5JCu3ZczTxeb3a6ShHMXGWNXVN5KAa/7bcjM=", "sparseCheckout": [], "type": "github" }, - "version": "v1.20.0" + "version": "v1.20.1" }, "mediamtx-rpicamera": { "cargoLock": null, diff --git a/parts/raspberry-pi/sources/generated.nix b/parts/raspberry-pi/sources/generated.nix index 464da631..de3b1eee 100644 --- a/parts/raspberry-pi/sources/generated.nix +++ b/parts/raspberry-pi/sources/generated.nix @@ -8,45 +8,45 @@ { hls-js = { pname = "hls-js"; - version = "v1.7.0"; + version = "v1.7.1"; src = fetchurl { - url = "https://github.com/video-dev/hls.js/releases/download/v1.7.0/release.zip"; - sha256 = "sha256-5vdCkXAg5vQ7VCcNcQZXY/LZLErPMtzPfddssogyssM="; + url = "https://github.com/video-dev/hls.js/releases/download/v1.7.1/release.zip"; + sha256 = "sha256-hjzDEoDTiOb+ueCNCyRrmLiN1qFv2B2e4V3T47Lsyes="; }; }; libcamera = { pname = "libcamera"; - version = "ca0ba53ef1eec5e59dee7255863b943f5eaf6cfd"; + version = "6c1dd9d55573010f710c9e190a73e7e76f0d9432"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "libcamera"; - rev = "ca0ba53ef1eec5e59dee7255863b943f5eaf6cfd"; + rev = "6c1dd9d55573010f710c9e190a73e7e76f0d9432"; fetchSubmodules = false; - sha256 = "sha256-i+CwRp5SEGHKMCpzIIySwm9n+/WDnpfrdit0/6D7PlA="; + sha256 = "sha256-r3ste6OwCrNvgD0oAQ+XaoWYPNVJihFW1moPDueNtnM="; }; - date = "2026-08-07"; + date = "2026-08-17"; }; libcamera-apps = { pname = "libcamera-apps"; - version = "9270b6013c4575dff2e0625c0f4b8ae750218b0f"; + version = "200165a6f8e055aae613b927137b6ac7cceba37f"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "libcamera-apps"; - rev = "9270b6013c4575dff2e0625c0f4b8ae750218b0f"; + rev = "200165a6f8e055aae613b927137b6ac7cceba37f"; fetchSubmodules = false; - sha256 = "sha256-VYMC4WgRyJ0cTqBjSj4+FePyGokVoAvifyKgU6n1314="; + sha256 = "sha256-zXVGwry9bpQejNfzBrhKECm6mGWwxY70uC3SzcKhyjs="; }; - date = "2026-07-30"; + date = "2026-08-20"; }; mediamtx = { pname = "mediamtx"; - version = "v1.20.0"; + version = "v1.20.1"; src = fetchFromGitHub { owner = "bluenviron"; repo = "mediamtx"; - rev = "v1.20.0"; + rev = "v1.20.1"; fetchSubmodules = false; - sha256 = "sha256-bnbuIf3GdT+TCUHzAqvsS9wLPjDUGunpJoQBJFY4aTo="; + sha256 = "sha256-L9dRwOD5JCu3ZczTxeb3a6ShHMXGWNXVN5KAa/7bcjM="; }; }; mediamtx-rpicamera = { diff --git a/parts/wsl/sources/generated.json b/parts/wsl/sources/generated.json index e328ba57..d63c0989 100644 --- a/parts/wsl/sources/generated.json +++ b/parts/wsl/sources/generated.json @@ -36,12 +36,12 @@ "name": null, "owner": "Locietta", "repo": "xanmod-kernel-WSL2", - "rev": "6.18.44-locietta-WSL2-xanmod1.1-lts", - "sha256": "sha256-78IPIQ9C2vERFRV+VQqw9TCYPLIajYFVlNINud7zi7Y=", + "rev": "7.1.9-locietta-WSL2-xanmod1.1", + "sha256": "sha256-ZM06OHwl8a2JxDu1tjFX9tZEBnxrYQKMbhK/2jA6b/0=", "sparseCheckout": [], "type": "github" }, - "version": "6.18.44-locietta-WSL2-xanmod1.1-lts" + "version": "7.1.9-locietta-WSL2-xanmod1.1" }, "xanmod-lts": { "cargoLock": null, @@ -55,12 +55,12 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "6.18.44-xanmod1", - "sha256": "sha256-o0uvZj3wJcT8JbR8c42ayN3VUF5Ke6RIQ+igBWZNJmY=", + "rev": "7.1.9-xanmod1", + "sha256": "sha256-CtI5ExbqLKer2H3YdT6SbTSJfIfRfdIYUHnf96PXGgk=", "sparseCheckout": [], "type": "git", "url": "https://gitlab.com/xanmod/linux.git" }, - "version": "6.18.44-xanmod1" + "version": "7.1.9-xanmod1" } } \ No newline at end of file diff --git a/parts/wsl/sources/generated.nix b/parts/wsl/sources/generated.nix index bc1e0e75..907c7483 100644 --- a/parts/wsl/sources/generated.nix +++ b/parts/wsl/sources/generated.nix @@ -20,26 +20,26 @@ }; wsl-xanmod-lts = { pname = "wsl-xanmod-lts"; - version = "6.18.44-locietta-WSL2-xanmod1.1-lts"; + version = "7.1.9-locietta-WSL2-xanmod1.1"; src = fetchFromGitHub { owner = "Locietta"; repo = "xanmod-kernel-WSL2"; - rev = "6.18.44-locietta-WSL2-xanmod1.1-lts"; + rev = "7.1.9-locietta-WSL2-xanmod1.1"; fetchSubmodules = false; - sha256 = "sha256-78IPIQ9C2vERFRV+VQqw9TCYPLIajYFVlNINud7zi7Y="; + sha256 = "sha256-ZM06OHwl8a2JxDu1tjFX9tZEBnxrYQKMbhK/2jA6b/0="; }; }; xanmod-lts = { pname = "xanmod-lts"; - version = "6.18.44-xanmod1"; + version = "7.1.9-xanmod1"; src = fetchgit { url = "https://gitlab.com/xanmod/linux.git"; - rev = "6.18.44-xanmod1"; + rev = "7.1.9-xanmod1"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-o0uvZj3wJcT8JbR8c42ayN3VUF5Ke6RIQ+igBWZNJmY="; + sha256 = "sha256-CtI5ExbqLKer2H3YdT6SbTSJfIfRfdIYUHnf96PXGgk="; }; }; } diff --git a/profiles/common/build-machines.nix b/profiles/common/build-machines.nix index 995c9b9a..459c42dc 100644 --- a/profiles/common/build-machines.nix +++ b/profiles/common/build-machines.nix @@ -37,13 +37,13 @@ in { distributedBuilds = true; buildMachines = map mkBuildMachine [ - { - maxJobs = 4; - hostName = "oracle"; - systems = [ - "aarch64-linux" - ]; - } + # { + # maxJobs = 4; + # hostName = "oracle"; + # systems = [ + # "aarch64-linux" + # ]; + # } { maxJobs = 10; hostName = "mm4-builder"; diff --git a/nixos/hosts/aarch64/oracle/github-actions-builder.nix b/profiles/common/github-actions-builder.nix similarity index 100% rename from nixos/hosts/aarch64/oracle/github-actions-builder.nix rename to profiles/common/github-actions-builder.nix diff --git a/profiles/common/remote-builder.nix b/profiles/common/remote-builder.nix index 6b796cfc..8400278b 100644 --- a/profiles/common/remote-builder.nix +++ b/profiles/common/remote-builder.nix @@ -17,12 +17,12 @@ in { (builtins.readFile ../../secrets/ssh/remote-builder.pub) ]; } - // lib.optionalAttrs pkgs.stdenv.isLinux { + // lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { group = groupname; # nix-darwin does not have this properties isNormalUser = true; } - // lib.optionalAttrs pkgs.stdenv.isDarwin { + // lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { uid = lib.mkDefault defaultUid; gid = lib.mkDefault config.users.groups.${groupname}.gid; createHome = true; @@ -34,11 +34,11 @@ in { { members = [username]; } - // lib.optionalAttrs pkgs.stdenv.isDarwin { + // lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { gid = lib.mkDefault defaultGid; }; } - // lib.optionalAttrs pkgs.stdenv.isDarwin { + // lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { knownUsers = [username]; knownGroups = [groupname]; }; @@ -47,7 +47,7 @@ in { trusted-users = [username]; }; - system = lib.optionalAttrs pkgs.stdenv.isDarwin { + system = lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { activationScripts.postActivation.text = '' # Allow remote builder to access ssh dseditgroup -o edit -a ${username} -t user com.apple.access_ssh diff --git a/profiles/home/shell/ghostty.nix b/profiles/home/shell/ghostty.nix index 8e069dfc..51bbd637 100644 --- a/profiles/home/shell/ghostty.nix +++ b/profiles/home/shell/ghostty.nix @@ -28,7 +28,7 @@ lib.mkMerge [ }; } ( - lib.mkIf pkgs.stdenv.isDarwin { + lib.mkIf pkgs.stdenv.hostPlatform.isDarwin { programs.ghostty = { package = pkgs.ghostty-bin; diff --git a/profiles/home/shell/zsh.nix b/profiles/home/shell/zsh.nix index 14b58dd6..9e3f109b 100644 --- a/profiles/home/shell/zsh.nix +++ b/profiles/home/shell/zsh.nix @@ -9,7 +9,7 @@ direnv = lib.getExe config.programs.direnv.package; pkill = - if pkgs.stdenv.isDarwin + if pkgs.stdenv.hostPlatform.isDarwin then "/usr/bin/pkill" else "${pkgs.procps}/bin/pkill"; in {