Update hosts/bekkalokk/services/idp-simplesamlphp/default.nix

flake.lock

@@ -124,27 +124,6 @@
         "url": "https://git.pvv.ntnu.no/Grzegorz/grzegorz-clients.git"
       }
     },
-    "libdib": {
-      "inputs": {
-        "nixpkgs": [
-          "worblehat",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1769338528,
-        "narHash": "sha256-t18ZoSt9kaI1yde26ok5s7aFLkap1Q9+/2icVh2zuaE=",
-        "ref": "refs/heads/main",
-        "rev": "7218348163fd8d84df4a6f682c634793e67a3fed",
-        "revCount": 13,
-        "type": "git",
-        "url": "https://git.pvv.ntnu.no/Projects/libdib.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.pvv.ntnu.no/Projects/libdib.git"
-      }
-    },
     "matrix-next": {
       "inputs": {
         "nixpkgs": [
@@ -374,8 +353,7 @@
         "pvv-nettsiden": "pvv-nettsiden",
         "qotd": "qotd",
         "roowho2": "roowho2",
-        "sops-nix": "sops-nix",
-        "worblehat": "worblehat"
+        "sops-nix": "sops-nix"
       }
     },
     "roowho2": {
@@ -483,28 +461,6 @@
         "repo": "sops-nix",
         "type": "github"
       }
-    },
-    "worblehat": {
-      "inputs": {
-        "libdib": "libdib",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1770887951,
-        "narHash": "sha256-6LGqM9yhONtfCXHtPNn3S0GFsmB2dCchyozHDevwmiQ=",
-        "ref": "main",
-        "rev": "911063041f24d594a772a2a699d71d3d94953ce8",
-        "revCount": 101,
-        "type": "git",
-        "url": "https://git.pvv.ntnu.no/Projects/worblehat.git"
-      },
-      "original": {
-        "ref": "main",
-        "type": "git",
-        "url": "https://git.pvv.ntnu.no/Projects/worblehat.git"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -23,9 +23,6 @@
     dibbler.url = "git+https://git.pvv.ntnu.no/Projects/dibbler.git?ref=main";
     dibbler.inputs.nixpkgs.follows = "nixpkgs";
 
-    worblehat.url = "git+https://git.pvv.ntnu.no/Projects/worblehat.git?ref=main";
-    worblehat.inputs.nixpkgs.follows = "nixpkgs";
-
     matrix-next.url = "github:dali99/nixos-matrix-modules/v0.8.0";
     matrix-next.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -97,6 +94,7 @@
         }:
         let
           commonPkgsConfig = {
+            inherit localSystem crossSystem;
             config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg)
               [
                 "nvidia-x11"
@@ -106,11 +104,8 @@
               # Global overlays go here
               inputs.roowho2.overlays.default
             ]) ++ overlays;
-          } // (if localSystem != crossSystem then {
-            inherit localSystem crossSystem;
-          } else {
-            system = crossSystem;
-          });
+          };
+
           pkgs = import nixpkgs commonPkgsConfig;
           unstablePkgs = import nixpkgs-unstable commonPkgsConfig;
         in
@@ -176,6 +171,7 @@
           (final: prev: {
             mediawiki-extensions = final.callPackage ./packages/mediawiki-extensions { };
             simplesamlphp = final.callPackage ./packages/simplesamlphp { };
+            simplesamlphptheme = final.callPackage ./packages/simplesamlphptheme { };
             bluemap = final.callPackage ./packages/bluemap.nix { };
           })
           inputs.pvv-nettsiden.overlays.default
@@ -191,15 +187,10 @@
       #ildkule-unstable = unstableNixosConfig "ildkule" { };
       skrot = stableNixosConfig "skrot" {
         modules = [
-          self.nixosModules.drumknotty
           inputs.disko.nixosModules.disko
           inputs.dibbler.nixosModules.default
-          inputs.worblehat.nixosModules.default
-        ];
-        overlays = [
-          inputs.dibbler.overlays.default
-          inputs.worblehat.overlays.default
         ];
+        overlays = [inputs.dibbler.overlays.default];
       };
       shark = stableNixosConfig "shark" { };
       wenche = stableNixosConfig "wenche" { };
@@ -295,7 +286,6 @@
       rsync-pull-targets = ./modules/rsync-pull-targets.nix;
       snakeoil-certs = ./modules/snakeoil-certs.nix;
       snappymail = ./modules/snappymail.nix;
-      drumknotty = ./modules/drumknotty.nix;
     };
 
     devShells = forAllSystems (system: {

hosts/bekkalokk/services/idp-simplesamlphp/config.php

@@ -858,7 +858,11 @@ $config = [
     /*
      * Which theme directory should be used?
      */
-    'theme.use' => 'default',
+    'module.enable' => [
+	    'pvv' => TRUE,
+    ],
+
+    'theme.use' => 'ssp-theme:pvv',
 
     /*
      * Set this option to the text you would like to appear at the header of each page. Set to false if you don't want

hosts/bekkalokk/services/idp-simplesamlphp/default.nix

@@ -97,6 +97,7 @@ let
       '';
 
       "modules/authpwauth/src/Auth/Source/PwAuth.php" = ./authpwauth.php;
+      #"modules/ssp-theme" = pkgs.simplesamlphptheme;
     };
   };
 in

hosts/skrot/configuration.nix

@@ -28,22 +28,18 @@
 
   sops.secrets = {
     "dibbler/postgresql/password" = {
-      owner = "drumknotty";
-      group = "drumknotty";
-    };
-    "worblehat/postgresql/password" = {
-      owner = "drumknotty";
-      group = "drumknotty";
+      owner = "dibbler";
+      group = "dibbler";
     };
   };
 
-  services.drumknotty = {
+  services.dibbler = {
     enable = true;
     kioskMode = true;
     limitScreenWidth = 80;
     limitScreenHeight = 42;
 
-    dibblerSettings = {
+    settings = {
       general.quit_allowed = false;
       database = {
         type = "postgresql";
@@ -55,18 +51,6 @@
         };
       };
     };
-    worblehatSettings = {
-      general.quit_allowed = false;
-      database = {
-        type = "postgresql";
-        postgresql = {
-          username = "pvv_vv";
-          dbname = "pvv_vv";
-          host = "postgres.pvv.ntnu.no";
-          password_file = config.sops.secrets."worblehat/postgresql/password".path;
-        };
-      };
-    };
   };
 
   systemd.services."serial-getty@ttyUSB0" = lib.mkIf (!config.virtualisation.isVmVariant) {

modules/drumknotty.nix

@@ -1,317 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-let
-  cfg = config.services.drumknotty;
-
-  format = pkgs.formats.toml { };
-in
-{
-  options.services.drumknotty = {
-    enable = lib.mkEnableOption "DrumknoTTY";
-
-    dibblerPackage = lib.mkPackageOption pkgs "dibbler" { };
-    worblehatPackage = lib.mkPackageOption pkgs "worblehat" { };
-    screenPackage = lib.mkPackageOption pkgs "screen" { };
-
-    screenSessionName = lib.mkOption {
-      type = lib.types.str;
-      default = "drumknotty";
-      example = "myscreensessionname";
-      description = ''
-        Sets the screen session name.
-      '';
-    };
-
-    createLocalDatabase = lib.mkEnableOption "" // {
-      description = ''
-        Whether to set up a local postgres database automatically.
-
-        ::: {.note}
-        You must set up postgres manually before enabling this option.
-        :::
-      '';
-    };
-
-    kioskMode = lib.mkEnableOption "" // {
-      description = ''
-        Whether to let dibbler take over the entire machine.
-
-        This will restrict the machine to a single TTY and make the program unquittable.
-        You can still get access to PTYs via SSH and similar, if enabled.
-      '';
-    };
-
-    limitScreenHeight = lib.mkOption {
-      type = with lib.types; nullOr ints.unsigned;
-      default = null;
-      example = 42;
-      description = ''
-        If set, limits the height of the screen dibbler uses to the given number of lines.
-      '';
-    };
-
-    limitScreenWidth = lib.mkOption {
-      type = with lib.types; nullOr ints.unsigned;
-      default = null;
-      example = 80;
-      description = ''
-        If set, limits the width of the screen dibbler uses to the given number of columns.
-      '';
-    };
-
-    dibblerSettings = lib.mkOption {
-      description = "Configuration for dibbler";
-      default = { };
-      type = lib.types.submodule {
-        freeformType = format.type;
-      };
-    };
-
-    worblehatSettings = lib.mkOption {
-      description = "Configuration for worblehat";
-      default = { };
-      type = lib.types.submodule {
-        freeformType = format.type;
-      };
-    };
-
-    deadline-daemon = {
-      enable = lib.mkEnableOption "" // {
-        description = ''
-          Whether to enable the worblehat deadline-daemon service,
-          which periodically checks for upcoming deadlines and notifies users.
-
-          Note that this service is independent of the main worblehat service,
-          and must be enabled separately.
-        '';
-      };
-
-      onCalendar = lib.mkOption {
-        type = lib.types.str;
-        description = ''
-          How often to trigger rendering the map,
-          in the format of a systemd timer onCalendar configuration.
-
-          See {manpage}`systemd.timer(5)`.
-        '';
-        default = "*-*-* 10:15:00";
-      };
-    };
-  };
-
-  config = lib.mkIf cfg.enable (
-    lib.mkMerge [
-      {
-        environment.systemPackages = [
-          cfg.dibblerPackage
-          cfg.worblehatPackage
-        ];
-
-        environment.etc."dibbler/dibbler.toml".source = format.generate "dibbler.toml" cfg.dibblerSettings;
-        environment.etc."worblehat/config.toml".source =
-          format.generate "worblehat-config.toml" cfg.worblehatSettings;
-
-        users = {
-          users.drumknotty = {
-            group = "drumknotty";
-            isNormalUser = true;
-          };
-          groups.drumknotty = { };
-        };
-
-        services.dibbler.settings.database = lib.mkIf cfg.createLocalDatabase {
-          type = "postgresql";
-          postgresql.host = "/run/postgresql";
-        };
-
-        services.postgresql = lib.mkIf cfg.createLocalDatabase {
-          ensureDatabases = [
-            "dibbler"
-            "worblehat"
-          ];
-          ensureUsers = [
-            {
-              name = "drumknotty";
-              ensureDBOwnership = true;
-              ensureClauses.login = true;
-            }
-          ];
-        };
-
-        systemd.services.dibbler-setup-database = lib.mkIf cfg.createLocalDatabase {
-          description = "Dibbler database setup";
-          wantedBy = [ "default.target" ];
-          after = [ "postgresql.service" ];
-          unitConfig = {
-            ConditionPathExists = "!/var/lib/dibbler/.db-setup-done";
-          };
-          serviceConfig = {
-            Type = "oneshot";
-            ExecStart = "${lib.getExe cfg.dibblerPackage} --config /etc/dibbler/dibbler.toml create-db";
-            ExecStartPost = "${lib.getExe' pkgs.coreutils "touch"} /var/lib/dibbler/.db-setup-done";
-            StateDirectory = "dibbler";
-
-            User = "drumknotty";
-            Group = "drumknotty";
-          };
-        };
-
-        systemd.services.worblehat-setup-database = lib.mkIf cfg.createLocalDatabase {
-          description = "Worblehat database setup";
-          wantedBy = [ "default.target" ];
-          after = [ "postgresql.service" ];
-          unitConfig = {
-            ConditionPathExists = "!/var/lib/worblehat/.db-setup-done";
-          };
-          serviceConfig = {
-            Type = "oneshot";
-            ExecStart = "${lib.getExe cfg.worblehatPackage} --config /etc/worblehat/config.toml create-db";
-            ExecStartPost = "${lib.getExe' pkgs.coreutils "touch"} /var/lib/worblehat/.db-setup-done";
-            StateDirectory = "worblehat";
-
-            User = "drumknotty";
-            Group = "drumknotty";
-          };
-        };
-
-      }
-      (lib.mkIf cfg.kioskMode {
-        boot.kernelParams = [
-          "console=tty1"
-        ];
-
-        users.users.drumknotty = {
-          extraGroups = [ "lp" ];
-          shell =
-            (pkgs.writeShellScriptBin "login-shell" "${lib.getExe' cfg.screenPackage "screen"} -x ${cfg.screenSessionName}")
-            // {
-              shellPath = "/bin/login-shell";
-            };
-        };
-
-        services.drumknotty.dibblerSettings.general = {
-          quit_allowed = false;
-          stop_allowed = false;
-        };
-
-        services.drumknotty.worblehatSettings.general = {
-          quit_allowed = false;
-          stop_allowed = false;
-        };
-
-        systemd.services.drumknotty-screen-session = {
-          description = "Drumknotty Screen Session";
-          wantedBy = [
-            "default.target"
-          ];
-          after =
-            if cfg.createLocalDatabase then
-              [
-                "postgresql.service"
-                "dibbler-setup-database.service"
-                "worblehat-setup-database.service"
-              ]
-            else
-              [
-                "network.target"
-              ];
-          serviceConfig =
-            let
-              dibblerArgs = lib.cli.toCommandLineShellGNU { } {
-                config = "/etc/dibbler/dibbler.toml";
-              };
-
-              worblehatArgs = lib.cli.toCommandLineShellGNU { } {
-                config = "/etc/worblehat/config.toml";
-              };
-
-            in
-            {
-              Type = "forking";
-              RemainAfterExit = false;
-              Restart = "always";
-              RestartSec = "5s";
-              SuccessExitStatus = 1;
-
-              User = "drumknotty";
-              Group = "drumknotty";
-
-              ExecStartPre = "-${lib.getExe' cfg.screenPackage "screen"} -X -S ${cfg.screenSessionName} kill";
-              ExecStart =
-                let
-                  screenArgs = lib.escapeShellArgs [
-                    # -dm creates the screen in detached mode without accessing it
-                    "-dm"
-
-                    # Session name
-                    "-S"
-                    "drumknotty"
-
-                    # Window name
-                    "-t"
-                    "dibbler"
-
-                    # Set optimal output mode instead of VT100 emulation
-                    "-O"
-
-                    # Enable login mode, updates utmp entries
-                    "-l"
-                  ];
-
-                in
-                "${lib.getExe' cfg.screenPackage "screen"} ${screenArgs} ${lib.getExe cfg.dibblerPackage} ${dibblerArgs} loop";
-              ExecStartPost = [
-                "${lib.getExe' cfg.screenPackage "screen"} -X -S ${cfg.screenSessionName} -t worblehat ${lib.getExe cfg.worblehatPackage} ${worblehatArgs} cli"
-              ]
-              ++ lib.optionals (cfg.limitScreenWidth != null) [
-                "${lib.getExe' cfg.screenPackage "screen"} -X -S ${cfg.screenSessionName} width ${toString cfg.limitScreenWidth}"
-              ]
-              ++ lib.optionals (cfg.limitScreenHeight != null) [
-                "${lib.getExe' cfg.screenPackage "screen"} -X -S ${cfg.screenSessionName} height ${toString cfg.limitScreenHeight}"
-              ];
-            };
-        };
-
-        services.getty.autologinUser = "drumknotty";
-      })
-      (lib.mkIf cfg.deadline-daemon.enable {
-        systemd.timers.worblehat-deadline-daemon = {
-          description = "Worblehat Deadline Daemon";
-          wantedBy = [ "timers.target" ];
-          timerConfig = {
-            OnCalendar = cfg.deadline-daemon.onCalendar;
-            Persistent = true;
-          };
-        };
-
-        systemd.services.worblehat-deadline-daemon = {
-          description = "Worblehat Deadline Daemon";
-          wantedBy = [ "multi-user.target" ];
-          after = [ "network.target" ];
-          serviceConfig = {
-            Type = "oneshot";
-            CPUSchedulingPolicy = "idle";
-            IOSchedulingClass = "idle";
-
-            ExecStart =
-              let
-                worblehatArgs = lib.cli.toCommandLineShellGNU { } {
-                  config = "/etc/worblehat/config.toml";
-                };
-              in
-              "${lib.getExe cfg.package} ${worblehatArgs} deadline-daemon";
-
-            User = "worblehat";
-            Group = "worblehat";
-          };
-        };
-      })
-
-    ]
-  );
-
-}

packages/simplesamlphptheme/default.nix

@@ -0,0 +1,29 @@
+{ lib
+, php
+, stdenv
+, writeText
+, fetchFromGitea
+, extra_files ? { }
+
+}:
+
+
+stdenv.mkDerivation {
+  pname = "ssp-theme";
+  version = "v1.2026";
+  
+  src = fetchFromGitea {
+    owner = "drift";
+    repo = "ssp-theme";
+    rev = "master";
+    hash = "sha256-4d0TwJubfJrThctvE50HpPg0gqdJy595hewEcjfXlrs=";
+    domain = "git.pvv.ntnu.no";
+  };
+  
+   installPhase = ''
+    mkdir -p $out/bin
+    cp -r ./ $out/bin/
+    chmod -R +x $out/bin/
+  '';
+
+}

secrets/skrot/skrot.yaml

@@ -1,9 +1,6 @@
 dibbler:
     postgresql:
         password: ENC[AES256_GCM,data:3X9A3jOpFVRuBg0gRiCEsZVKfLI=,iv:XC7LBNUhALk9IEhItV8fO5p/m7VKL0REBY1W2IZt7G4=,tag:l18R7EhbOlucZHFQiEvpHw==,type:str]
-worblehat:
-    postgresql:
-        password: ENC[AES256_GCM,data:5xEiz+Op0dpxO/x75iEZs0VVqhbr+85BusXGt7xyQZk=,iv:MvnRPx+segcEzUzQsJXGXDaQlKpf5AN9pSfXP34Cz6k=,tag:AG8JUl3+8ZJz+gbLti78Vw==,type:str]
 sops:
     age:
         - recipient: age1hzkvnktkr8t5gvtq0ccw69e44z5z6wf00n3xhk3hj24emf07je5s6q2evr
@@ -69,8 +66,8 @@ sops:
             MmxPMWNPYzJiOFRqY2VYczhvRm5IR3cKpUVV+zsMolsHI2YK9YqC6ecNT6QXv0TV
             d1SpXRAexZBeWCCHBjSdvQBl8AT4EwrAIP2M2o++6i5DaGoGiEIWZQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-03-17T15:30:20Z"
-    mac: ENC[AES256_GCM,data:byJbaGBKiW8P6Z9EAaXFIAurNPZ1Yu3H4wISL3YESGPVy5GSbMlfSTLElw8BcQNgOuLq8+BVZcRZn+UaLx7vNKfmpbOmthmrMqilcW/vmgsQ5+of+r+O9bOqqXAmlBLvB82trkLUWsPfO4hHJBfjFweLZFqzszW3t/zeLMocM18=,iv:EqiPEg0xgRPsuJfjUKg/ba10m1rqopO4gtPwKABuNk4=,tag:5l4sJxsV69ha4hf+9iBmMw==,type:str]
+    lastmodified: "2026-02-10T20:02:28Z"
+    mac: ENC[AES256_GCM,data:i8CjVxoD7zdkLNJlI9DCo/tDV5DUI7JdpozLtYZzI7Cu51GayaE2Y3Wg4de6P0L7C3FER04WfRe/h+G9PLZICX/CfSipQysyrEq3Pjt9IKsjytDhP9VYJ36QFGF0PuHUQAMSLts/tAoAvLue6MP+V82l5js9ghvyBrzyBGxoyJw=,iv:QFNxvCYxrSkwy7iT+2BEacNPftDXju1cibprVPDjic0=,tag:496E+oCy/VwTylyaWhQD+A==,type:str]
     pgp:
         - created_at: "2026-02-10T20:01:32Z"
           enc: |-
@@ -93,4 +90,4 @@ sops:
             -----END PGP MESSAGE-----
           fp: F7D37890228A907440E1FD4846B9228E814A2AAC
     unencrypted_suffix: _unencrypted
-    version: 3.12.1
+    version: 3.11.0