updated README

README.md

@@ -146,8 +146,7 @@ machine. The only technically required file in there is `configuration.nix`. So
 
 A good skeleton is probably:
 ```
-flake-inputs:
-{config, pkgs, lib, ... }: {
+{config, pkgs, lib, flake-inputs, ... }: {
 
 imports = [
   ./hardware-configuration.nix
@@ -282,3 +281,29 @@ something like this:
 {lib, pkgs, config, ...} :
 <module code >
 ```
+
+# Contributing
+
+Like with all FS projects, you are welcome to contribute. Work is done usually by the person that is most annoyed
+by the circumstances or by the person that didn't run fast enough. So we are happy if we get help. That doesn't
+mean that we don't need to have some level of quality, people after us needs to work with it. It is live infrastructure
+and downtime hurts someone (and in the wrong moment even really bad (Matheball ticket sales for example).
+
+So here are some Guidelines.
+
+## Coding style and linting.
+If you run `nix check` there are automated checks in place, please make sure to pass them.
+There is also a code autoformatter (`alejandra`) incorporated into those. You can also install
+them into your local git repository as pre-commit hooks, and setting up a shell that has
+even more tooling by running `nix develop`. That will give you a bash in which you can run
+all the checks manually `pre-commit run -a`. This will also run the autoformatter.
+
+## Process for submitting changes
+
+1. If it is something bigger, please open an issue first describing what and why you want to do something.
+   If it is just something small, skip this step.
+2. Fork the repo and implement your changes in a branch on your fork. Afterwards open a pull request (possibly mentioning the issue).
+   Against the main branch.
+   - Your branch should be based on an up to date version of main, if it is not consider rebasing.
+3. You will need to find someone with the proper rights to approve of your changes, but most of the time there will be request
+   for changes first.

flake-module.nix

@@ -18,20 +18,32 @@
     pkgs,
     ...
   }: {
-    devShells.default = pkgs.mkShell {
-      shellHook = config.pre-commit.installationScript;
-    };
+    devShells.default = config.pre-commit.devShell;
 
-    pre-commit = {
+    pre-commit = let
+      generatedFiles = [
+        "hardware-configuration\\.nix"
+      ];
+    in {
       check.enable = true;
       pkgs = inputs'.nixpkgs.legacyPackages;
-      settings.hooks = {
+      settings = {
+        # for some reason statix takes it config differently than all the other hooks.
+        settings.statix = {
+          format = "stderr";
+          ignore = generatedFiles;
+        };
+        hooks = {
           nil.enable = true;
           statix.enable = true;
-        deadnix.enable = true;
+          deadnix = {
+            enable = true;
+            excludes = generatedFiles;
+          };
           alejandra.enable = true;
         };
       };
+    };
 
     # Per-system attributes can be defined here. The self' and inputs'
     # module parameters provide easy access to attributes of the same

flake.lock

@@ -33,24 +33,6 @@
         "type": "indirect"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "impermanence": {
       "locked": {
         "lastModified": 1697303681,
@@ -169,35 +151,12 @@
         "type": "github"
       }
     },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": [],
-        "flake-utils": "flake-utils",
-        "gitignore": [],
-        "nixpkgs": [],
-        "nixpkgs-stable": []
-      },
-      "locked": {
-        "lastModified": 1699271226,
-        "narHash": "sha256-8Jt1KW3xTjolD6c6OjJm9USx/jmL+VVmbooADCkdDfU=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "ea758da1a6dcde6dc36db348ed690d09b9864128",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
         "impermanence": "impermanence",
         "nixos-mailserver": "nixos-mailserver",
         "nixpkgs": "nixpkgs",
-        "pre-commit-hooks": "pre-commit-hooks",
         "sops-nix": "sops-nix"
       }
     },
@@ -222,21 +181,6 @@
         "type": "github"
       }
     },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "utils": {
       "locked": {
         "lastModified": 1605370193,

nixos/flake-module.nix

@@ -11,15 +11,15 @@
     nixosConfigurations = withSystem "x86_64-linux" ({pkgs, ...}: let
       machines = builtins.attrNames (builtins.readDir ./machines);
       makeSystem = name: let
-        importedModule = import (./. + "/machines/${name}/configuration.nix");
-        configModule =
-          if lib.isFunction importedModule
-          then importedModule inputs
-          else importedModule;
+        importedConfig = import (./. + "/machines/${name}/configuration.nix");
+        systemConfig =
+          if lib.isFunction importedConfig
+          then x: importedConfig (x // {flake-inputs = inputs;})
+          else importedConfig;
       in
         pkgs.nixos {
           imports = [
-            configModule
+            systemConfig
             inputs.sops-nix.nixosModules.sops
             inputs.impermanence.nixosModules.impermanence
           ];

nixos/modules/jitsi.nix

@@ -28,32 +28,33 @@ in {
   };
 
   config = mkIf cfg.enable {
-    services.jitsi-meet = {
+    services = {
+      jitsi-meet = {
         enable = true;
         config = {
           defaultLang = "de";
         };
         inherit (cfg) hostName;
       };
-    services.jitsi-videobridge = {
+      jitsi-videobridge = {
         openFirewall = true;
         nat = {
           publicAddress = "130.83.2.184";
           inherit (cfg) localAddress;
         };
       };
+      #We are behind a reverse proxy that handles TLS
+      nginx.virtualHosts."${cfg.hostName}" = {
+        enableACME = false;
+        forceSSL = false;
+      };
+    };
     environment.persistence.${config.impermanence.name} = {
       directories = [
         "/var/lib/jitsi-meet"
         "/var/lib/prosody"
       ];
     };
-    #We are behind a reverse proxy that handles TLS
-    services.nginx.virtualHosts."${cfg.hostName}" = {
-      enableACME = false;
-      forceSSL = false;
-    };
-
     #The network ports for HTTP(S) are not opened automatically
     networking.firewall.allowedTCPPorts = [80 443];
   };