mirror of
https://github.com/kmein/niveum
synced 2026-03-26 06:11:07 +01:00
Compare commits
3 Commits
grimm
...
f56e9aa37b
| Author | SHA1 | Date | |
|---|---|---|---|
| f56e9aa37b | |||
| 822b0df4b8 | |||
| c16123dc8d |
2
ci.nix
2
ci.nix
@@ -56,7 +56,7 @@
|
||||
"spotify/password"
|
||||
];
|
||||
systemSecrets = let
|
||||
basic = ["retiolum.ed25519" "retiolum.key" "syncthing/cert.pem" "syncthing/key.pem"];
|
||||
basic = ["retiolum.ed25519" "retiolum.key" "syncthing/cert.pem" "syncthing/key.pem" "ssh/passphrase"];
|
||||
in
|
||||
{
|
||||
zaatar = ensureFiles (["moodle.token" "telegram/moodle-dl.token" "mpd-web.key"] ++ basic);
|
||||
|
||||
@@ -155,7 +155,7 @@ in {
|
||||
names = ["Monospace" "Font Awesome 6 Free"];
|
||||
size = 8.0;
|
||||
};
|
||||
mode = "hide"; # "dock"
|
||||
mode = "dock"; # "hide";
|
||||
position = "bottom";
|
||||
colors = rec {
|
||||
background = colours.background;
|
||||
|
||||
@@ -16,7 +16,19 @@
|
||||
password = lib.fileContents <secrets/nextcloud-fysi/password>;
|
||||
};
|
||||
in {
|
||||
environment.systemPackages = [pkgs.khal pkgs.vdirsyncer pkgs.khard pkgs.todoman];
|
||||
environment.systemPackages = [
|
||||
pkgs.khal
|
||||
pkgs.vdirsyncer
|
||||
pkgs.khard
|
||||
pkgs.todoman
|
||||
(pkgs.writers.writeDashBin "todo-procrastinate" ''
|
||||
[ $# -eq 1 ] || {
|
||||
echo "Usage: $0 TODO_ID" >&2
|
||||
exit 1
|
||||
}
|
||||
${pkgs.todoman}/bin/todo edit "$1" --due "+ 1 day"
|
||||
'')
|
||||
];
|
||||
|
||||
systemd.user.services.vdirsyncer = {
|
||||
enable = true;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
inherit (import <niveum/lib>) sshPort kieran;
|
||||
externalNetwork = import <niveum/lib/external-network.nix>;
|
||||
sshIdentity = name: "${config.users.users.me.home}/.ssh/${name}";
|
||||
ssh-passphease = lib.strings.fileContents <system-secrets/ssh/passphrase>;
|
||||
ssh-passphrase = lib.strings.fileContents <system-secrets/ssh/passphrase>;
|
||||
in {
|
||||
services.xserver.displayManager.sessionCommands = toString (pkgs.writeScript "ssh-add" ''
|
||||
#!${pkgs.expect}/bin/expect -f
|
||||
|
||||
6
flake.lock
generated
6
flake.lock
generated
@@ -195,11 +195,11 @@
|
||||
"scripts": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1662493500,
|
||||
"narHash": "sha256-EdAEKDQ6z7oinqQ28ELE3+taJ106DgmhNJt/rpqHJic=",
|
||||
"lastModified": 1660677220,
|
||||
"narHash": "sha256-cCmyI4CigWbeQ0wEiE9HSI2Hmd3Wi5P7jhdHX6bJkXU=",
|
||||
"owner": "kmein",
|
||||
"repo": "scripts",
|
||||
"rev": "51c641ac3c1100d80313696663db70c2eb3698dc",
|
||||
"rev": "688e141047e831a7e5f58dd24e00de51a3cb2345",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -17,7 +17,6 @@ in {
|
||||
./monitoring
|
||||
./moodle-dl-borsfaye.nix
|
||||
./names.nix
|
||||
./grimm.nix
|
||||
./nextcloud.nix
|
||||
./radio-news.nix
|
||||
./radio.nix
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
{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