diff --git a/.github/actions/setup-nix/action.yml b/.github/actions/setup-nix/action.yml index 7bbdd5a..788fcb5 100644 --- a/.github/actions/setup-nix/action.yml +++ b/.github/actions/setup-nix/action.yml @@ -3,16 +3,9 @@ name: Set up Nix description: | Sets up the Nix environment for wire, removing unnecessary bloat and installing Nix along with proper substituters being set -inputs: - withQEMU: - description: Enable QEMU - default: false runs: using: "composite" steps: - - uses: wimpysworld/nothing-but-nix@10c936d9e46521bf923f75458e0cbd4fa309300d - with: - hatchet-protocol: "carve" - name: Generate nix.conf shell: bash id: config @@ -21,32 +14,16 @@ runs: echo 'config<> "$GITHUB_OUTPUT" - env: - INPUTS_WITHQEMU: ${{ inputs.withQEMU }} - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: ${{ steps.config.outputs.config }} - name: Sanity check nix.conf - if: ${{ inputs.withQEMU == 'true' && runner.debug == '1' }} + if: ${{ runner.debug == '1' }} shell: bash run: cat /etc/nix/nix.conf - - name: Register binfmt - if: ${{ inputs.withQEMU == 'true' }} - shell: bash - run: | - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - name: Sanity check binfmt - if: ${{ inputs.withQEMU == 'true' && runner.debug == '1' }} - shell: bash - run: | - cat /proc/sys/fs/binfmt_misc/qemu-aarch64 diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml index 849fd57..84b9441 100644 --- a/.github/workflows/autofix.yml +++ b/.github/workflows/autofix.yml @@ -3,7 +3,6 @@ name: autofix.ci on: pull_request: push: - branches: ["trunk"] permissions: contents: read @@ -24,7 +23,7 @@ jobs: docs-pnpm: - 'doc/pnpm-lock.yaml' autofix: - runs-on: ubuntu-latest + runs-on: blacksmith-2vcpu-ubuntu-2404 needs: check-changes env: UV_CACHE_DIR: /tmp/.uv-cache diff --git a/README.md b/README.md index 303c38c..dcf2576 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -![Rust Tests Status](https://img.shields.io/github/actions/workflow/status/mrshmllow/wire/test.yml?branch=trunk&style=flat-square&label=Rust%20Tests) -![BuildBot Build & VM Test Status](https://img.shields.io/github/checks-status/mrshmllow/wire/trunk?style=flat-square&label=BuildBot%20Build%20%26%20VM%20Tests) -![Documentation Status](https://img.shields.io/github/actions/workflow/status/mrshmllow/wire/pages.yml?branch=trunk&style=flat-square&label=Documentation) +![Rust Tests Status](https://img.shields.io/github/actions/workflow/status/forallsys/wire/test.yml?branch=trunk&style=flat-square&label=Rust%20Tests) +![BuildBot Build & VM Test Status](https://img.shields.io/github/checks-status/forallsys/wire/trunk?style=flat-square&label=BuildBot%20Build%20%26%20VM%20Tests) +![Documentation Status](https://img.shields.io/github/actions/workflow/status/forallsys/wire/pages.yml?branch=trunk&style=flat-square&label=Documentation) wire is a tool to deploy nixos systems. its usage is inspired by colmena however it is not a fork. diff --git a/crates/core/src/hive/steps/keys.rs b/crates/core/src/hive/steps/keys.rs index 6a76a5c..9433e5a 100644 --- a/crates/core/src/hive/steps/keys.rs +++ b/crates/core/src/hive/steps/keys.rs @@ -355,7 +355,7 @@ impl ExecuteStep for PushKeyAgent { None => panic!( "{arg_name} environment variable not set! \n wire was not built with the ability to deploy keys to this platform. \n - Please create an issue: https://github.com/mrshmllow/wire/issues/new?template=bug_report.md" + Please create an issue: https://github.com/forallsys/wire/issues/new?template=bug_report.md" ), }; diff --git a/doc/.vitepress/config.ts b/doc/.vitepress/config.ts index 47b3a84..79d7c27 100644 --- a/doc/.vitepress/config.ts +++ b/doc/.vitepress/config.ts @@ -20,7 +20,7 @@ export default defineConfig({ footer: { message: - 'Released under the AGPL-3.0 License.', + 'Released under the AGPL-3.0 License.', copyright: "Copyright 2024-2025 wire Contributors", }, @@ -44,7 +44,7 @@ export default defineConfig({ }, { text: "Changelog", - link: "https://github.com/mrshmllow/wire/blob/trunk/CHANGELOG.md", + link: "https://github.com/forallsys/wire/blob/trunk/CHANGELOG.md", }, { text: "CI Server", @@ -150,12 +150,12 @@ export default defineConfig({ }, editLink: { - pattern: "https://github.com/mrshmllow/wire/edit/trunk/doc/:path", + pattern: "https://github.com/forallsys/wire/edit/trunk/doc/:path", text: "Edit this page on GitHub", }, socialLinks: [ - { icon: "github", link: "https://github.com/mrshmllow/wire" }, + { icon: "github", link: "https://github.com/forallsys/wire" }, ], }, markdown: { diff --git a/doc/guides/installation.md b/doc/guides/installation.md index d09dfab..ff06310 100644 --- a/doc/guides/installation.md +++ b/doc/guides/installation.md @@ -45,13 +45,13 @@ Using npins specifically is not required, you can pin your sources in any way you'd like, really. ```sh -$ npins add github mrshmllow wire --branch stable +$ npins add github forallsys wire --branch stable ``` Alternatively, you can use a tag instead: ```sh -$ npins add github mrshmllow wire --at v1.1.0 +$ npins add github forallsys wire --at v1.1.0 ``` Then, use this pinned version of wire for both your `hive.nix` and `shell.nix`: diff --git a/doc/guides/migrate.md b/doc/guides/migrate.md index a2fb9b7..5dde0f5 100644 --- a/doc/guides/migrate.md +++ b/doc/guides/migrate.md @@ -41,7 +41,7 @@ binary. inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; colmena.url = "github:zhaofengli/colmena"; # [!code --] - wire.url = "github:mrshmllow/wire/stable"; # [!code ++] + wire.url = "github:forallsys/wire/stable"; # [!code ++] }; outputs = { nixpkgs, colmena, ... }: diff --git a/doc/index.md b/doc/index.md index 0c323eb..da7c8e0 100644 --- a/doc/index.md +++ b/doc/index.md @@ -14,7 +14,7 @@ hero: link: /guides/installation - theme: alt text: Sources - link: https://github.com/mrshmllow/wire.git + link: https://github.com/forallsys/wire.git features: - title: Deploy in Parallel diff --git a/doc/snippets/getting-started/configuration.nix b/doc/snippets/getting-started/configuration.nix index 29b30b3..869007b 100644 --- a/doc/snippets/getting-started/configuration.nix +++ b/doc/snippets/getting-started/configuration.nix @@ -1,7 +1,7 @@ {system, ...}: let wire = import ( # [!code ++] - builtins.fetchTarball "https://github.com/mrshmllow/wire/archive/refs/heads/trunk.tar.gz" # [!code ++] + builtins.fetchTarball "https://github.com/forallsys/wire/archive/refs/heads/trunk.tar.gz" # [!code ++] ); # [!code ++] in { environment.systemPackages = [ diff --git a/doc/snippets/getting-started/flake-merged.nix b/doc/snippets/getting-started/flake-merged.nix index 1e22e17..af80d84 100644 --- a/doc/snippets/getting-started/flake-merged.nix +++ b/doc/snippets/getting-started/flake-merged.nix @@ -1,6 +1,6 @@ { inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - inputs.wire.url = "github:mrshmllow/wire"; + inputs.wire.url = "github:forallsys/wire"; outputs = { self, diff --git a/doc/snippets/getting-started/flake.nix b/doc/snippets/getting-started/flake.nix index 0a56a7e..f012fa2 100644 --- a/doc/snippets/getting-started/flake.nix +++ b/doc/snippets/getting-started/flake.nix @@ -1,6 +1,6 @@ { inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - inputs.wire.url = "github:mrshmllow/wire"; + inputs.wire.url = "github:forallsys/wire"; outputs = inputs @ { nixpkgs, diff --git a/doc/snippets/getting-started/nixos.flake.nix b/doc/snippets/getting-started/nixos.flake.nix index e64d4e5..592d7a7 100644 --- a/doc/snippets/getting-started/nixos.flake.nix +++ b/doc/snippets/getting-started/nixos.flake.nix @@ -2,7 +2,7 @@ inputs = { # ... nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - wire.url = "github:mrshmllow/wire"; # [!code ++] + wire.url = "github:forallsys/wire"; # [!code ++] }; outputs = inputs @ { diff --git a/doc/snippets/guides/installation/flake.nix b/doc/snippets/guides/installation/flake.nix index 626d1e0..510a614 100644 --- a/doc/snippets/guides/installation/flake.nix +++ b/doc/snippets/guides/installation/flake.nix @@ -1,10 +1,10 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - wire.url = "github:mrshmllow/wire/stable"; + wire.url = "github:forallsys/wire/stable"; # alternatively, you can use a tag instead: - # wire.url = "github:mrshmllow/wire/v1.1.0"; + # wire.url = "github:forallsys/wire/v1.1.0"; systems.url = "github:nix-systems/default"; }; diff --git a/doc/tutorial/part-one/repo-setup.md b/doc/tutorial/part-one/repo-setup.md index 96cd307..9c76fe2 100644 --- a/doc/tutorial/part-one/repo-setup.md +++ b/doc/tutorial/part-one/repo-setup.md @@ -39,12 +39,12 @@ This has created a pinned version of `nixpkgs` for us to use in our wire hive. ## Adding wire as a dependency -We can now need to tell `npins` to use `mrshmllow/wire` as a dependency. +We can now need to tell `npins` to use `forallsys/wire` as a dependency. ```sh -[nix-shell]$ npins add github mrshmllow wire --branch stable +[nix-shell]$ npins add github forallsys wire --branch stable [INFO ] Adding 'wire' … - repository: https://github.com/mrshmllow/wire.git + repository: https://github.com/forallsys/wire.git pre_releases: false submodules: false version: v0.4.0 @@ -68,7 +68,7 @@ nixpkgs: (git repository) frozen: false wire: (git release tag) - repository: https://github.com/mrshmllow/wire.git + repository: https://github.com/forallsys/wire.git pre_releases: false submodules: false version: v0.4.0