feat(keyboard): add docs

feat(keyboard): add gxkb
feat(keyboard): add arabic and russian
2026-03-21 04:11:07 +01:00 · 2022-04-25 11:58:54 +02:00 · 2022-04-25 11:58:37 +02:00 · 2022-04-25 11:58:36 +02:00 · 2022-04-24 17:24:58 +02:00 · 2022-04-24 13:58:19 +02:00
7 changed files with 57 additions and 32 deletions
--- a/configs/cloud.nix
+++ b/configs/cloud.nix
@@ -49,6 +49,11 @@ in {
    };
  };

+  systemd.user.services.nextcloud-client = {
+    wants = ["gnome-keyring.service"];
+    after = ["gnome-keyring.service"];
+  };
+
  environment.systemPackages = [
    (pkgs.writers.writeDashBin "book" ''
      set -efu
--- a/configs/keyboard.nix
+++ b/configs/keyboard.nix
@@ -5,9 +5,12 @@
 }: let
  commaSep = builtins.concatStringsSep ",";
 in {
+  # man 7 xkeyboard-config
  services.xserver = {
-    layout = commaSep ["de" "gr"];
-    xkbVariant = commaSep ["T3" "polytonic"];
+    layout = commaSep ["de" "gr" "ru" "ara"];
+    # 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 =
      commaSep ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
    libinput.enable = true;
@@ -17,4 +20,15 @@ in {

  # improve held key rate
  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;
+    };
+  };
 }
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
  "nodes": {
    "flake-utils": {
      "locked": {
-        "lastModified": 1648297722,
-        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
+        "lastModified": 1649676176,
+        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
+        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
        "type": "github"
      },
      "original": {
@@ -22,11 +22,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1648834319,
-        "narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=",
+        "lastModified": 1649887911,
+        "narHash": "sha256-Af0Ppb1RZ7HWuxUvF0/O7h3cy8tqU2eKFyVwyA1ZD+w=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0",
+        "rev": "7244c6715cb8f741f3b3e1220a9279e97b2ed8f5",
        "type": "github"
      },
      "original": {
@@ -109,11 +109,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1649490789,
-        "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
+        "lastModified": 1650647313,
+        "narHash": "sha256-6ghnNPXDlG6/tXeIFdbP0cGnik6TGNwc615hhG9dpl4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",
+        "rev": "a318a09a96a38382fe61a7f85d03ea6e25c46c56",
        "type": "github"
      },
      "original": {
@@ -125,11 +125,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1649541735,
-        "narHash": "sha256-JdOywA2jcdGCxNgu0dJA7ZNtaV7sS0HwuZg9YaXd94c=",
+        "lastModified": 1650760898,
+        "narHash": "sha256-r1rzTgwi1FKx5t3KKi7Xt4hyGdOnTD0RSTpbNls09KU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c2b6e029cd1efa0efd37daab89264ef040ae5669",
+        "rev": "0f1f92d85be76e0bd79ebb2285be8f43683eb845",
        "type": "github"
      },
      "original": {
@@ -194,11 +194,11 @@
    "scripts": {
      "flake": false,
      "locked": {
-        "lastModified": 1648400983,
-        "narHash": "sha256-I9ADWgUN1orbnXPBW4kulHpv8wkx6C8zsQcg9wphpPg=",
+        "lastModified": 1650402678,
+        "narHash": "sha256-LkaKJvF09wVHpN5FuJtX0M4vOA/DrO9xUMFI8fMtNeA=",
        "owner": "kmein",
        "repo": "scripts",
-        "rev": "f5df67a2416d8f05a7dbfea269c44668854c7887",
+        "rev": "adfd4238f7a8f0f894547998cbb04327bad97884",
        "type": "github"
      },
      "original": {
@@ -210,11 +210,11 @@
    "stockholm": {
      "flake": false,
      "locked": {
-        "lastModified": 1649089964,
-        "narHash": "sha256-ybuVI8rnpMyBUoyoIXJ1e3QBMBIOoEgKTiFzIPfzy8A=",
+        "lastModified": 1650040948,
+        "narHash": "sha256-/4Q2vnl53BQVYQFSZqF512CF6tzIyPHaDy4Yheof8G4=",
        "ref": "master",
-        "rev": "b3833baee96d7bce2c54295110b40c646468a1ff",
-        "revCount": 10500,
+        "rev": "92d5eacd6d9e530c4d1ea0dec2652417b0fde78a",
+        "revCount": 10516,
        "type": "git",
        "url": "https://cgit.lassul.us/stockholm"
      },
--- a/systems/makanek/monitoring/default.nix
+++ b/systems/makanek/monitoring/default.nix
@@ -220,7 +220,7 @@ in {
            "tarot.kmein.de"
            "cloud.xn--kiern-0qa.de"
            "grafana.kmein.r"
-            "names.kmein.r"
+            # "names.kmein.r"
            "rrm.r"
            "graph.r"
          ];
--- a/systems/makanek/names.nix
+++ b/systems/makanek/names.nix
@@ -4,8 +4,8 @@
  ...
 }: let
  port = 5703;
-  geogen-src = "${<scripts>}/onomastics";
-  geogen = pkgs.callPackage geogen-src {};
+  onomap-src = "${<scripts>}/onomastics-ng";
+  onomap = pkgs.haskellPackages.callCabal2nix "onomap" onomap-src {};
 in {
  systemd.services.names = {
    wants = ["network-online.target"];
@@ -13,12 +13,9 @@ in {
    description = "Better clone of geogen.stoepel.net";
    serviceConfig = {
      DynamicUser = true;
+      ExecStart = "${onomap}/bin/onomap-web";
    };
-    script = ''
-      cd $(mktemp -d)
-      ln -s "${geogen-src}/wsgi.py" wsgi.py
-      ${geogen.dependencyEnv}/bin/gunicorn wsgi:app -b :${toString port}
-    '';
+    environment.PORT = toString port;
  };

  services.nginx = {
--- a/systems/zaatar/moodle-dl-meinhark.nix
+++ b/systems/zaatar/moodle-dl-meinhark.nix
@@ -69,6 +69,15 @@ in {
        108283 # Digital Classicist
        109211 # Altlitauisch
        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_descriptions = true;
--- a/systems/zaatar/tuna.nix
+++ b/systems/zaatar/tuna.nix
@@ -74,8 +74,8 @@ in {

  systemd.tmpfiles.rules = let
    tags = lib.lists.unique (lib.concatMap ({tags ? [], ...}: tags) streams);
-    tagStreams = tag: map (lib.getAttr "stream") (lib.filter ({tags ? [], ...}: lib.elem tag tags) streams);
-    makePlaylist = name: urls: pkgs.writeText "${name}.m3u" (lib.concatStringsSep "\n" urls);
+    tagStreams = tag: lib.filter ({tags ? [], ...}: lib.elem tag tags) streams;
+    makePlaylist = name: streams: pkgs.writeText "${name}.m3u" (lib.concatMapStringsSep "\n" (lib.getAttr "stream") streams);
  in
    map (tag:
      tmpfilesConfig {
@@ -87,7 +87,7 @@ in {
        argument = makePlaylist tag (tagStreams tag);
      })
    tags
-    + [
+    ++ [
      (tmpfilesConfig {
        type = "L+";
        mode = "0644";
Author	SHA1	Message	Date
Kierán Meinhardt	2b7db496b0	feat(keyboard): add docs	2022-04-25 11:58:54 +02:00
Kierán Meinhardt	0feebd18cd	feat(keyboard): add gxkb	2022-04-25 11:58:37 +02:00
Kierán Meinhardt	892c758303	feat(keyboard): add arabic and russian	2022-04-25 11:58:36 +02:00
Kierán Meinhardt	8cc3541d2d	fix: do not monitor http://names.kmein.r/	2022-04-24 17:24:58 +02:00
Kierán Meinhardt	687aa456d1	Merge remote-tracking branch 'origin/update_flake_lock_action'	2022-04-24 13:58:19 +02:00
github-actions[bot]	fd60863f77	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/2f06b87f64bc06229e05045853e0876666e1b023' (2022-04-14) → 'github:NixOS/nixpkgs/a318a09a96a38382fe61a7f85d03ea6e25c46c56' (2022-04-22) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/6140c314d5850406dddc78e55dcc8716ea111ee4' (2022-04-17) → 'github:NixOS/nixpkgs/0f1f92d85be76e0bd79ebb2285be8f43683eb845' (2022-04-24)	2022-04-24 00:45:55 +00:00
Kierán Meinhardt	a60cbab742	feat(moodle-dl): more courses	2022-04-22 12:31:37 +02:00
Kierán Meinhardt	54383cb1ab	feat(moodle-dl): first load of courses	2022-04-19 23:29:41 +02:00
Kierán Meinhardt	9b414d104a	fix(makanek): names	2022-04-19 23:28:00 +02:00
Kierán Meinhardt	67b7d63d9a	Merge branch 'update_flake_lock_action'	2022-04-19 23:17:50 +02:00
Kierán Meinhardt	f3116bfc12	fix(nextcloud): start after gnome keyring	2022-04-17 10:48:32 +02:00
Kierán Meinhardt	f31baf9e56	chore(update) • Updated input 'flake-utils': 'github:numtide/flake-utils/0f8662f1319ad6abf89b3380dd2722369fc51ade' (2022-03-26) → 'github:numtide/flake-utils/a4b154ebbdc88c8498a5c7b01589addc9e9cb678' (2022-04-11) • Updated input 'home-manager': 'github:nix-community/home-manager/0bdbdea2e26c984b096f4f7d10e3c88536a980b0' (2022-04-01) → 'github:nix-community/home-manager/7244c6715cb8f741f3b3e1220a9279e97b2ed8f5' (2022-04-13) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/c86185d20d708013caf97a6adaa8dc6d72313c75' (2022-04-09) → 'github:NixOS/nixpkgs/2f06b87f64bc06229e05045853e0876666e1b023' (2022-04-14) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/c2b6e029cd1efa0efd37daab89264ef040ae5669' (2022-04-09) → 'github:NixOS/nixpkgs/6140c314d5850406dddc78e55dcc8716ea111ee4' (2022-04-17) • Updated input 'stockholm': 'git+https://cgit.lassul.us/stockholm?ref=master&rev=b3833baee96d7bce2c54295110b40c646468a1ff' (2022-04-04) → 'git+https://cgit.lassul.us/stockholm?ref=master&rev=92d5eacd6d9e530c4d1ea0dec2652417b0fde78a' (2022-04-15)	2022-04-17 07:02:08 +02:00
Kierán Meinhardt	906cc1981e	fix(tuna): nix types	2022-04-15 01:17:38 +02:00