diff --git a/.forgejo/workflows/lint.yml b/.forgejo/workflows/lint.yml index 49f43ed..85b6863 100644 --- a/.forgejo/workflows/lint.yml +++ b/.forgejo/workflows/lint.yml @@ -4,9 +4,19 @@ on: [push] jobs: lint: - runs-on: native + runs-on: docker + env: + 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@v22 + env: + 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 + yamllint . diff --git a/.forgejo/workflows/nix.yml b/.forgejo/workflows/nix.yml index c8abaec..8dbafa2 100644 --- a/.forgejo/workflows/nix.yml +++ b/.forgejo/workflows/nix.yml @@ -1,5 +1,7 @@ name: Nix +# on: [push] + jobs: lint: runs-on: docker @@ -8,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 7e2b2f5..2d5a239 100644 --- a/.forgejo/workflows/plex_update.yml +++ b/.forgejo/workflows/plex_update.yml @@ -10,9 +10,14 @@ on: jobs: update: - runs-on: native + runs-on: docker + container: + image: ghcr.io/catthehacker/ubuntu:js-20.04 steps: - uses: actions/checkout@v3 + - uses: https://github.com/cachix/install-nix-action@v22 + with: + nix_path: nixpkgs=channel:nixos-unstable - env: VAULT_ADDR: ${{ secrets.VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} 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 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 = { 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