WIP: mympd

2026-03-22 12:51:08 +01:00 · 2022-04-15 01:16:50 +02:00
11 changed files with 87 additions and 74 deletions
--- a/ci.nix
+++ b/ci.nix
@@ -36,7 +36,6 @@
    "mail/gmail/amroplay"
    "mail/gmail/kieran.meinhardt"
    "mail/meinhaki"
-    "mail/dslalewa"
    "mail/posteo"
    "nextcloud-fysi/password"
    "nextcloud/password"
--- a/configs/cloud.nix
+++ b/configs/cloud.nix
@@ -49,11 +49,6 @@ 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,12 +5,9 @@
 }: let
  commaSep = builtins.concatStringsSep ",";
 in {
-  # man 7 xkeyboard-config
  services.xserver = {
-    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"];
+    layout = commaSep ["de" "gr"];
+    xkbVariant = commaSep ["T3" "polytonic"];
    xkbOptions =
      commaSep ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
    libinput.enable = true;
@@ -20,15 +17,4 @@ 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/configs/neomutt.nix
+++ b/configs/neomutt.nix
@@ -47,20 +47,6 @@
    };
  };

-  accounts.work-admin = {
-    user = "dslalewa";
-    password = lib.strings.fileContents <secrets/mail/dslalewa>;
-    address = "admin.alew.vglsprwi@hu-berlin.de";
-    imap = "mailbox.cms.hu-berlin.de";
-    smtp = "mailhost.cms.hu-berlin.de";
-    smtpSettings = smtp: "smtp://${smtp}";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
-  };
-
  accounts.work-fysi = rec {
    user = "kieran@fysi.tech";
    address = user;
@@ -145,7 +131,6 @@ in {
        application/pdf; ${pkgs.zathura}/bin/zathura %s ;
        application/pgp-encrypted; ${pkgs.gnupg}/bin/gpg -d '%s'; copiousoutput;
        application/pgp-keys; ${pkgs.gnupg}/bin/gpg --import '%s'; copiousoutput;
-        application/vnd.openxmlformats*; ${pkgs.libreoffice}/bin/soffice '%s';
      ''
    }:$mailcap_path

--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -137,7 +137,6 @@ in {
    pdfpc # presenter console for pdf slides
    hc # print files as qr codes
    youtubeDL
-    yt-dlp
    espeak
    bc # calculator
    pari # gp -- better calculator
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
  "nodes": {
    "flake-utils": {
      "locked": {
-        "lastModified": 1649676176,
-        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
+        "lastModified": 1648297722,
+        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
+        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
        "type": "github"
      },
      "original": {
@@ -22,11 +22,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1651007218,
-        "narHash": "sha256-NkQAMtqW0PSJTbLHalyZtaqj0ai2TZMOedug9yDIcFw=",
+        "lastModified": 1648834319,
+        "narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d14adb99f3fb562ec74ad18c032efc154b438034",
+        "rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0",
        "type": "github"
      },
      "original": {
@@ -109,11 +109,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1651093906,
-        "narHash": "sha256-kHXSbv+Hc73eV0/JVJ5YsJGr08bA4vJ3/XZew5PgZg0=",
+        "lastModified": 1649490789,
+        "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "feea25c58657fa81d16e0e51f80e1a02ef4cbd49",
+        "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",
        "type": "github"
      },
      "original": {
@@ -125,11 +125,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1651365995,
-        "narHash": "sha256-fHKY8+nfPuVMDjSih8j/xoaTLpngW6b4QxJbICBLQmc=",
+        "lastModified": 1649541735,
+        "narHash": "sha256-JdOywA2jcdGCxNgu0dJA7ZNtaV7sS0HwuZg9YaXd94c=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "05ced71757730406ca3eb3e58503f05334a6057d",
+        "rev": "c2b6e029cd1efa0efd37daab89264ef040ae5669",
        "type": "github"
      },
      "original": {
@@ -194,11 +194,11 @@
    "scripts": {
      "flake": false,
      "locked": {
-        "lastModified": 1650993582,
-        "narHash": "sha256-cKcdHzyy6Y4H9+KcnCgk/Tt1Zqd8lhfiXv4LClcETLc=",
+        "lastModified": 1648400983,
+        "narHash": "sha256-I9ADWgUN1orbnXPBW4kulHpv8wkx6C8zsQcg9wphpPg=",
        "owner": "kmein",
        "repo": "scripts",
-        "rev": "c1aaeb4339e9c41057d362667554835a0f49850f",
+        "rev": "f5df67a2416d8f05a7dbfea269c44668854c7887",
        "type": "github"
      },
      "original": {
@@ -210,11 +210,11 @@
    "stockholm": {
      "flake": false,
      "locked": {
-        "lastModified": 1650040948,
-        "narHash": "sha256-/4Q2vnl53BQVYQFSZqF512CF6tzIyPHaDy4Yheof8G4=",
+        "lastModified": 1649089964,
+        "narHash": "sha256-ybuVI8rnpMyBUoyoIXJ1e3QBMBIOoEgKTiFzIPfzy8A=",
        "ref": "master",
-        "rev": "92d5eacd6d9e530c4d1ea0dec2652417b0fde78a",
-        "revCount": 10516,
+        "rev": "b3833baee96d7bce2c54295110b40c646468a1ff",
+        "revCount": 10500,
        "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;
-  onomap-src = "${<scripts>}/onomastics-ng";
-  onomap = pkgs.haskellPackages.callCabal2nix "onomap" onomap-src {};
+  geogen-src = "${<scripts>}/onomastics";
+  geogen = pkgs.callPackage geogen-src {};
 in {
  systemd.services.names = {
    wants = ["network-online.target"];
@@ -13,11 +13,12 @@ in {
    description = "Better clone of geogen.stoepel.net";
    serviceConfig = {
      DynamicUser = true;
-      ExecStart = "${onomap}/bin/onomap-web";
-      Restart = "on-failure";
-      RestartSec = "15s";
    };
-    environment.PORT = toString port;
+    script = ''
+      cd $(mktemp -d)
+      ln -s "${geogen-src}/wsgi.py" wsgi.py
+      ${geogen.dependencyEnv}/bin/gunicorn wsgi:app -b :${toString port}
+    '';
  };

  services.nginx = {
--- a/systems/zaatar/configuration.nix
+++ b/systems/zaatar/configuration.nix
@@ -15,6 +15,7 @@ in {
    ./pulseaudio.nix
    ./home-assistant.nix
    ./tuna.nix
+    ./mympd.nix
    ./grocy.nix
    ./spotifyd.nix
    <home-manager/nixos>
--- a/systems/zaatar/moodle-dl-meinhark.nix
+++ b/systems/zaatar/moodle-dl-meinhark.nix
@@ -69,16 +69,6 @@ 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
-        113493 # Papyrologie
      ];
      download_submissions = true;
      download_descriptions = true;
--- a/systems/zaatar/mympd.nix
+++ b/systems/zaatar/mympd.nix
@@ -0,0 +1,57 @@
+{pkgs, ...}: let
+  inherit (import <niveum/lib>) tmpfilesConfig;
+in {
+  systemd.tmpfiles.rules = [
+    (tmpfilesConfig {
+      type = "d";
+      mode = "0755";
+      user = "mympd";
+      group = "mympd";
+      path = "/var/lib/mympd";
+    })
+    (tmpfilesConfig {
+      type = "d";
+      mode = "0755";
+      user = "mympd";
+      group = "mympd";
+      age = "1d";
+      path = "/var/cache/mympd";
+    })
+    (tmpfilesConfig {
+      type = "L+";
+      mode = "0644";
+      user = "mympd";
+      group = "mympd";
+      path = "/var/lib/mympd/config/http_port";
+      argument = pkgs.writeText "port" "8764";
+    })
+    (tmpfilesConfig {
+      type = "L+";
+      mode = "0644";
+      user = "mympd";
+      group = "mympd";
+      path = "/var/lib/mympd/config/ssl";
+      argument = pkgs.writeText "ssl" "false";
+    })
+  ];
+
+  users.users.mympd = {
+    isSystemUser = true;
+    group = "mympd";
+  };
+  users.groups.mympd = {};
+
+  systemd.services.mympd = {
+    wantedBy = ["multi-user.target"];
+    after = ["mpd.service"];
+    script = "${pkgs.mympd}/bin/mympd";
+    environment = {
+      MYMPD_HTTP_PORT = "8764";
+    };
+    serviceConfig = {
+      Restart = "always";
+      User = "mympd";
+      Group = "mympd";
+    };
+  };
+}