mirror of
https://github.com/kmein/niveum
synced 2026-03-16 10:11:08 +01:00
Compare commits
2 Commits
84f1a2688f
...
grimm
| Author | SHA1 | Date | |
|---|---|---|---|
| d751ecdab7 | |||
| 2280b21a75 |
@@ -7,8 +7,16 @@
|
|||||||
inherit (import <niveum/lib>) sshPort kieran;
|
inherit (import <niveum/lib>) sshPort kieran;
|
||||||
externalNetwork = import <niveum/lib/external-network.nix>;
|
externalNetwork = import <niveum/lib/external-network.nix>;
|
||||||
sshIdentity = name: "${config.users.users.me.home}/.ssh/${name}";
|
sshIdentity = name: "${config.users.users.me.home}/.ssh/${name}";
|
||||||
|
ssh-passphease = lib.strings.fileContents <system-secrets/ssh/passphrase>;
|
||||||
in {
|
in {
|
||||||
services.xserver.displayManager.sessionCommands = "${pkgs.openssh}/bin/ssh-add";
|
services.xserver.displayManager.sessionCommands = toString (pkgs.writeScript "ssh-add" ''
|
||||||
|
#!${pkgs.expect}/bin/expect -f
|
||||||
|
spawn ${pkgs.openssh}/bin/ssh-add
|
||||||
|
expect "Enter passphrase for *:"
|
||||||
|
send "${ssh-passphrase}\n";
|
||||||
|
expect "Identity added: *"
|
||||||
|
interact
|
||||||
|
'');
|
||||||
|
|
||||||
programs.ssh.startAgent = true;
|
programs.ssh.startAgent = true;
|
||||||
|
|
||||||
|
|||||||
6
flake.lock
generated
6
flake.lock
generated
@@ -195,11 +195,11 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1660677220,
|
"lastModified": 1662493500,
|
||||||
"narHash": "sha256-cCmyI4CigWbeQ0wEiE9HSI2Hmd3Wi5P7jhdHX6bJkXU=",
|
"narHash": "sha256-EdAEKDQ6z7oinqQ28ELE3+taJ106DgmhNJt/rpqHJic=",
|
||||||
"owner": "kmein",
|
"owner": "kmein",
|
||||||
"repo": "scripts",
|
"repo": "scripts",
|
||||||
"rev": "688e141047e831a7e5f58dd24e00de51a3cb2345",
|
"rev": "51c641ac3c1100d80313696663db70c2eb3698dc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ in {
|
|||||||
./monitoring
|
./monitoring
|
||||||
./moodle-dl-borsfaye.nix
|
./moodle-dl-borsfaye.nix
|
||||||
./names.nix
|
./names.nix
|
||||||
|
./grimm.nix
|
||||||
./nextcloud.nix
|
./nextcloud.nix
|
||||||
./radio-news.nix
|
./radio-news.nix
|
||||||
./radio.nix
|
./radio.nix
|
||||||
|
|||||||
30
systems/makanek/grimm.nix
Normal file
30
systems/makanek/grimm.nix
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
{pkgs, ...}: let
|
||||||
|
port = 9610;
|
||||||
|
web-socket-sink-src = "${<scripts>}/grimm-scroller";
|
||||||
|
web-socket-sink = pkgs.callPackage web-socket-sink-src {};
|
||||||
|
lemmata = "${web-socket-sink-src}/dwb-compact.json";
|
||||||
|
in {
|
||||||
|
systemd.services.grimm-ws = {
|
||||||
|
wantedBy = ["multi-user.target"];
|
||||||
|
script = "${web-socket-sink}/bin/web-socket-sink --host 0.0.0.0 --port ${toString port} < ${lemmata}";
|
||||||
|
serviceConfig = {
|
||||||
|
Restart = "always";
|
||||||
|
DynamicUser = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
services.nginx.virtualHosts."grimm.kmein.de" = {
|
||||||
|
enableACME = false;
|
||||||
|
forceSSL = false;
|
||||||
|
locations = {
|
||||||
|
"/".root = pkgs.linkFarm "grimm" [
|
||||||
|
{
|
||||||
|
name = "index.html";
|
||||||
|
path = "${web-socket-sink-src}/wclient.html";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
networking.firewall.allowedTCPPorts = [port];
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user