mirror of
https://github.com/kmein/niveum
synced 2026-03-21 20:31:07 +01:00
Compare commits
13 Commits
mympd
...
2b7db496b0
| Author | SHA1 | Date | |
|---|---|---|---|
| 2b7db496b0 | |||
| 0feebd18cd | |||
| 892c758303 | |||
| 8cc3541d2d | |||
| 687aa456d1 | |||
|
|
fd60863f77 | ||
| a60cbab742 | |||
| 54383cb1ab | |||
| 9b414d104a | |||
| 67b7d63d9a | |||
| f3116bfc12 | |||
| f31baf9e56 | |||
| 906cc1981e |
@@ -49,6 +49,11 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
systemd.user.services.nextcloud-client = {
|
||||||
|
wants = ["gnome-keyring.service"];
|
||||||
|
after = ["gnome-keyring.service"];
|
||||||
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(pkgs.writers.writeDashBin "book" ''
|
(pkgs.writers.writeDashBin "book" ''
|
||||||
set -efu
|
set -efu
|
||||||
|
|||||||
@@ -5,9 +5,12 @@
|
|||||||
}: let
|
}: let
|
||||||
commaSep = builtins.concatStringsSep ",";
|
commaSep = builtins.concatStringsSep ",";
|
||||||
in {
|
in {
|
||||||
|
# man 7 xkeyboard-config
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
layout = commaSep ["de" "gr"];
|
layout = commaSep ["de" "gr" "ru" "ara"];
|
||||||
xkbVariant = commaSep ["T3" "polytonic"];
|
# T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
|
||||||
|
# buckwalter: http://www.qamus.org/transliteration.htm
|
||||||
|
xkbVariant = commaSep ["T3" "polytonic" "phonetic" "buckwalter"];
|
||||||
xkbOptions =
|
xkbOptions =
|
||||||
commaSep ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
|
commaSep ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
|
||||||
libinput.enable = true;
|
libinput.enable = true;
|
||||||
@@ -17,4 +20,15 @@ in {
|
|||||||
|
|
||||||
# improve held key rate
|
# improve held key rate
|
||||||
services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
|
services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
|
||||||
|
|
||||||
|
systemd.user.services.gxkb = {
|
||||||
|
wantedBy = ["graphical-session.target"];
|
||||||
|
serviceConfig = {
|
||||||
|
SyslogIdentifier = "gxkb";
|
||||||
|
ExecStart = "${pkgs.gxkb}/bin/gxkb";
|
||||||
|
Restart = "always";
|
||||||
|
RestartSec = "15s";
|
||||||
|
StartLimitBurst = 0;
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
38
flake.lock
generated
38
flake.lock
generated
@@ -2,11 +2,11 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1648297722,
|
"lastModified": 1649676176,
|
||||||
"narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
|
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
|
"rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -22,11 +22,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1648834319,
|
"lastModified": 1649887911,
|
||||||
"narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=",
|
"narHash": "sha256-Af0Ppb1RZ7HWuxUvF0/O7h3cy8tqU2eKFyVwyA1ZD+w=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0",
|
"rev": "7244c6715cb8f741f3b3e1220a9279e97b2ed8f5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -109,11 +109,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1649490789,
|
"lastModified": 1650647313,
|
||||||
"narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
|
"narHash": "sha256-6ghnNPXDlG6/tXeIFdbP0cGnik6TGNwc615hhG9dpl4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",
|
"rev": "a318a09a96a38382fe61a7f85d03ea6e25c46c56",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -125,11 +125,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1649541735,
|
"lastModified": 1650760898,
|
||||||
"narHash": "sha256-JdOywA2jcdGCxNgu0dJA7ZNtaV7sS0HwuZg9YaXd94c=",
|
"narHash": "sha256-r1rzTgwi1FKx5t3KKi7Xt4hyGdOnTD0RSTpbNls09KU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c2b6e029cd1efa0efd37daab89264ef040ae5669",
|
"rev": "0f1f92d85be76e0bd79ebb2285be8f43683eb845",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -194,11 +194,11 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1648400983,
|
"lastModified": 1650402678,
|
||||||
"narHash": "sha256-I9ADWgUN1orbnXPBW4kulHpv8wkx6C8zsQcg9wphpPg=",
|
"narHash": "sha256-LkaKJvF09wVHpN5FuJtX0M4vOA/DrO9xUMFI8fMtNeA=",
|
||||||
"owner": "kmein",
|
"owner": "kmein",
|
||||||
"repo": "scripts",
|
"repo": "scripts",
|
||||||
"rev": "f5df67a2416d8f05a7dbfea269c44668854c7887",
|
"rev": "adfd4238f7a8f0f894547998cbb04327bad97884",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -210,11 +210,11 @@
|
|||||||
"stockholm": {
|
"stockholm": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1649089964,
|
"lastModified": 1650040948,
|
||||||
"narHash": "sha256-ybuVI8rnpMyBUoyoIXJ1e3QBMBIOoEgKTiFzIPfzy8A=",
|
"narHash": "sha256-/4Q2vnl53BQVYQFSZqF512CF6tzIyPHaDy4Yheof8G4=",
|
||||||
"ref": "master",
|
"ref": "master",
|
||||||
"rev": "b3833baee96d7bce2c54295110b40c646468a1ff",
|
"rev": "92d5eacd6d9e530c4d1ea0dec2652417b0fde78a",
|
||||||
"revCount": 10500,
|
"revCount": 10516,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://cgit.lassul.us/stockholm"
|
"url": "https://cgit.lassul.us/stockholm"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -220,7 +220,7 @@ in {
|
|||||||
"tarot.kmein.de"
|
"tarot.kmein.de"
|
||||||
"cloud.xn--kiern-0qa.de"
|
"cloud.xn--kiern-0qa.de"
|
||||||
"grafana.kmein.r"
|
"grafana.kmein.r"
|
||||||
"names.kmein.r"
|
# "names.kmein.r"
|
||||||
"rrm.r"
|
"rrm.r"
|
||||||
"graph.r"
|
"graph.r"
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
port = 5703;
|
port = 5703;
|
||||||
geogen-src = "${<scripts>}/onomastics";
|
onomap-src = "${<scripts>}/onomastics-ng";
|
||||||
geogen = pkgs.callPackage geogen-src {};
|
onomap = pkgs.haskellPackages.callCabal2nix "onomap" onomap-src {};
|
||||||
in {
|
in {
|
||||||
systemd.services.names = {
|
systemd.services.names = {
|
||||||
wants = ["network-online.target"];
|
wants = ["network-online.target"];
|
||||||
@@ -13,12 +13,9 @@ in {
|
|||||||
description = "Better clone of geogen.stoepel.net";
|
description = "Better clone of geogen.stoepel.net";
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
DynamicUser = true;
|
DynamicUser = true;
|
||||||
|
ExecStart = "${onomap}/bin/onomap-web";
|
||||||
};
|
};
|
||||||
script = ''
|
environment.PORT = toString port;
|
||||||
cd $(mktemp -d)
|
|
||||||
ln -s "${geogen-src}/wsgi.py" wsgi.py
|
|
||||||
${geogen.dependencyEnv}/bin/gunicorn wsgi:app -b :${toString port}
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
|
|||||||
@@ -69,6 +69,15 @@ in {
|
|||||||
108283 # Digital Classicist
|
108283 # Digital Classicist
|
||||||
109211 # Altlitauisch
|
109211 # Altlitauisch
|
||||||
109185 # Etymologie
|
109185 # Etymologie
|
||||||
|
|
||||||
|
# SS 2022
|
||||||
|
112606 # Avestisch
|
||||||
|
111761 # Griechische Wissenschaftsliteratur
|
||||||
|
111515 # H. Furens
|
||||||
|
110914 # Apostelgeschichte
|
||||||
|
112225 # Gr. Paläographie
|
||||||
|
113275 # ALEW
|
||||||
|
112783 # Akzent und Silbenstruktur
|
||||||
];
|
];
|
||||||
download_submissions = true;
|
download_submissions = true;
|
||||||
download_descriptions = true;
|
download_descriptions = true;
|
||||||
|
|||||||
@@ -74,8 +74,8 @@ in {
|
|||||||
|
|
||||||
systemd.tmpfiles.rules = let
|
systemd.tmpfiles.rules = let
|
||||||
tags = lib.lists.unique (lib.concatMap ({tags ? [], ...}: tags) streams);
|
tags = lib.lists.unique (lib.concatMap ({tags ? [], ...}: tags) streams);
|
||||||
tagStreams = tag: map (lib.getAttr "stream") (lib.filter ({tags ? [], ...}: lib.elem tag tags) streams);
|
tagStreams = tag: lib.filter ({tags ? [], ...}: lib.elem tag tags) streams;
|
||||||
makePlaylist = name: urls: pkgs.writeText "${name}.m3u" (lib.concatStringsSep "\n" urls);
|
makePlaylist = name: streams: pkgs.writeText "${name}.m3u" (lib.concatMapStringsSep "\n" (lib.getAttr "stream") streams);
|
||||||
in
|
in
|
||||||
map (tag:
|
map (tag:
|
||||||
tmpfilesConfig {
|
tmpfilesConfig {
|
||||||
@@ -87,7 +87,7 @@ in {
|
|||||||
argument = makePlaylist tag (tagStreams tag);
|
argument = makePlaylist tag (tagStreams tag);
|
||||||
})
|
})
|
||||||
tags
|
tags
|
||||||
+ [
|
++ [
|
||||||
(tmpfilesConfig {
|
(tmpfilesConfig {
|
||||||
type = "L+";
|
type = "L+";
|
||||||
mode = "0644";
|
mode = "0644";
|
||||||
|
|||||||
Reference in New Issue
Block a user