specify _class module attributes to explicitly declare module types

see Fediversity/Fediversity#65 (comment).

closes #65.

Reviewed-on: Fediversity/Fediversity#394
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>

.forgejo/workflows/update.yaml

@@ -7,15 +7,16 @@ on:
 
 jobs:
   lockfile:
-    runs-on: ubuntu-latest
+    runs-on: native
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - name: Install Nix
-        uses: cachix/install-nix-action@v31
       - name: Install npins
-        run: nix profile install 'nixpkgs#npins'
+        run: nix-shell --run "npins update"
-      - name: Update npins sources
+      - name: Create PR
-        uses: getchoo/update-npins@v0
+        uses: peter-evans/create-pull-request@v7
         with:
           token: "${{ secrets.DEPLOY_KEY }}"
+          branch: npins-update
+          commit-message: "npins: update sources"
+          title: "npins: update sources"

deployment/check/basic/flake-part.nix

@@ -17,6 +17,8 @@ let
 
 in
 {
+  _class = "flake";
+
   perSystem =
     { pkgs, ... }:
     {

deployment/check/basic/nixosTest.nix

@@ -1,6 +1,8 @@
 { inputs, ... }:
 
 {
+  _class = "nixosTest";
+
   name = "deployment-basic";
 
   nodes.deployer =

deployment/check/cli/flake-part.nix

@@ -20,6 +20,8 @@ let
 
 in
 {
+  _class = "flake";
+
   perSystem =
     { pkgs, ... }:
     {

deployment/check/cli/nixosTest.nix

@@ -7,6 +7,8 @@ let
 in
 
 {
+  _class = "nixosTest";
+
   name = "deployment-cli";
 
   nodes.deployer =

deployment/check/common/deployerNode.nix

@@ -18,6 +18,8 @@ let
 
 in
 {
+  _class = "nixos";
+
   imports = [ ./sharedOptions.nix ];
 
   options.system.extraDependenciesFromModule = mkOption {

deployment/check/common/nixosTest.nix

@@ -42,6 +42,8 @@ let
 
 in
 {
+  _class = "nixosTest";
+
   imports = [
     ./sharedOptions.nix
   ];

deployment/check/common/sharedOptions.nix

@@ -12,6 +12,8 @@ let
 
 in
 {
+  _class = "nixos";
+
   options = {
     targetMachines = mkOption {
       type = with types; listOf str;

deployment/check/common/targetNode.nix

@@ -12,6 +12,8 @@ let
 
 in
 {
+  _class = "nixos";
+
   imports = [
     (modulesPath + "/profiles/qemu-guest.nix")
     (modulesPath + "/../lib/testing/nixos-test-base.nix")

deployment/check/common/targetResource.nix

@@ -12,6 +12,8 @@ let
 in
 
 {
+  _class = "nixops4Resource";
+
   imports = [ ./sharedOptions.nix ];
 
   options = {

deployment/check/panel/flake-part.nix

@@ -23,6 +23,8 @@ let
 
 in
 {
+  _class = "flake";
+
   perSystem =
     { pkgs, ... }:
     {

deployment/check/panel/nixosTest.nix

@@ -121,6 +121,8 @@ let
 in
 
 {
+  _class = "nixosTest";
+
   name = "deployment-panel";
 
   ## The panel's module sets `nixpkgs.overlays` which clashes with

deployment/data-model.nix

@@ -7,6 +7,8 @@ let
 in
 with types;
 {
+  _class = "nixops4Deployment";
+
   options = {
     runtime-environments = mkOption {
       description = "Collection of runtime environments into which applications can be deployed";

deployment/default.nix

@@ -65,6 +65,8 @@ let
   cfg = config.deployment;
 in
 {
+  _class = "nixops4Deployment";
+
   options = {
     deployment = lib.mkOption {
       description = ''

deployment/flake-part.nix

@@ -1,4 +1,6 @@
 {
+  _class = "flake";
+
   imports = [
     ./check/basic/flake-part.nix
     ./check/cli/flake-part.nix

deployment/options.nix

@@ -17,6 +17,8 @@ let
   inherit (lib) types mkOption;
 in
 {
+  _class = "nixops4Deployment";
+
   options = {
     enable = lib.mkEnableOption "Fediversity configuration";
     domain = mkOption {

flake.nix

@@ -1,4 +1,6 @@
 {
+  _class = "flake";
+
   inputs = {
     flake-parts.url = "github:hercules-ci/flake-parts";
     git-hooks.url = "github:cachix/git-hooks.nix";

infra/common/nixos/default.nix

@@ -5,6 +5,8 @@ let
 
 in
 {
+  _class = "nixos";
+
   imports = [
     ./hardware.nix
     ./networking.nix

infra/common/nixos/hardware.nix

@@ -1,6 +1,8 @@
 { modulesPath, ... }:
 
 {
+  _class = "nixos";
+
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
 
   boot = {

infra/common/nixos/networking.nix

@@ -5,6 +5,8 @@ let
 
 in
 {
+  _class = "nixos";
+
   config = {
     services.openssh = {
       enable = true;

infra/common/nixos/users.nix

@@ -1,4 +1,6 @@
 {
+  _class = "nixos";
+
   users.users = {
     procolix = {
       isNormalUser = true;

infra/common/options.nix

@@ -6,6 +6,8 @@ let
 
 in
 {
+  _class = "nixops4Resource";
+
   options.fediversityVm = {
 
     ##########################################################################

infra/common/resource.nix

@@ -18,6 +18,8 @@ let
 
 in
 {
+  _class = "nixops4Resource";
+
   imports = [ ./options.nix ];
 
   fediversityVm.hostPublicKey = mkDefault keys.systems.${config.fediversityVm.name};

infra/flake-part.nix

@@ -155,6 +155,8 @@ let
 
 in
 {
+  _class = "flake";
+
   ## - Each normal or test machine gets a NixOS configuration.
   ## - Each normal or test machine gets a VM options entry.
   ## - Each normal machine gets a deployment.

machines/dev/fedi200/default.nix

@@ -1,4 +1,6 @@
 {
+  _class = "nixops4Resource";
+
   fediversityVm = {
     vmId = 200;
     proxmox = "fediversity";

machines/dev/fedi201/default.nix

@@ -1,4 +1,6 @@
 {
+  _class = "nixops4Resource";
+
   fediversityVm = {
     vmId = 201;
     proxmox = "fediversity";

machines/dev/fedi201/fedipanel.nix

@@ -6,6 +6,8 @@ let
   name = "panel";
 in
 {
+  _class = "nixos";
+
   imports = [
     (import ../../../panel { }).module
   ];

machines/dev/vm02116/default.nix

@@ -1,4 +1,6 @@
 {
+  _class = "nixops4Resource";
+
   fediversityVm = {
     vmId = 2116;
     proxmox = "procolix";

machines/dev/vm02116/forgejo.nix

@@ -5,6 +5,8 @@ let
 
 in
 {
+  _class = "nixos";
+
   services.forgejo = {
     enable = true;
 

machines/dev/vm02187/default.nix

@@ -1,4 +1,6 @@
 {
+  _class = "nixops4Resource";
+
   fediversityVm = {
     vmId = 2187;
     proxmox = "procolix";

machines/dev/vm02187/wiki.nix

@@ -1,6 +1,8 @@
 { config, ... }:
 
 {
+  _class = "nixos";
+
   services.phpfpm.pools.mediawiki.phpOptions = ''
     upload_max_filesize = 1024M;
     post_max_size = 1024M;

machines/operator/test01/default.nix

@@ -1,4 +1,6 @@
 {
+  _class = "nixops4Resource";
+
   fediversityVm = {
     vmId = 7001;
     proxmox = "fediversity";

machines/operator/test02/default.nix

@@ -1,4 +1,6 @@
 {
+  _class = "nixops4Resource";
+
   fediversityVm = {
     vmId = 7002;
     proxmox = "fediversity";

machines/operator/test03/default.nix

@@ -1,4 +1,6 @@
 {
+  _class = "nixops4Resource";
+
   fediversityVm = {
     vmId = 7003;
     proxmox = "fediversity";

machines/operator/test04/default.nix

@@ -1,4 +1,6 @@
 {
+  _class = "nixops4Resource";
+
   fediversityVm = {
     vmId = 7004;
     proxmox = "fediversity";

machines/operator/test05/default.nix

@@ -1,4 +1,6 @@
 {
+  _class = "nixops4Resource";
+
   fediversityVm = {
     vmId = 7005;
     proxmox = "fediversity";

machines/operator/test06/default.nix

@@ -1,4 +1,6 @@
 {
+  _class = "nixops4Resource";
+
   fediversityVm = {
     vmId = 7006;
     proxmox = "fediversity";

machines/operator/test11/default.nix

@@ -1,4 +1,6 @@
 {
+  _class = "nixops4Resource";
+
   fediversityVm = {
     vmId = 7011;
     proxmox = "fediversity";

machines/operator/test12/default.nix

@@ -1,4 +1,6 @@
 {
+  _class = "nixops4Resource";
+
   fediversityVm = {
     vmId = 7012;
     proxmox = "fediversity";

machines/operator/test13/default.nix

@@ -1,4 +1,6 @@
 {
+  _class = "nixops4Resource";
+
   fediversityVm = {
     vmId = 7013;
     proxmox = "fediversity";

machines/operator/test14/default.nix

@@ -1,4 +1,6 @@
 {
+  _class = "nixops4Resource";
+
   fediversityVm = {
     vmId = 7014;
     proxmox = "fediversity";

panel/nix/configuration.nix

@@ -76,6 +76,8 @@ in
 #       https://git.dgnum.eu/mdebray/djangonix/
 #       unlicensed at the time of writing, but surely worth taking some inspiration from...
 {
+  _class = "nixos";
+
   options.services.${name} = {
     enable = mkEnableOption "Service configuration for `${name}`";
     production = mkOption {

services/fediversity/default.nix

@@ -6,6 +6,8 @@ let
 
 in
 {
+  _class = "nixos";
+
   imports = [
     ./garage
     ./mastodon

services/fediversity/garage/default.nix

@@ -97,6 +97,8 @@ let
 
 in
 {
+  _class = "nixos";
+
   imports = [ ./options.nix ];
 
   config = mkIf config.fediversity.garage.enable {

services/fediversity/garage/options.nix

@@ -5,6 +5,8 @@ let
 in
 
 {
+  _class = "nixos";
+
   options.fediversity.garage = {
     enable = mkEnableOption "Enable a Garage server on the machine";
 

services/fediversity/mastodon/default.nix

@@ -11,6 +11,8 @@ let
 
 in
 {
+  _class = "nixos";
+
   imports = [ ./options.nix ];
 
   config = mkMerge [

services/fediversity/mastodon/options.nix

@@ -1,6 +1,8 @@
 { config, lib, ... }:
 
 {
+  _class = "nixos";
+
   options.fediversity.mastodon =
     (import ../sharedOptions.nix {
       inherit config lib;

services/fediversity/peertube/default.nix

@@ -5,6 +5,8 @@ let
 
 in
 {
+  _class = "nixos";
+
   imports = [ ./options.nix ];
 
   config = mkMerge [

services/fediversity/peertube/options.nix

@@ -6,6 +6,8 @@ let
 
 in
 {
+  _class = "nixos";
+
   options.fediversity.peertube =
     (import ../sharedOptions.nix {
       inherit config lib;

services/fediversity/pixelfed/default.nix

@@ -15,6 +15,8 @@ let
 
 in
 {
+  _class = "nixos";
+
   imports = [ ./options.nix ];
 
   config = mkMerge [

services/fediversity/pixelfed/options.nix

@@ -1,6 +1,8 @@
 { config, lib, ... }:
 
 {
+  _class = "nixos";
+
   options.fediversity.pixelfed =
     (import ../sharedOptions.nix {
       inherit config lib;

services/fediversity/sharedOptions.nix

@@ -14,6 +14,8 @@ let
 
 in
 {
+  _class = "nixos";
+
   enable = mkEnableOption "Enable a ${serviceDocName} server on the machine";
 
   s3AccessKeyFile = mkOption {

services/tests/mastodon.nix

@@ -43,6 +43,8 @@ let
 in
 
 {
+  _class = "nixosTest";
+
   name = "mastodon";
 
   nodes = {

services/tests/peertube.nix

@@ -162,6 +162,8 @@ let
 in
 
 {
+  _class = "nixosTest";
+
   name = "peertube";
 
   nodes = {

services/tests/pixelfed-garage.nix

@@ -115,6 +115,8 @@ let
 
 in
 {
+  _class = "nixosTest";
+
   name = "test-pixelfed-garage";
 
   nodes = {

services/tests/rebuildableTest.nix

@@ -127,6 +127,8 @@ let
       preOverride = pkgs.nixosTest (
         test
         // {
+          _class = "nixosTest";
+
           interactive = (test.interactive or { }) // {
             # no need to // with test.interactive.nodes here, since we are iterating
             # over all of them, and adding back in the config via `imports`

services/vm/garage-vm.nix

@@ -10,6 +10,8 @@ let
 
 in
 {
+  _class = "nixos";
+
   imports = [ (modulesPath + "/virtualisation/qemu-vm.nix") ];
 
   fediversity.garage.enable = true;

services/vm/interactive-vm.nix

@@ -1,6 +1,8 @@
 # customize nixos-rebuild build-vm to be a bit more convenient
 { pkgs, ... }:
 {
+  _class = "nixos";
+
   # let us log in
   users.mutableUsers = false;
   users.users.root.hashedPassword = "";

services/vm/mastodon-vm.nix

@@ -6,6 +6,7 @@
   ...
 }:
 {
+  _class = "nixos";
 
   imports = [ (modulesPath + "/virtualisation/qemu-vm.nix") ];
 

services/vm/peertube-vm.nix

@@ -5,6 +5,8 @@
 }:
 
 {
+  _class = "nixos";
+
   imports = [ (modulesPath + "/virtualisation/qemu-vm.nix") ];
 
   fediversity = {

services/vm/pixelfed-vm.nix

@@ -11,6 +11,8 @@ let
 in
 
 {
+  _class = "nixos";
+
   imports = [ (modulesPath + "/virtualisation/qemu-vm.nix") ];
 
   fediversity = {