Merge branch 'master' of github.com:dump-dvb/traffic-stop-box

.github/workflows/deadnix.yml

@@ -0,0 +1,13 @@
+name: "deadnix"
+
+on: [ push, pull_request ]
+
+jobs:
+  deadnix:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v17
+      - uses: astro/deadnix-action@main
+        with:
+          flags: "-l"

flake.nix

@@ -68,7 +68,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, naersk, microvm, radio-conf, data-accumulator, decode-server, dvb-api, funnel, stops, windshield, docs, wartrammer, clicky-bunty-server, sops-nix, ... }@inputs:
+  outputs = { self, nixpkgs, microvm, radio-conf, data-accumulator, decode-server, dvb-api, funnel, stops, windshield, docs, wartrammer, clicky-bunty-server, sops-nix, ... }@inputs:
     let
       pkgs = nixpkgs.legacyPackages."x86_64-linux";
       lib = pkgs.lib;

hardware/configuration-dell-wyse-3040.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, inputs, ... }:
+{ ... }:
 
 {
   # The global useDHCP flag is deprecated, therefore explicitly set to false here.

hardware/configuration-rpi-4b.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [

hosts/data-hoarder/configuration.nix

@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, inputs, ... }:
+{ pkgs, ... }:
 
 {
   # Use the GRUB 2 boot loader.

hosts/data-hoarder/hardware-configuration.nix

@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports =

hosts/mobile-box/configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, inputs, ... }:
+{ ... }:
 
 {
   boot.tmpOnTmpfs = true;

hosts/mobile-box/hardware-configuration.nix

@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports =

hosts/staging/configuration.nix

@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, inputs, ... }:
+{ config, pkgs, ... }:
 
 {
   microvm = {

hosts/traffic-stop-boxes/configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, inputs, ... }:
+{ config, ... }:
 
 {
   boot.tmpOnTmpfs = true;

hosts/traffic-stop-boxes/hardware-configuration.nix

@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports =

hosts/user-stop-box-rpi4/configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, inputs, ... }:
+{ ... }:
 
 {
   boot.tmpOnTmpfs = true;

hosts/user-stop-box-rpi4/hardware-configuration.nix

@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ modulesPath, ... }:
 
 {
   imports =

hosts/user-stop-box/configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, inputs, ... }:
+{ ... }:
 
 {
   boot.tmpOnTmpfs = true;

hosts/user-stop-box/hardware-configuration.nix

@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ modulesPath, ... }:
 
 {
   imports =

modules/base.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 
 {
   nix = {

modules/data-hoarder/api.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }: {
+{ pkgs, config, ... }: {
   systemd = {
     services = {
       "dvb-api" = {

modules/data-hoarder/clicky-bunty.nix

@@ -2,7 +2,7 @@
   This file contains the configuration for the gnuradio sdr decoding pipeline
 */
 
-{ pkgs, config, lib, ... }:
+{ pkgs, config, ... }:
 let
   port = 8070;
 in

modules/data-hoarder/documentation.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }: {
+{ pkgs, config, ... }: {
   services = {
     nginx = {
       enable = true;

modules/data-hoarder/file_sharing.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }: {
+{ pkgs, config, ... }: {
   services = {
     nginx = {
       enable = true;

modules/data-hoarder/grafana.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }: {
+{ config, lib, ... }: {
 
   services = {
     # metrics collector

modules/data-hoarder/map.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }: {
+{ pkgs, config, ... }: {
   services = {
     nginx = {
       enable = true;

modules/data-hoarder/nginx.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }: {
+{ ... }: {
   security.acme.acceptTerms = true;
   security.acme.defaults.email = "dump-dvb@protonmail.com";
   services.nginx = {

modules/data-hoarder/postgres.nix

@@ -1,60 +1,60 @@
-{ pkgs, config, lib, ... }: {
-
-  services.postgresql = {
-    enable = true;
-    port = 5432;
-    package = pkgs.postgresql_14;
-    ensureUsers = [
-      {
-        name = "dvbdump";
-        ensurePermissions = {
-          "DATABASE dvbdump" = "ALL PRIVILEGES";
-        };
-      }
-      {
-        name = "telegrams";
-        ensurePermissions = {
-          "DATABASE telegrams" = "ALL PRIVILEGES";
-        };
-      }
-
-    ];
-    ensureDatabases = [
-      "dvbdump"
-      "telegrams"
-    ];
-  };
-  systemd.services."pg-dvbdump-setup" = {
-    description = "prepare dvbdump postgres database";
-    wantedBy = [ "multi-user.target" ];
-    after = [ "networking.target" "postgresql.service" ];
-    serviceConfig.Type = "oneshot";
-
-    path = [ pkgs.sudo config.services.postgresql.package ];
-    script = ''
-      sudo -u ${config.services.postgresql.superUser} psql -c "ALTER ROLE dvbdump WITH PASSWORD '$(cat ${config.sops.secrets.postgres_password_dvbdump.path})'"
-      sudo -u ${config.services.postgresql.superUser} psql -c "ALTER ROLE telegrams WITH PASSWORD '$(cat ${config.sops.secrets.postgres_password_telegrams.path})'"
-
-      sudo -u ${config.services.postgresql.superUser} psql --dbname telegrams -c "create table r09_telegrams (
-          id serial8 primary key not null,
-          time timestamp not null,
-          station UUID not null,
-          region int8 not null,
-          type int8 not null,
-          delay int,
-          reporting_point int not null,
-          junction int not null,
-          direction int2 not null,
-          request_status int2 not null,
-          priority int2,
-          direction_request int2,
-          line int,
-          run_number int,
-          destination_number int,
-          train_length int2,
-          vehicle_number int,
-          operator int2
-        );"
-    '';
-  };
-}
+{ pkgs, config, ... }: {
+
+  services.postgresql = {
+    enable = true;
+    port = 5432;
+    package = pkgs.postgresql_14;
+    ensureUsers = [
+      {
+        name = "dvbdump";
+        ensurePermissions = {
+          "DATABASE dvbdump" = "ALL PRIVILEGES";
+        };
+      }
+      {
+        name = "telegrams";
+        ensurePermissions = {
+          "DATABASE telegrams" = "ALL PRIVILEGES";
+        };
+      }
+
+    ];
+    ensureDatabases = [
+      "dvbdump"
+      "telegrams"
+    ];
+  };
+  systemd.services."pg-dvbdump-setup" = {
+    description = "prepare dvbdump postgres database";
+    wantedBy = [ "multi-user.target" ];
+    after = [ "networking.target" "postgresql.service" ];
+    serviceConfig.Type = "oneshot";
+
+    path = [ pkgs.sudo config.services.postgresql.package ];
+    script = ''
+      sudo -u ${config.services.postgresql.superUser} psql -c "ALTER ROLE dvbdump WITH PASSWORD '$(cat ${config.sops.secrets.postgres_password_dvbdump.path})'"
+      sudo -u ${config.services.postgresql.superUser} psql -c "ALTER ROLE telegrams WITH PASSWORD '$(cat ${config.sops.secrets.postgres_password_telegrams.path})'"
+
+      sudo -u ${config.services.postgresql.superUser} psql --dbname telegrams -c "create table r09_telegrams (
+          id serial8 primary key not null,
+          time timestamp not null,
+          station UUID not null,
+          region int8 not null,
+          type int8 not null,
+          delay int,
+          reporting_point int not null,
+          junction int not null,
+          direction int2 not null,
+          request_status int2 not null,
+          priority int2,
+          direction_request int2,
+          line int,
+          run_number int,
+          destination_number int,
+          train_length int2,
+          vehicle_number int,
+          operator int2
+        );"
+    '';
+  };
+}

modules/data-hoarder/secrets.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 {
   sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
 

modules/data-hoarder/socket.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }: {
+{ pkgs, config, ... }: {
   systemd = {
     services = {
       "funnel" = {

modules/data-hoarder/website.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }: {
+{ config, ... }: {
   services.nginx = {
     enable = true;
     virtualHosts = {

modules/dump-dvb/general-options.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 with lib; {
   options.dump-dvb.systemNumber = mkOption {
     type = types.int;

modules/dump-dvb/ssh.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ ... }:
 
 {
   binaryCaches = [

modules/traffic-stop-boxes/mobile-box.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }:
+{ pkgs, ... }:
 let
   file = ../../configs/mobile_box.json;
 in

modules/traffic-stop-boxes/secrets.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 {
   sops.defaultSopsFile = ../../secrets/traffic-stop-box-${toString config.dump-dvb.systemNumber}/secrets.yaml;
   sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];

modules/user-stop-box/user.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ ... }:
 {
   users.mutableUsers = true;