keyboards: add urdu keyboard

deno: use newest version
alertmanager: more alerts?
2026-03-19 19:41:08 +01:00 · 2024-10-27 15:45:18 +01:00 · 2024-10-27 15:45:07 +01:00 · 2024-10-27 15:44:52 +01:00 · 2024-10-27 15:44:39 +01:00
5 changed files with 201 additions and 43 deletions
--- a/configs/keyboard.nix
+++ b/configs/keyboard.nix
@@ -3,18 +3,21 @@
  lib,
  ...
 }: let
+
  commaSep = builtins.concatStringsSep ",";
  xkbOptions = ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
  languages = {
    deutsch = { code = "de"; variant = "T3"; };
    greek = { code = "gr"; variant = "polytonic"; };
    russian = { code = "ru"; variant = "phonetic"; };
-    arabic = ../lib/keyboards/arabic;
+    arabic = { code = "ara"; variant = "buckwalter"; }; # ../lib/keyboards/arabic;
    coptic = ../lib/keyboards/coptic;
    avestan = ../lib/keyboards/avestan;
    gothic = ../lib/keyboards/gothic;
+    farsi = { code = "ir"; variant = "qwerty"; };
    sanskrit = { code = "in"; variant = "san-kagapa"; };
    gujarati = {code = "in"; variant = "guj-kagapa"; };
+    urdu = {code = "in"; variant = "urd-phonetic"; };
    hebrew = {code = "il"; variant = "phonetic";};
  };
  defaultLanguage = languages.deutsch;
@@ -37,7 +40,12 @@ in {
          lib.mapAttrsToList (name: value: {
            name = "symbols/${name}";
            path = value;
-          }) (lib.filterAttrs (_: value: builtins.typeOf value == "path") languages)
+          }) (lib.filterAttrs (_: value: !(value ? "code")) languages) ++ [
+            {
+              name = "symbols/ir";
+              path = ../lib/keyboards/farsi;
+            }
+          ]
        ))
      ];
    };
--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -251,7 +251,7 @@ in {
    html-tidy
    nodePackages.csslint
    nodePackages.jsonlint
-    deno # better node.js
+    unstablePackages.deno # better node.js
    texlive.combined.scheme-full
    latexrun
    (aspellWithDicts (dict: [dict.de dict.en dict.en-computers]))
--- a/flake.lock
+++ b/flake.lock
@@ -246,11 +246,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1725761443,
-        "narHash": "sha256-RX3qnLYaFxlvOAYL6WsM5nGjNnMZQIgKIpIxigPmiAU=",
+        "lastModified": 1727658705,
+        "narHash": "sha256-OEoMO7bvKyRFyoAR4DIGoWWEJ1OlWveUAICRHhWasTs=",
        "owner": "Mic92",
        "repo": "buildbot-nix",
-        "rev": "ade5f42d7e56c8298d729aa0e804c8062e7a77ac",
+        "rev": "d2dd93e4d12be7a05ef7640c7375c58739263d8d",
        "type": "github"
      },
      "original": {
@@ -410,11 +410,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725234343,
-        "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
+        "lastModified": 1726153070,
+        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
+        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
        "type": "github"
      },
      "original": {
@@ -1077,11 +1077,11 @@
    },
    "nixpkgs-unstable_2": {
      "locked": {
-        "lastModified": 1727809170,
-        "narHash": "sha256-VxZqTR6OSK2K8iMyxl85DWG0rnJWQQgMoMuDmTxCa2I=",
+        "lastModified": 1730039421,
+        "narHash": "sha256-XSK5b6NHcNXlt7Lv2fghSzBHI5rmv/CTZOm3yrSM/+Y=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c998d65c768cc65a006ecd1a1cb193b66fc88ad3",
+        "rev": "79c36a6798b500f47dcea460ce898ebe524f49f4",
        "type": "github"
      },
      "original": {
@@ -1215,11 +1215,11 @@
    },
    "nixpkgs_8": {
      "locked": {
-        "lastModified": 1727672256,
-        "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=",
+        "lastModified": 1729973466,
+        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1719f27dd95fd4206afb9cec9f415b539978827e",
+        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
        "type": "github"
      },
      "original": {
@@ -1231,11 +1231,11 @@
    },
    "nixpkgs_9": {
      "locked": {
-        "lastModified": 1725634671,
-        "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
+        "lastModified": 1727802920,
+        "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
+        "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
        "type": "github"
      },
      "original": {
@@ -1358,11 +1358,11 @@
    },
    "nur_2": {
      "locked": {
-        "lastModified": 1727808630,
-        "narHash": "sha256-kY2COV32KqzauYHnmzMT6MRf1zV2YJFuZY0PTTsI8UY=",
+        "lastModified": 1730034236,
+        "narHash": "sha256-wbx0m55mucFcmJBGyJZ0GmW0H5QOV6cB4ZiBuUD5LnA=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "c4f890b65647f729b180a554f71e773c255ec1e4",
+        "rev": "b801cebe7a16a554e6b09919588ecaac023c2dfa",
        "type": "github"
      },
      "original": {
@@ -1532,11 +1532,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727749966,
-        "narHash": "sha256-DUS8ehzqB1DQzfZ4bRXVSollJhu+y7cvh1DJ9mbWebE=",
+        "lastModified": 1729996302,
+        "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "00decf1b4f9886d25030b9ee4aed7bfddccb5f66",
+        "rev": "a1b337569f334ff0a01b57627f17b201d746d24c",
        "type": "github"
      },
      "original": {
@@ -1610,11 +1610,11 @@
        "nixpkgs": "nixpkgs_9"
      },
      "locked": {
-        "lastModified": 1727278138,
-        "narHash": "sha256-RvwuIt4mGaSomnmC3/MXAJhWeZ2dj/FV4kncwSVPrq0=",
+        "lastModified": 1728927830,
+        "narHash": "sha256-FTN+sYTvdQ/BI4cl13DuOozHQY3XTybPxE314Z8/Zn8=",
        "owner": "krebs",
        "repo": "stockholm",
-        "rev": "ceccc167d2d0e6c535b769e80254d86381f5c7de",
+        "rev": "9af8bb1b1e29af42a4a3a992bbaff47109490762",
        "type": "github"
      },
      "original": {
@@ -1851,11 +1851,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725271838,
-        "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=",
+        "lastModified": 1727431250,
+        "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd",
+        "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754",
        "type": "github"
      },
      "original": {
@@ -1883,11 +1883,11 @@
    "voidrice_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1721065602,
-        "narHash": "sha256-fL95gTBGpn36IuImoIA5wr4zOGhAQktkkwXzImZ2/10=",
+        "lastModified": 1729622861,
+        "narHash": "sha256-7J2RlIzJ9BTL6+tqrYDXC16j3HLWklA5CPgVuw4e8nU=",
        "owner": "Lukesmithxyz",
        "repo": "voidrice",
-        "rev": "628ed4dc995f3c09e33c24a01c817c18b1a268af",
+        "rev": "c43f390f07098c42db5efce654b07870951b512a",
        "type": "github"
      },
      "original": {
--- a/lib/keyboards/farsi
+++ b/lib/keyboards/farsi
@@ -0,0 +1,114 @@
+// https://github.com/gpuminingir/Farsi-Phonetic-Keyboard-Linux
+// by @gpuminingir
+
+partial alphanumeric_keys
+xkb_symbols "qwerty" {
+  // Classic Finnish keyboard layout without dead keys and {[]} on asdf + AltG
+  name[Group1]="Persian (QWERTY)";
+  include "ir(pesq_part_basic)"
+  include "ir(pesq_part_ext)"
+  include "ir(pesq_part_keypad)"
+  include "nbsp(zwnj2nb3nnb4)"
+  include "level3(ralt_switch)"  
+};
+
+hidden partial alphanumeric_keys
+xkb_symbols "pesq_part_basic" {
+  // Persian digits
+  key <AE01> { [ Arabic_1, exclam, exclam ] }; // ١ ! !
+  key <AE02> { [ Arabic_2, at, at ] }; // ٢ @ @
+  key <AE03> { [ Arabic_3, numbersign, numbersign ] }; // ٣ # #
+  key <AE04> { [ Farsi_4, dollar, dollar ] }; // ۴ $ $
+  key <AE05> { [ Farsi_5, percent, percent ] }; // ۵ % %
+  key <AE06> { [ Farsi_6, asciicircum, asciicircum ] }; // ۶ ^ ^
+  key <AE07> { [ Arabic_7, ampersand, ampersand ] }; // ٧ & &
+  key <AE08> { [ Arabic_8, KP_Multiply, KP_Multiply ] }; // ٨ * *
+  key <AE09> { [ Arabic_9, Armenian_parenright, Armenian_parenright, Armenian_parenleft ] }; // ٩ ) ) (
+  key <AE10> { [ Farsi_0, Armenian_parenleft, Armenian_parenleft ] }; // ۰ ( (
+  key <AE11> { [ underbar, KP_Subtract, KP_Subtract ] }; // _ – –
+  key <AE12> { [ KP_Equal, KP_Add, KP_Add ] }; // = + +
+
+  // Persian letters and symbols
+  key <AD01> { [ Arabic_qaf, Arabic_ghain ] }; // ق غ
+  key <AD02> { [ Arabic_sheen ] }; // ش
+  key <AD03> { [ Arabic_ain ] }; // ع
+  key <AD04> { [ Arabic_ra ] }; // ر
+  key <AD05> { [ Arabic_teh, Arabic_tah ] }; // ت ط
+  key <AD06> { [ Farsi_yeh ] }; // ى
+  key <AD07> { [ Arabic_waw ] }; // و
+  key <AD08> { [ Farsi_yeh ] }; // ى
+  key <AD09> { [ Arabic_waw ] }; // و
+  key <AD10> { [ Arabic_peh ] }; // پ
+  key <AD11> { [ bracketright, braceleft ] }; // ] } {
+  key <AD12> { [ bracketleft, braceright ] }; // [ { }
+
+  key <AC01> { [ Arabic_alef, Arabic_maddaonalef, Arabic_maddaonalef ] }; // ا آ آ
+  key <AC02> { [ Arabic_seen, Arabic_sad, Arabic_sheen, Arabic_sheen ] }; // س ص  ش 
+  key <AC03> { [ Arabic_dal, Arabic_thal ] }; // د ذ ذ
+  key <AC04> { [ Arabic_feh ] }; // ف
+  key <AC05> { [ Arabic_gaf, Arabic_ghain ] }; // گ
+  key <AC06> { [ Arabic_heh, Arabic_hah ] }; // ە ح ه
+  key <AC07> { [ Arabic_jeem, Arabic_jeh ] }; // ج ژ ژ
+  key <AC08> { [ Arabic_keheh ] }; // ک
+  key <AC09> { [ Arabic_lam ] }; // ل
+  key <AC10> { [ Arabic_semicolon, colon ] }; // ؛ : ։
+  key <AC11> { [ Arabic_comma, quotedbl, quotedbl ] }; // ، ” ”
+
+  key <AB01> { [ Arabic_zain, Arabic_dad, Arabic_zah, Arabic_zah ] }; //  ض ض ز خ
+  key <AB02> { [ Arabic_khah, Arabic_zah ] }; // ظ خ
+  key <AB03> { [ Arabic_theh, Arabic_tcheh ] }; // چ ث
+  key <AB04> { [ Arabic_hamza, Arabic_waw ] }; // و
+  key <AB05> { [ Arabic_beh ] }; // ب
+  key <AB06> { [ Arabic_noon ] }; // ن
+  key <AB07> { [ Arabic_meem ] }; // م
+  key <AB08> { [ Arabic_comma, rightcaret, leftcaret ] }; // , > <
+  key <AB09> { [ period, leftcaret, rightcaret ] }; // . < >
+  key <AB10> { [ slash,		Arabic_question_mark,	question ] }; // / ?
+
+  key <AE11> { [ minus, underscore ] };
+  key <AE12> { [ equal, plus, 0x1002212 ] };
+  key <BKSL> { [ backslash, bar, 0x1002010 ] };
+  key <TLDE> { [ U02DC, UFDFC, UFDF2 ] }; // ˜ ﷼ ﷲ
+};
+
+hidden partial alphanumeric_keys
+xkb_symbols "pesq_part_ext" {
+  // Persian and ASCII digits
+  key <AE01> { [ Farsi_1, exclam, grave, 1 ] };
+  key <AE02> { [ Farsi_2, 0x100066c, at, 2 ] };
+  key <AE03> { [ Farsi_3, 0x100066b, numbersign, 3 ] };
+  key <AE04> { [ Farsi_4, 0x100fdfc, dollar, 4 ] };
+  key <AE05> { [ Farsi_5, 0x100066a, percent, 5 ] };
+  key <AE06> { [ Farsi_6, multiply, asciicircum, 6 ] };
+  key <AE07> { [ Farsi_7, Arabic_comma, ampersand, 7 ] };
+  key <AE08> { [ Farsi_8, asterisk, enfilledcircbullet, 8 ] };
+  key <AE09> { [ Farsi_9, parenright, 0x100200e, 9 ] };
+  key <AE10> { [ Farsi_0, parenleft, 0x100200f, 0 ] };
+};
+
+hidden partial alphanumeric_keys
+xkb_symbols "pesq_part_keypad" {
+  // Persian digits and Mathematical operators
+  key <KPDV> { [ division, XF86_Ungrab ] };
+  key <KPMU> { [ multiply, XF86_ClearGrab ] };
+  key <KPSU> { [ 0x1002212, XF86_Prev_VMode ] };
+  key <KPAD> { [ plus, XF86_Next_VMode ] };
+
+  key <KPEN> { [ KP_Enter ] };
+  key <KPEQ> { [ equal ] };
+
+  key <KP7> { [ KP_Home, Farsi_7 ] };
+  key <KP8> { [ KP_Up, Farsi_8 ] };
+  key <KP9> { [ KP_Prior, Farsi_9 ] };
+
+  key <KP4> { [ KP_Left, Farsi_4 ] };
+  key <KP5> { [ KP_Begin, Farsi_5 ] };
+  key <KP6> { [ KP_Right, Farsi_6 ] };
+
+  key <KP1> { [ KP_End, Farsi_1 ] };
+  key <KP2> { [ KP_Down, Farsi_2 ] };
+  key <KP3> { [ KP_Next, Farsi_3 ] };
+
+  key <KP0> { [ KP_Insert, Farsi_0 ] };
+  key <KPDL> { [ KP_Delete, 0x100066b ] };
+};
--- a/systems/makanek/monitoring/default.nix
+++ b/systems/makanek/monitoring/default.nix
@@ -89,10 +89,10 @@ in {
          name = "niveum";
          rules = [
            {
-              alert = "ServiceDown";
-              expr = ''node_systemd_unit_state{state="failed"} == 1'';
+              alert = "HostSystemdServiceCrashed";
+              expr = ''(node_systemd_unit_state{state="failed"} == 1) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'';
              annotations = {
-                summary = "{{$labels.name}} failed on {{$labels.job}}";
+                summary = "{{$labels.name}} failed on {{$labels.instance}}";
              };
            }
            {
@@ -100,7 +100,7 @@ in {
              for = "10m";
              expr = ''(node_filesystem_free_bytes{mountpoint="/"} * 100) / node_filesystem_size_bytes{mountpoint="/"} < ${toString diskFreeThreshold}'';
              annotations = {
-                summary = ''{{ $labels.job }} running out of space: {{ $value | printf "%.2f" }}% < ${toString diskFreeThreshold}%'';
+                summary = ''{{ $labels.instance }} running out of space: {{ $value | printf "%.2f" }}% < ${toString diskFreeThreshold}%'';
              };
            }
            {
@@ -110,7 +110,7 @@ in {
                ''node_filesystem_free_bytes{mountpoint="/"} ''
                + ''and predict_linear(node_filesystem_free_bytes{mountpoint="/"}[2d], 7*24*3600) <= 0'';
              annotations = {
-                summary = "{{$labels.job}} running out of space in 7 days";
+                summary = "{{$labels.instance}} running out of space in 7 days";
              };
            }
            {
@@ -118,32 +118,68 @@ in {
              expr = ''node_load15 / on(job) count(node_cpu_seconds_total{mode="system"}) by (job) >= 1.0'';
              for = "10m";
              annotations = {
-                summary = "{{$labels.job}} running on high load: {{$value}}";
+                summary = "{{$labels.instance}} running on high load: {{$value}}";
              };
            }
+            {
+              alert = "HostUnusualNetworkThroughputIn";
+              expr = ''(rate(node_network_receive_bytes_total[2m])) / 1024 / 1024 > 100'';
+              for = "5m";
+              annotations.summary = "Host unusual network throughput in (instance {{ $labels.instance }})";
+            }
+            {
+              alert = "HostUnusualNetworkThroughputOut";
+              expr = ''(rate(node_network_transmit_bytes_total[2m])) / 1024 / 1024 > 100'';
+              for = "5m";
+              annotations.summary = "Host unusual network throughput out (instance {{ $labels.instance }})";
+            }
+            {
+              alert = "HostUnusualDiskReadRate";
+              expr = ''(rate(node_disk_read_bytes_total[2m])) / 1024 / 1024 > 50'';
+              for = "5m";
+              annotations.summary = "Host unusual disk read rate (instance {{ $labels.instance }})";
+            }
+            {
+              alert = "HostUnusualDiskWriteRate";
+              expr = ''(rate(node_disk_written_bytes_total[2m])) / 1024 / 1024 > 50'';
+              for = "2m";
+              annotations.summary = "Host unusual disk write rate (instance {{ $labels.instance }})";
+            }
+            {
+              alert = "HostOutOfInodes";
+              expr = ''node_filesystem_files_free{fstype!="msdosfs"} / node_filesystem_files{fstype!="msdosfs"} * 100 < 10 and ON (instance, device, mountpoint) node_filesystem_readonly == 0'';
+              for = "2m";
+              annotations.summary = "Host out of inodes (instance {{ $labels.instance }})";
+            }
+            {
+              alert = "HostInodesWillFillIn24Hours";
+              expr = ''node_filesystem_files_free{fstype!="msdosfs"} / node_filesystem_files{fstype!="msdosfs"} * 100 < 10 and predict_linear(node_filesystem_files_free{fstype!="msdosfs"}[1h], 24 * 3600) < 0 and ON (instance, device, mountpoint) node_filesystem_readonly{fstype!="msdosfs"} == 0'';
+              for = "2m";
+              annotations.summary = "Host inodes will fill in 24 hours (instance {{ $labels.instance }})";
+            }
            {
              alert = "HighRAM";
              expr = "node_memory_MemFree_bytes + node_memory_Buffers_bytes + node_memory_Cached_bytes < node_memory_MemTotal_bytes * 0.1";
              for = "1h";
-              annotations.summary = "{{$labels.job}} using lots of RAM";
+              annotations.summary = "{{$labels.instance}} using lots of RAM";
            }
            {
              alert = "UptimeMonster";
              expr = "time() - node_boot_time_seconds > 2592000";
-              annotations.summary = "uptime monster {{$labels.job}} up for more than 30 days";
+              annotations.summary = "uptime monster {{$labels.instance}} up for more than 30 days";
            }
            {
              alert = "HostDown";
              expr = ''up == 0'';
              for = "5m";
              annotations = {
-                summary = "{{ $labels.job }} seeming down since 5 minutes";
+                summary = "{{ $labels.instance }} seeming down since 5 minutes";
              };
            }
            {
              alert = "Reboot";
              expr = "time() - node_boot_time_seconds < 300";
-              annotations.summary = "{{$labels.job}} rebooted";
+              annotations.summary = "{{$labels.instance}} rebooted";
            }
            {
              alert = "ProbeFailed";
Author	SHA1	Message	Date
Kierán Meinhardt	762d766db5	keyboards: add urdu keyboard	2024-10-27 15:45:18 +01:00
Kierán Meinhardt	812c795723	deno: use newest version	2024-10-27 15:45:07 +01:00
Kierán Meinhardt	cf72c1df1f	alertmanager: more alerts?	2024-10-27 15:44:52 +01:00
Kierán Meinhardt	05b35bd9f0	chore: update	2024-10-27 15:44:39 +01:00