diff --git a/.github/workflows/nodes.yml b/.github/workflows/nodes.yml index 12426ad1..0d63f2fb 100644 --- a/.github/workflows/nodes.yml +++ b/.github/workflows/nodes.yml @@ -3,68 +3,6 @@ env: CI_CONFIG: ./ci/nodes.nix CI_PLATFORM: gh-actions jobs: - chen: - name: nodes-chen - runs-on: ubuntu-latest - steps: - - id: checkout - name: git clone - uses: actions/checkout@v1 - with: - submodules: false - - id: nix-install - name: nix install - uses: arcnmx/ci/actions/nix/install@nix2.4 - - id: ci-setup - name: nix setup - uses: arcnmx/ci/actions/nix/run@nix2.4 - with: - attrs: ci.job.chen.run.bootstrap - quiet: false - - id: architectures - name: prepare for emulated builds - run: 'sudo $(which archbinfmt) - - ' - - id: ci-dirty - name: nix test dirty - uses: arcnmx/ci/actions/nix/run@nix2.4 - with: - attrs: ci.job.chen.run.test - command: ci-build-dirty - quiet: false - stdout: ${{ runner.temp }}/ci.build.dirty - - id: ci-test - name: nix test build - uses: arcnmx/ci/actions/nix/run@nix2.4 - with: - attrs: ci.job.chen.run.test - command: ci-build-realise - ignore-exit-code: true - quiet: false - stdin: ${{ runner.temp }}/ci.build.dirty - - env: - CI_EXIT_CODE: ${{ steps.ci-test.outputs.exit-code }} - id: ci-summary - name: nix test results - uses: arcnmx/ci/actions/nix/run@nix2.4 - with: - attrs: ci.job.chen.run.test - command: ci-build-summarise - quiet: false - stdin: ${{ runner.temp }}/ci.build.dirty - stdout: ${{ runner.temp }}/ci.build.cache - - env: - CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }} - id: ci-cache - if: always() - name: nix test cache - uses: arcnmx/ci/actions/nix/run@nix2.4 - with: - attrs: ci.job.chen.run.test - command: ci-build-cache - quiet: false - stdin: ${{ runner.temp }}/ci.build.cache ci-check: name: nodes check runs-on: ubuntu-latest @@ -276,68 +214,6 @@ jobs: command: ci-build-cache quiet: false stdin: ${{ runner.temp }}/ci.build.cache - ran: - name: nodes-ran - runs-on: ubuntu-latest - steps: - - id: checkout - name: git clone - uses: actions/checkout@v1 - with: - submodules: false - - id: nix-install - name: nix install - uses: arcnmx/ci/actions/nix/install@nix2.4 - - id: ci-setup - name: nix setup - uses: arcnmx/ci/actions/nix/run@nix2.4 - with: - attrs: ci.job.ran.run.bootstrap - quiet: false - - id: architectures - name: prepare for emulated builds - run: 'sudo $(which archbinfmt) - - ' - - id: ci-dirty - name: nix test dirty - uses: arcnmx/ci/actions/nix/run@nix2.4 - with: - attrs: ci.job.ran.run.test - command: ci-build-dirty - quiet: false - stdout: ${{ runner.temp }}/ci.build.dirty - - id: ci-test - name: nix test build - uses: arcnmx/ci/actions/nix/run@nix2.4 - with: - attrs: ci.job.ran.run.test - command: ci-build-realise - ignore-exit-code: true - quiet: false - stdin: ${{ runner.temp }}/ci.build.dirty - - env: - CI_EXIT_CODE: ${{ steps.ci-test.outputs.exit-code }} - id: ci-summary - name: nix test results - uses: arcnmx/ci/actions/nix/run@nix2.4 - with: - attrs: ci.job.ran.run.test - command: ci-build-summarise - quiet: false - stdin: ${{ runner.temp }}/ci.build.dirty - stdout: ${{ runner.temp }}/ci.build.cache - - env: - CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }} - id: ci-cache - if: always() - name: nix test cache - uses: arcnmx/ci/actions/nix/run@nix2.4 - with: - attrs: ci.job.ran.run.test - command: ci-build-cache - quiet: false - stdin: ${{ runner.temp }}/ci.build.cache renko: name: nodes-renko runs-on: ubuntu-latest diff --git a/nixos/systems/chen.nix b/nixos/systems/chen.nix deleted file mode 100644 index 536de76f..00000000 --- a/nixos/systems/chen.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ meta, config, pkgs, lib, ... }: - -with lib; - -{ - # Imports - - imports = with meta; [ - hardware.eeepc-1015pem - nixos.network - nixos.arc - services.kattv2 - services.dnscrypt-proxy - ]; - - # Terraform - - deploy.tf = { - resources.chen = { - provider = "null"; - type = "resource"; - connection = { - port = head config.services.openssh.ports; - host = config.network.addresses.private.nixos.ipv4.address; - }; - }; - }; - - # File Systems and Swap - - fileSystems."/" = - { device = "/dev/disk/by-uuid/fa06ba90-ffc9-4ca6-b1cf-1205340a975e"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/BF39-2AA3"; - fsType = "vfat"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/9c88235e-9705-4b80-a988-e95eda06124f"; } - ]; - - # Bootloader - - boot = { - initrd = { - availableKernelModules = [ "xhci_pci" "usb_storage" "sd_mod" "sdhci_acpi" ]; - }; - loader = { - systemd-boot.enable = true; - efi.canTouchEfiVariables = true; - }; - }; - - # Hardware - - services.logind.lidSwitchExternalPower = "ignore"; - - # Networking - - networking = { - hostId = "9f89b327"; - useDHCP = false; - wireless = { - enable = false; - userControlled.enable = false; - interfaces = singleton "wlp1s0"; - }; - interfaces.enp0s20u1 = { - useDHCP = true; - }; - }; - - networks.chitei = { - interfaces = [ "enp0s20u1" "wlp1s0" ]; - ipv4 = "192.168.1.196"; - }; - - # State - - system.stateVersion = "20.09"; -} diff --git a/nixos/systems/ran.nix b/nixos/systems/ran.nix deleted file mode 100644 index 017748d3..00000000 --- a/nixos/systems/ran.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ meta, config, pkgs, lib, ... }: - -with lib; - -{ - # Imports - - imports = with meta; [ - hardware.eeepc-1015pem - hardware.local - nixos.network - nixos.arc - services.kattv - services.dnscrypt-proxy - ]; - - # File Systems and Swap - - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/469a684b-eb8f-48a8-8f98-be58528312c4"; - fsType = "ext4"; - }; - }; - - swapDevices = [{ device = "/dev/disk/by-uuid/2223e305-79c9-45b3-90d7-560dcc45775a"; }]; - - # Bootloader - - boot.loader.grub = { - enable = true; - version = 2; - device = "/dev/sda"; - }; - - # Hardware - - services.logind.lidSwitchExternalPower = "ignore"; - - # Networking - - networking = { - hostId = "9f89b327"; - useDHCP = false; - interfaces.enp1s0.useDHCP = true; - }; - - networks.chitei = { - interfaces = [ "enp1s0" ]; - ipv4 = "192.168.1.215"; - }; - - # State - - system.stateVersion = "20.09"; -} diff --git a/nixos/systems/yukari.nix b/nixos/systems/yukari.nix index a05bfb48..492248c8 100644 --- a/nixos/systems/yukari.nix +++ b/nixos/systems/yukari.nix @@ -6,8 +6,6 @@ nixos.arc services.ha services.nextcloud - #services.kattv-ingest - #services.kattv2-ingest services.postgres services.nfs services.nginx