diff --git a/.github/workflows/eval.yaml b/.github/workflows/eval.yaml index 494704f..90a9897 100644 --- a/.github/workflows/eval.yaml +++ b/.github/workflows/eval.yaml @@ -1,8 +1,10 @@ name: Eval NixOS Configurations on: - check_suite: - types: [completed] + push: + branches: + - deploy + workflow_dispatch: permissions: contents: write @@ -34,7 +36,7 @@ jobs: failed_hosts="" for host in $hosts; do echo "Eval derivation for $host" - if ! nix derivation show ".#nixosConfigurations.$host.config.system.build.toplevel" > "eval/$host.json"; then + if ! nix show-derivation -L ".#nixosConfigurations.$host.config.system.build.toplevel" > "eval/$host.json"; then echo "❌ Failed to evaluate $host" failed_hosts+="$host " rm "eval/$host.json" diff --git a/machines/calcite/configuration.nix b/machines/calcite/configuration.nix index a3c84c4..c8e4e4a 100644 --- a/machines/calcite/configuration.nix +++ b/machines/calcite/configuration.nix @@ -15,12 +15,23 @@ in ../sops.nix ]; + services.comin = { + enable = true; + remotes = [ + { + name = "origin"; + url = "https://github.com/xinyangli/nixos-config.git"; + branches.main.name = "deploy-comin-eval"; + } + ]; + hostname = config.networking.hostName; + }; + commonSettings = { # auth.enable = true; nix = { signing.enable = true; }; - comin.enable = true; }; # Bootloader. diff --git a/machines/weilite/default.nix b/machines/weilite/default.nix index bae1b92..9d8cd04 100644 --- a/machines/weilite/default.nix +++ b/machines/weilite/default.nix @@ -19,7 +19,6 @@ nix = { enable = true; }; - comin.enable = true; }; boot = { @@ -39,10 +38,7 @@ nixpkgs.config.allowUnfree = true; - environment.systemPackages = [ - pkgs.virtiofsd - pkgs.intel-gpu-tools - ]; + environment.systemPackages = [ pkgs.virtiofsd ]; sops = { defaultSopsFile = ./secrets.yaml; @@ -98,32 +94,15 @@ options = "rw,nodev,nosuid"; wantedBy = [ "restic-rest-server.service" ]; } - # { - # what = "ocis"; - # where = "/var/lib/ocis"; - # type = "virtiofs"; - # options = "rw,nodev,nosuid"; - # wantedBy = [ "ocis.service" ]; - # } { - what = "media"; - where = "/var/lib/jellyfin/media"; + what = "ocis"; + where = "/var/lib/ocis"; type = "virtiofs"; options = "rw,nodev,nosuid"; + wantedBy = [ "ocis.service" ]; } ]; - hardware.graphics = { - enable = true; - extraPackages = with pkgs; [ - intel-media-driver - intel-vaapi-driver - vaapiVdpau - intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in) - intel-media-sdk # QSV up to 11th gen - ]; - }; - services.openssh.ports = [ 22 2222 diff --git a/machines/weilite/services/default.nix b/machines/weilite/services/default.nix index 5a5cc25..0a6e4ca 100644 --- a/machines/weilite/services/default.nix +++ b/machines/weilite/services/default.nix @@ -4,6 +4,5 @@ ./restic.nix ./media-download.nix ./immich.nix - ./jellyfin.nix ]; } diff --git a/machines/weilite/services/jellyfin.nix b/machines/weilite/services/jellyfin.nix deleted file mode 100644 index d321de5..0000000 --- a/machines/weilite/services/jellyfin.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, pkgs, ... }: -{ - services.jellyfin.enable = true; - - environment.systemPackages = with pkgs; [ - jellyfin - jellyfin-web - jellyfin-ffmpeg - ]; - services.caddy.virtualHosts."https://weilite.coho-tet.ts.net:8920".extraConfig = '' - reverse_proxy 127.0.0.1:8096 - ''; - networking.firewall.allowedTCPPorts = [ 8920 ]; # allow on lan - users.users.jellyfin.extraGroups = [ "render" ]; -} diff --git a/modules/nixos/common-settings/comin.nix b/modules/nixos/common-settings/comin.nix deleted file mode 100644 index 3d543f2..0000000 --- a/modules/nixos/common-settings/comin.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - config, - lib, - ... -}: -let - inherit (lib) - mkEnableOption - mkIf - ; - - cfg = config.commonSettings.comin; -in -{ - options.commonSettings.comin = { - enable = mkEnableOption "auto updater with comin"; - }; - - config = { - services.comin = mkIf cfg.enable { - enable = true; - remotes = [ - { - name = "origin"; - url = "https://github.com/xinyangli/nixos-config.git"; - branches.main.name = "deploy-comin-eval"; - } - ]; - hostname = config.networking.hostName; - }; - }; -}