WIP: mympd

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

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1649676176,
+        "lastModified": 1648297722,
-        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
+        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
+        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1649887911,
+        "lastModified": 1648834319,
-        "narHash": "sha256-Af0Ppb1RZ7HWuxUvF0/O7h3cy8tqU2eKFyVwyA1ZD+w=",
+        "narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7244c6715cb8f741f3b3e1220a9279e97b2ed8f5",
+        "rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1649944829,
+        "lastModified": 1649490789,
-        "narHash": "sha256-wjOgLfjCdyoRamMOrVJceeDJk4LvJsQOxBoT3k16/7Q=",
+        "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2f06b87f64bc06229e05045853e0876666e1b023",
+        "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1650167080,
+        "lastModified": 1649541735,
-        "narHash": "sha256-sSFOXf1YtX6EIHG5HAh64y6EqJ1/5epcCSq1c8wxCi4=",
+        "narHash": "sha256-JdOywA2jcdGCxNgu0dJA7ZNtaV7sS0HwuZg9YaXd94c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6140c314d5850406dddc78e55dcc8716ea111ee4",
+        "rev": "c2b6e029cd1efa0efd37daab89264ef040ae5669",
         "type": "github"
       },
       "original": {
@@ -194,11 +194,11 @@
     "scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1650402678,
+        "lastModified": 1648400983,
-        "narHash": "sha256-LkaKJvF09wVHpN5FuJtX0M4vOA/DrO9xUMFI8fMtNeA=",
+        "narHash": "sha256-I9ADWgUN1orbnXPBW4kulHpv8wkx6C8zsQcg9wphpPg=",
         "owner": "kmein",
         "repo": "scripts",
-        "rev": "adfd4238f7a8f0f894547998cbb04327bad97884",
+        "rev": "f5df67a2416d8f05a7dbfea269c44668854c7887",
         "type": "github"
       },
       "original": {
@@ -210,11 +210,11 @@
     "stockholm": {
       "flake": false,
       "locked": {
-        "lastModified": 1650040948,
+        "lastModified": 1649089964,
-        "narHash": "sha256-/4Q2vnl53BQVYQFSZqF512CF6tzIyPHaDy4Yheof8G4=",
+        "narHash": "sha256-ybuVI8rnpMyBUoyoIXJ1e3QBMBIOoEgKTiFzIPfzy8A=",
         "ref": "master",
-        "rev": "92d5eacd6d9e530c4d1ea0dec2652417b0fde78a",
+        "rev": "b3833baee96d7bce2c54295110b40c646468a1ff",
-        "revCount": 10516,
+        "revCount": 10500,
         "type": "git",
         "url": "https://cgit.lassul.us/stockholm"
       },

systems/makanek/names.nix

@@ -4,8 +4,8 @@
   ...
 }: let
   port = 5703;
-  onomap-src = "${<scripts>}/onomastics-ng";
+  geogen-src = "${<scripts>}/onomastics";
-  onomap = pkgs.haskellPackages.callCabal2nix "onomap" onomap-src {};
+  geogen = pkgs.callPackage geogen-src {};
 in {
   systemd.services.names = {
     wants = ["network-online.target"];
@@ -13,9 +13,12 @@ in {
     description = "Better clone of geogen.stoepel.net";
     serviceConfig = {
       DynamicUser = true;
-      ExecStart = "${onomap}/bin/onomap-web";
     };
-    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 = {

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>

systems/zaatar/moodle-dl-meinhark.nix

@@ -69,15 +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
       ];
       download_submissions = true;
       download_descriptions = true;

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";
+    };
+  };
+}