From 4cdf69c21ec72d1dfbe78fb0349d30b950191e03 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 9 Sep 2023 10:35:36 +0200 Subject: [PATCH 01/12] ci-test --- .forgejo/workflows/lint.yml | 2 -- .forgejo/workflows/plex_update.yml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.forgejo/workflows/lint.yml b/.forgejo/workflows/lint.yml index 49f43ed..e116310 100644 --- a/.forgejo/workflows/lint.yml +++ b/.forgejo/workflows/lint.yml @@ -1,7 +1,5 @@ name: Lint -on: [push] - jobs: lint: runs-on: native diff --git a/.forgejo/workflows/plex_update.yml b/.forgejo/workflows/plex_update.yml index 7e2b2f5..bf18d55 100644 --- a/.forgejo/workflows/plex_update.yml +++ b/.forgejo/workflows/plex_update.yml @@ -10,7 +10,7 @@ on: jobs: update: - runs-on: native + runs-on: docker steps: - uses: actions/checkout@v3 - env: -- 2.44.1 From 97e0afdfa6977f1fd0e942062f959e4c5e6f2b8b Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 9 Sep 2023 10:36:38 +0200 Subject: [PATCH 02/12] deps --- .forgejo/workflows/plex_update.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/plex_update.yml b/.forgejo/workflows/plex_update.yml index bf18d55..29f19cc 100644 --- a/.forgejo/workflows/plex_update.yml +++ b/.forgejo/workflows/plex_update.yml @@ -17,6 +17,8 @@ jobs: VAULT_ADDR: ${{ secrets.VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} run: | + apt-get install vault -y + git config user.name "Forgejo Actions Bot" git config user.email "<>" -- 2.44.1 From 82b1f853ad90701c721ccce7cc056ee6a857a82d Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 9 Sep 2023 10:37:10 +0200 Subject: [PATCH 03/12] deps 2 --- .forgejo/workflows/plex_update.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/plex_update.yml b/.forgejo/workflows/plex_update.yml index 29f19cc..3ddbe74 100644 --- a/.forgejo/workflows/plex_update.yml +++ b/.forgejo/workflows/plex_update.yml @@ -17,6 +17,7 @@ jobs: VAULT_ADDR: ${{ secrets.VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} run: | + apt-get update apt-get install vault -y git config user.name "Forgejo Actions Bot" -- 2.44.1 From 788b6c94373fe91194acfbbf41c7c127251f397a Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 9 Sep 2023 10:38:35 +0200 Subject: [PATCH 04/12] deps 3 --- .forgejo/workflows/plex_update.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/plex_update.yml b/.forgejo/workflows/plex_update.yml index 3ddbe74..f5f23ff 100644 --- a/.forgejo/workflows/plex_update.yml +++ b/.forgejo/workflows/plex_update.yml @@ -17,8 +17,11 @@ jobs: VAULT_ADDR: ${{ secrets.VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} run: | - apt-get update - apt-get install vault -y + wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg + echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list + sudo apt-get update && sudo apt-get install vault -y + + git config user.name "Forgejo Actions Bot" git config user.email "<>" -- 2.44.1 From f37dee7e3f7bbb0940835f8b7816b741ff614f96 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 9 Sep 2023 10:40:26 +0200 Subject: [PATCH 05/12] deps 4 --- .forgejo/workflows/plex_update.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.forgejo/workflows/plex_update.yml b/.forgejo/workflows/plex_update.yml index f5f23ff..0aa8bef 100644 --- a/.forgejo/workflows/plex_update.yml +++ b/.forgejo/workflows/plex_update.yml @@ -13,16 +13,11 @@ jobs: runs-on: docker steps: - uses: actions/checkout@v3 + - uses: https://github.com/cpanato/vault-installer@main - env: VAULT_ADDR: ${{ secrets.VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} run: | - wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg - echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list - sudo apt-get update && sudo apt-get install vault -y - - - git config user.name "Forgejo Actions Bot" git config user.email "<>" -- 2.44.1 From 7fb5ed7ead1ac6feb7fb86566cb3555a41b51619 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 9 Sep 2023 10:41:19 +0200 Subject: [PATCH 06/12] deps 5 --- .forgejo/workflows/plex_update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/plex_update.yml b/.forgejo/workflows/plex_update.yml index 0aa8bef..36d783e 100644 --- a/.forgejo/workflows/plex_update.yml +++ b/.forgejo/workflows/plex_update.yml @@ -13,7 +13,7 @@ jobs: runs-on: docker steps: - uses: actions/checkout@v3 - - uses: https://github.com/cpanato/vault-installer@main + - uses: https://github.com/innovationnorway/setup-vault@v1 - env: VAULT_ADDR: ${{ secrets.VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} -- 2.44.1 From 79c9447175b82bfcab7996de97f31368e462f8c2 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 9 Sep 2023 10:44:37 +0200 Subject: [PATCH 07/12] test nix in ci --- .forgejo/workflows/nix.yml | 2 ++ .forgejo/workflows/plex_update.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.forgejo/workflows/nix.yml b/.forgejo/workflows/nix.yml index c8abaec..f00297f 100644 --- a/.forgejo/workflows/nix.yml +++ b/.forgejo/workflows/nix.yml @@ -1,5 +1,7 @@ name: Nix +on: [push] + jobs: lint: runs-on: docker diff --git a/.forgejo/workflows/plex_update.yml b/.forgejo/workflows/plex_update.yml index 36d783e..214266a 100644 --- a/.forgejo/workflows/plex_update.yml +++ b/.forgejo/workflows/plex_update.yml @@ -18,6 +18,8 @@ jobs: VAULT_ADDR: ${{ secrets.VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} run: | + sudo apt-get update + sudo apt-get install jq git config user.name "Forgejo Actions Bot" git config user.email "<>" -- 2.44.1 From 78230a3b0ab3005306e4a1f655301081ff0fa39a Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 9 Sep 2023 10:51:06 +0200 Subject: [PATCH 08/12] more ci stuff --- .forgejo/workflows/plex_update.yml | 8 +++++--- nixos/pkgs/plex-pass/update.sh | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/plex_update.yml b/.forgejo/workflows/plex_update.yml index 214266a..0ce70a0 100644 --- a/.forgejo/workflows/plex_update.yml +++ b/.forgejo/workflows/plex_update.yml @@ -11,15 +11,17 @@ on: jobs: update: runs-on: docker + container: + image: ghcr.io/catthehacker/ubuntu:js-20.04 steps: - uses: actions/checkout@v3 - - uses: https://github.com/innovationnorway/setup-vault@v1 + - uses: https://github.com/cachix/install-nix-action@v20 + with: + nix_path: nixpkgs=channel:nixos-unstabl - env: VAULT_ADDR: ${{ secrets.VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} run: | - sudo apt-get update - sudo apt-get install jq git config user.name "Forgejo Actions Bot" git config user.email "<>" diff --git a/nixos/pkgs/plex-pass/update.sh b/nixos/pkgs/plex-pass/update.sh index 90c07c3..bead2f3 100755 --- a/nixos/pkgs/plex-pass/update.sh +++ b/nixos/pkgs/plex-pass/update.sh @@ -1,4 +1,6 @@ -#! /usr/bin/env bash +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p vault curl jq + shopt -s extglob set -eu -o pipefail -- 2.44.1 From a127b341c3694e56b4d012eb276022e7a7dd53b7 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 9 Sep 2023 10:55:05 +0200 Subject: [PATCH 09/12] more ci stuff 2 --- .forgejo/workflows/lint.yml | 18 ++++++++++++++---- .forgejo/workflows/nix.yml | 2 +- .forgejo/workflows/plex_update.yml | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/lint.yml b/.forgejo/workflows/lint.yml index e116310..06d4ef3 100644 --- a/.forgejo/workflows/lint.yml +++ b/.forgejo/workflows/lint.yml @@ -1,10 +1,20 @@ name: Lint +on: [push] + jobs: lint: - runs-on: native + runs-on: docker + container: + image: ghcr.io/catthehacker/ubuntu:js-20.04 steps: - uses: actions/checkout@v3 - - run: statix check . - - run: deadnix -f - - run: yamllint . + - uses: https://github.com/cachix/install-nix-action@v20 + env: + with: + nix_path: nixpkgs=channel:nixos-unstable + - run: | + nix profile install 'nixpkgs#deadnix' 'nixpkgs#statix' 'nixpkgs#yamllint' + statix check . + deadnix -f + yamllint . diff --git a/.forgejo/workflows/nix.yml b/.forgejo/workflows/nix.yml index f00297f..6a8edf6 100644 --- a/.forgejo/workflows/nix.yml +++ b/.forgejo/workflows/nix.yml @@ -1,6 +1,6 @@ name: Nix -on: [push] +# on: [push] jobs: lint: diff --git a/.forgejo/workflows/plex_update.yml b/.forgejo/workflows/plex_update.yml index 0ce70a0..7bf2cd4 100644 --- a/.forgejo/workflows/plex_update.yml +++ b/.forgejo/workflows/plex_update.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - uses: https://github.com/cachix/install-nix-action@v20 with: - nix_path: nixpkgs=channel:nixos-unstabl + nix_path: nixpkgs=channel:nixos-unstable - env: VAULT_ADDR: ${{ secrets.VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} -- 2.44.1 From 850f90cb11a14a54459af63e6df39a6f088521ca Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 9 Sep 2023 10:58:17 +0200 Subject: [PATCH 10/12] more ci stuff 3 --- .forgejo/workflows/lint.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/lint.yml b/.forgejo/workflows/lint.yml index 06d4ef3..0739311 100644 --- a/.forgejo/workflows/lint.yml +++ b/.forgejo/workflows/lint.yml @@ -5,6 +5,7 @@ on: [push] jobs: lint: runs-on: docker + env: container: image: ghcr.io/catthehacker/ubuntu:js-20.04 steps: -- 2.44.1 From e91fcdedda96a4c98e85a47846bd1596e9781576 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 9 Sep 2023 16:01:35 +0200 Subject: [PATCH 11/12] more ci stuff 4 --- .forgejo/workflows/lint.yml | 2 +- .forgejo/workflows/nix.yml | 2 +- .forgejo/workflows/plex_update.yml | 2 +- nixos/common/desktop/home.nix | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/lint.yml b/.forgejo/workflows/lint.yml index 0739311..d055612 100644 --- a/.forgejo/workflows/lint.yml +++ b/.forgejo/workflows/lint.yml @@ -10,7 +10,7 @@ jobs: image: ghcr.io/catthehacker/ubuntu:js-20.04 steps: - uses: actions/checkout@v3 - - uses: https://github.com/cachix/install-nix-action@v20 + - uses: https://github.com/cachix/install-nix-action@v22 env: with: nix_path: nixpkgs=channel:nixos-unstable diff --git a/.forgejo/workflows/nix.yml b/.forgejo/workflows/nix.yml index 6a8edf6..8dbafa2 100644 --- a/.forgejo/workflows/nix.yml +++ b/.forgejo/workflows/nix.yml @@ -10,7 +10,7 @@ jobs: image: ghcr.io/catthehacker/ubuntu:js-20.04 steps: - uses: actions/checkout@v3 - - uses: https://github.com/cachix/install-nix-action@v20 + - uses: https://github.com/cachix/install-nix-action@v22 env: with: nix_path: nixpkgs=channel:nixos-unstable diff --git a/.forgejo/workflows/plex_update.yml b/.forgejo/workflows/plex_update.yml index 7bf2cd4..2d5a239 100644 --- a/.forgejo/workflows/plex_update.yml +++ b/.forgejo/workflows/plex_update.yml @@ -15,7 +15,7 @@ jobs: image: ghcr.io/catthehacker/ubuntu:js-20.04 steps: - uses: actions/checkout@v3 - - uses: https://github.com/cachix/install-nix-action@v20 + - uses: https://github.com/cachix/install-nix-action@v22 with: nix_path: nixpkgs=channel:nixos-unstable - env: diff --git a/nixos/common/desktop/home.nix b/nixos/common/desktop/home.nix index 3b22d7b..db10fb8 100644 --- a/nixos/common/desktop/home.nix +++ b/nixos/common/desktop/home.nix @@ -20,6 +20,7 @@ in { inputs.comma.packages.${pkgs.system}.default inputs.webcord.packages.${pkgs.system}.default kdenlive + mattermost-desktop mullvad-vpn neofetch nixfmt -- 2.44.1 From d33ef0c15842cb201f652a00bbc9e6dc4fc6b24c Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 9 Sep 2023 16:14:37 +0200 Subject: [PATCH 12/12] more ci stuff 5 --- .forgejo/workflows/lint.yml | 1 + nixos/hosts/olympus/gitea/configuration.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/lint.yml b/.forgejo/workflows/lint.yml index d055612..85b6863 100644 --- a/.forgejo/workflows/lint.yml +++ b/.forgejo/workflows/lint.yml @@ -15,6 +15,7 @@ jobs: with: nix_path: nixpkgs=channel:nixos-unstable - run: | + sed -i '/^access-tokens/ d' /etc/nix/nix.conf nix profile install 'nixpkgs#deadnix' 'nixpkgs#statix' 'nixpkgs#yamllint' statix check . deadnix -f diff --git a/nixos/hosts/olympus/gitea/configuration.nix b/nixos/hosts/olympus/gitea/configuration.nix index 45b52de..9deb583 100644 --- a/nixos/hosts/olympus/gitea/configuration.nix +++ b/nixos/hosts/olympus/gitea/configuration.nix @@ -69,8 +69,8 @@ in { "REPO_INDEXER_EXCLUDE" = "node_modules/**"; }; ui = { - "THEMES" = "gitea,arc-green,agatheme"; - "DEFAULT_THEME" = "agatheme"; + "THEMES" = "forgejo-auto,forgejo-light,forgejo-dark,auto,gitea,arc-green,agatheme"; + "DEFAULT_THEME" = "forgejo-auto"; "USE_SERVICE_WORKER" = true; }; server = { -- 2.44.1