flake.lock: Update

Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/a4b154ebbdc88c8498a5c7b01589addc9e9cb678' (2022-04-11)
  → 'github:numtide/flake-utils/12806d31a381e7cd169a6bac35590e7b36dc5fe5' (2022-05-14)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5656d7f92aa8264eb06ba68ad94c87ac5b5312e8' (2022-05-06)
  → 'github:NixOS/nixpkgs/79385ae0aacf7e02871cc8af0623123419dd7884' (2022-05-13)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/d707e510df39cdd8fe1d3e244371a3a9f23051d2' (2022-05-08)
  → 'github:NixOS/nixpkgs/e9132b233ec7176c121b4ecb991ce397d92275ee' (2022-05-15)
• Updated input 'retiolum':
    'github:krebs/retiolum/2bafba9621b83529b78fb2db34b351fd19411c0e' (2022-05-04)
  → 'github:krebs/retiolum/7cc2a7118e4aa9f5df0953bebad28034306329e6' (2022-05-11)
• Updated input 'stockholm':
    'git+https://cgit.lassul.us/stockholm?ref=master&rev=376b92c877442ec3be476ea5f4c89f8a715426dd' (2022-05-04)
  → 'git+https://cgit.lassul.us/stockholm?ref=master&rev=c87ba30c0c1cf344c7cc090d73a2ba44140f15d9' (2022-05-11)

ci.nix

@@ -74,6 +74,7 @@
           "telegram/menstruation.token"
           "telegram/cool_village.token"
           "telegram/kmein.token"
+          "telegram/krebs.token"
           "telegram/prometheus.token"
           "weechat/relay"
         ]

configs/default.nix

@@ -170,13 +170,15 @@ in {
     {
       security.wrappers = {
         pmount = {
+          setuid = true;
           owner = "root";
-          group = "users";
+          group = "root";
           source = "${pkgs.pmount}/bin/pmount";
         };
         pumount = {
+          setuid = true;
           owner = "root";
-          group = "users";
+          group = "root";
           source = "${pkgs.pmount}/bin/pumount";
         };
       };

configs/keyboard.nix

@@ -4,13 +4,20 @@
   ...
 }: let
   commaSep = builtins.concatStringsSep ",";
+  languages = {
+    de = "T3";
+    gr = "polytonic";
+    ru = "phonetic";
+    ara = "buckwalter";
+  };
+  defaultLanguage = "de";
 in {
   # man 7 xkeyboard-config
   services.xserver = {
-    layout = commaSep ["de" "gr" "ru" "ara"];
+    layout = commaSep (builtins.attrNames languages);
     # 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"];
+    xkbVariant = commaSep (builtins.attrValues languages);
     xkbOptions =
       commaSep ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
     libinput.enable = true;
@@ -18,6 +25,14 @@ in {
 
   console.keyMap = "de";
 
+  environment.systemPackages =
+    lib.mapAttrsToList
+    (language: variant:
+      pkgs.writers.writeDashBin "kb-${language}" ''
+        ${pkgs.xlibs.setxkbmap}/bin/setxkbmap ${defaultLanguage},${language} ${languages.${defaultLanguage}},${variant}
+      '')
+    languages;
+
   # improve held key rate
   services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
 

configs/packages.nix

@@ -124,7 +124,7 @@ in {
     electrum
     inkscape
     astrolog
-    anki # flashcards
+    nixpkgs-unstable.anki # flashcards
     jbofihe # lojbanic software
     nixpkgs-unstable.zoom-us # video conferencing
     nixpkgs-unstable.alejandra # nix formatter

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1649676176,
+        "lastModified": 1652557277,
-        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
+        "narHash": "sha256-jSes9DaIVMdmwBB78KkFUVrlDzawmD62vrUg0GS2500=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
+        "rev": "12806d31a381e7cd169a6bac35590e7b36dc5fe5",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1651848520,
+        "lastModified": 1652442528,
-        "narHash": "sha256-KkJ28fShdd78+zal5HlHsXUICOCtO7Bdvylc5zlp5Mk=",
+        "narHash": "sha256-ctD9BdjN7e6cBipm8k9xt+vgwlRApkvuJLSNdaVrphE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5656d7f92aa8264eb06ba68ad94c87ac5b5312e8",
+        "rev": "79385ae0aacf7e02871cc8af0623123419dd7884",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1651970800,
+        "lastModified": 1652576583,
-        "narHash": "sha256-6mDxz6fD7fgBC1TY5OMcU/Qubf+OlAyeVR8YCoNKD2A=",
+        "narHash": "sha256-FhSixtJktylN1lnflPYgZfoH++6/VpC7euoV8RcBKSY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d707e510df39cdd8fe1d3e244371a3a9f23051d2",
+        "rev": "e9132b233ec7176c121b4ecb991ce397d92275ee",
         "type": "github"
       },
       "original": {
@@ -158,11 +158,11 @@
     "retiolum": {
       "flake": false,
       "locked": {
-        "lastModified": 1651665107,
+        "lastModified": 1652292767,
-        "narHash": "sha256-/fKmwakb9E8ctILu5RNUrjzq7gls0tqn8Oup3Y1xmzY=",
+        "narHash": "sha256-3/ENvvvva5BiQH8YP6AHwMpApuut9CqhfjrLaoikcno=",
         "owner": "krebs",
         "repo": "retiolum",
-        "rev": "2bafba9621b83529b78fb2db34b351fd19411c0e",
+        "rev": "7cc2a7118e4aa9f5df0953bebad28034306329e6",
         "type": "github"
       },
       "original": {
@@ -210,11 +210,11 @@
     "stockholm": {
       "flake": false,
       "locked": {
-        "lastModified": 1651664500,
+        "lastModified": 1652292290,
-        "narHash": "sha256-KYGx877YzpWQWk++YqnUQK4pu8JYJnSdMSUU9r2/xGU=",
+        "narHash": "sha256-QTBV3X6rFHU8H58phKT+V5Trous17aZbSRDB8Yp1i1c=",
         "ref": "master",
-        "rev": "376b92c877442ec3be476ea5f4c89f8a715426dd",
+        "rev": "c87ba30c0c1cf344c7cc090d73a2ba44140f15d9",
-        "revCount": 10527,
+        "revCount": 10537,
         "type": "git",
         "url": "https://cgit.lassul.us/stockholm"
       },

packages/gfs-fonts.nix

@@ -39,5 +39,15 @@ in
       GFS_Pyrsos = "0y0dv7y3n01bbhhnczflx1zcc7by56cffmr2xqixj2rd1nvchx0j";
       GFS_Solomos = "1mpx9mw566awvfjdfx5sbz3wz5gbnjjw56gz30mk1lw06vxf0dxz";
       GFS_Theokritos = "0haasx819x8c8yvna6pqywgi4060av2570jm34cddnz1fgnhv1b8";
+      # Heraklit
+      # Galatea
+      # Georgiou
+      # Ambrosia
+      # Fleischman
+      # Eustace
+      # Nicefore
+      # Jackson
+      # Garaldus
+      # Ignacio
     };
   }

packages/scripts/unicodmenu.nix

@@ -75,8 +75,9 @@
 in
   # ref https://github.com/LukeSmithxyz/voidrice/blob/9fe6802122f6e0392c7fe20eefd30437771d7f8e/.local/bin/dmenuunicode
   writers.writeDashBin "unicodmenu" ''
+    history_file=$HOME/.cache/unicodmenu
     PATH=${lib.makeBinPath [coreutils dmenu gnused libnotify xclip xdotool]}
-    chosen=$(cat ${kaomoji-file} ${unicode-file} | dmenu -p unicode -i -l 10 | sed "s/    .*//")
+    chosen=$(cat "$history_file" ${kaomoji-file} ${unicode-file} | dmenu -p unicode -i -l 10 | tee "$history_file" | sed "s/    .*//")
 
     [ "$chosen" != "" ] || exit
 

systems/makanek/gitea.nix

@@ -1,9 +1,12 @@
-{
+let
+  inherit (import <niveum/lib>) sshPort;
+in {
   services.gitea = {
     enable = true;
     disableRegistration = true;
     rootUrl = "https://code.kmein.de";
     appName = "code.kmein.de";
+    ssh.clonePort = sshPort;
   };
   services.nginx.virtualHosts."code.kmein.de" = {
     forceSSL = true;

systems/makanek/matterbridge.nix

@@ -6,14 +6,14 @@
   services.matterbridge = {
     enable = true;
     configPath = let
-      bridgeBotToken = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+      bridgeBotToken = lib.strings.fileContents <system-secrets/telegram/krebs.token>;
     in
       toString ((pkgs.formats.toml {}).generate "config.toml" {
         general = {
           RemoteNickFormat = "[{NICK}] ";
           Charset = "utf-8";
         };
-        telegram.kmein.Token = bridgeBotToken;
+        telegram.krebs.Token = bridgeBotToken;
         irc = let
           Nick = "ponte";
         in {
@@ -38,7 +38,7 @@
                 channel = "#krebs";
               }
               {
-                account = "telegram.kmein";
+                account = "telegram.krebs";
                 channel = "-330372458";
               }
               {