WIP: mympd

configs/cloud.nix

@@ -3,7 +3,9 @@
   lib,
   pkgs,
   ...
-}: {
+}: let
+  inherit (import <niveum/lib>) tmpfilesConfig;
+in {
   imports = [
     <niveum/modules/dropbox.nix>
   ];
@@ -12,11 +14,32 @@
     dropbox.enable = false;
   };
 
-  system.activationScripts.home-symlinks = ''
+  systemd.tmpfiles.rules = map tmpfilesConfig [
-    ln -sfn ${config.users.users.me.home}/cloud/syncthing/common/mahlzeit ${config.users.users.me.home}/mahlzeit
+    {
-    ln -sfn ${config.users.users.me.home}/cloud/Seafile/Wiki ${config.users.users.me.home}/notes
+      type = "L+";
-    ln -sfn ${config.users.users.me.home}/cloud/Seafile/Uni ${config.users.users.me.home}/uni
+      user = config.users.users.me.name;
-  '';
+      group = "users";
+      mode = "0755";
+      argument = "${config.users.users.me.home}/cloud/Seafile/Wiki";
+      path = "${config.users.users.me.home}/notes";
+    }
+    {
+      type = "L+";
+      user = config.users.users.me.name;
+      group = "users";
+      mode = "0755";
+      argument = "${config.users.users.me.home}/cloud/Seafile/Uni";
+      path = "${config.users.users.me.home}/uni";
+    }
+    {
+      type = "L+";
+      user = config.users.users.me.name;
+      group = "users";
+      mode = "0755";
+      argument = "${config.users.users.me.home}/cloud/syncthing/common/mahlzeit";
+      path = "${config.users.users.me.home}/mahlzeit";
+    }
+  ];
 
   home-manager.users.me = {
     services.gnome-keyring.enable = true;

configs/fonts.nix

@@ -1,42 +1,53 @@
 {pkgs, ...}: {
   nixpkgs.config.joypixels.acceptLicense = true;
-
   fonts = {
     enableDefaultFonts = true;
     fontDir.enable = true;
     fonts = with pkgs; [
       alegreya
       alegreya-sans
+      amiri
+      cantarell-fonts
+      charis-sil
       corefonts
+      crimson
       eb-garamond
+      etBook
       fira
       font-awesome-ttf
+      gentium
+      gfs-fonts
+      gyre-fonts
+      ia-writer-duospace
       ibm-plex
-      inconsolata
+      jetbrains-mono
-      iosevka
+      joypixels
-      libertine
+      libertinus
+      libre-bodoni
       lmodern
+      merriweather
       noto-fonts
-      noto-fonts-cjk
+      ocr-a
-      noto-fonts-emoji
       roboto
       roboto-mono
       roboto-slab
+      scheherazade-new
       source-code-pro
-      source-serif-pro
       source-sans-pro
-      ubuntu_font_family
+      source-serif-pro
-      gfs-fonts
+      theano
-      jetbrains-mono
-      twemoji-color-font
-      joypixels
       tocharian-font
-    ];
+      vistafonts
-    fontconfig.defaultFonts = {
+      vollkorn
-      monospace = ["JetBrains Mono" "JoyPixels"];
+      zilla-slab
-      serif = ["Roboto Slab"];
+    ]; # google-fonts league-of-moveable-type
-      sansSerif = ["Roboto" "Noto Sans"];
+    fontconfig.defaultFonts = let
-      emoji = ["JoyPixels"];
+      emojiFont = "JoyPixels";
+    in {
+      monospace = ["JetBrains Mono" emojiFont];
+      serif = ["Merriweather"];
+      sansSerif = ["Cantarell" emojiFont];
+      emoji = [emojiFont];
     };
   };
 }

configs/mpv.nix

@@ -18,6 +18,7 @@ in {
     programs.mpv = {
       enable = true;
       config = {
+        ytdl-format = "bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best";
         ytdl-raw-options = lib.concatStringsSep "," [''sub-lang="de,en"'' "write-sub=" "write-auto-sub="];
         screenshot-template = "%F-%wH%wM%wS-%#04n";
       };

configs/telegram-bots/astrology.nix

@@ -42,7 +42,7 @@
   '';
 in {
   niveum.telegramBots.transits = {
-    enable = true;
+    enable = false;
     time = "*:0/1";
     token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
     chatIds = ["-1001796440545"];

flake.lock

@@ -62,11 +62,11 @@
     "menstruation-backend": {
       "flake": false,
       "locked": {
-        "lastModified": 1634573652,
+        "lastModified": 1649545504,
-        "narHash": "sha256-FIj8oCOJO+Wqxr2o5MMqIShvzMJud4iUq3o8y4NIRvw=",
+        "narHash": "sha256-TVm3246ML7gWPeGm+bdb+Qo8o/7nve7sQ2hBdCZm3z8=",
         "owner": "kmein",
         "repo": "menstruation.rs",
-        "rev": "dd405fe2acf32441e8ac56e488e689bb1c4bea82",
+        "rev": "d9f3c6d53542fd7c7ed191e37cf4e342d4a47bcb",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1648830526,
+        "lastModified": 1649490789,
-        "narHash": "sha256-vXaBIvst+KvXSRAjYBDzX4vtQERL5R4fe0/7585Msqk=",
+        "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6f88260faaaa3cda8f4e478be72be6c0861c47ad",
+        "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1648941300,
+        "lastModified": 1649541735,
-        "narHash": "sha256-EYBrvRKf1DGxICfVthCmMYVivTbm8ZMFELjT5x7yQhI=",
+        "narHash": "sha256-JdOywA2jcdGCxNgu0dJA7ZNtaV7sS0HwuZg9YaXd94c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "21299f3dd3ff475f19bc8933f30ebb6a135799f1",
+        "rev": "c2b6e029cd1efa0efd37daab89264ef040ae5669",
         "type": "github"
       },
       "original": {
@@ -210,11 +210,11 @@
     "stockholm": {
       "flake": false,
       "locked": {
-        "lastModified": 1648481223,
+        "lastModified": 1649089964,
-        "narHash": "sha256-8tc3wCjUs1JQZKOU/eJy4s2jchEA2cf/62JaA4HAfqo=",
+        "narHash": "sha256-ybuVI8rnpMyBUoyoIXJ1e3QBMBIOoEgKTiFzIPfzy8A=",
         "ref": "master",
-        "rev": "b9e0a7ec71e0318a992ff2b275a6aaee3cef63bd",
+        "rev": "b3833baee96d7bce2c54295110b40c646468a1ff",
-        "revCount": 10498,
+        "revCount": 10500,
         "type": "git",
         "url": "https://cgit.lassul.us/stockholm"
       },

systems/makanek/hedgedoc.nix

@@ -7,9 +7,8 @@
   stateLocation = "/var/lib/codimd/state.sqlite";
   nixpkgs-unstable = import <nixpkgs-unstable> {};
   domain = "pad.kmein.de";
+  inherit (import <niveum/lib>) tmpfilesConfig;
 in {
-  imports = [<stockholm/krebs/3modules/permown.nix>];
-
   services.nginx.virtualHosts.${domain} = {
     enableACME = true;
     forceSSL = true;
@@ -49,11 +48,15 @@ in {
     };
   };
 
-  krebs.permown.${backupLocation} = {
+  systemd.tmpfiles.rules = [
-    owner = "codimd";
+    (tmpfilesConfig {
+      user = "codimd";
       group = "codimd";
-    umask = "0002";
+      mode = "0755";
-  };
+      type = "d";
+      path = backupLocation;
+    })
+  ];
 
   systemd.services.hedgedoc-backup = {
     description = "Hedgedoc backup service";

systems/makanek/weechat.nix

@@ -143,6 +143,11 @@ in {
               tags = ["nick_gitlab"];
               regex = "*";
             };
+            people = {
+              buffer = "irc.*.*";
+              tags = map (name: "nick_${name}") ["mod_p[matrix-fli"];
+              regex = "*";
+            };
           };
         };
         extraCommands = ''/matrix connect nibbana'';

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

systems/zaatar/tuna.nix

@@ -5,6 +5,7 @@
   ...
 }: let
   firewall = (import <niveum/lib>).firewall lib;
+  inherit (import <niveum/lib>) tmpfilesConfig;
 
   streams = import <niveum/lib/streams.nix> {
     di-fm-key = lib.strings.fileContents <secrets/di.fm/key>;
@@ -71,22 +72,31 @@ in {
     extraStopCommands = firewall.removeRules rules;
   };
 
-  system.activationScripts.mpd-playlists = let
+  systemd.tmpfiles.rules = let
-    makePlaylist = name: streams: pkgs.writeText "name.m3u" (lib.concatMapStringsSep "\n" (lib.getAttr "stream") streams);
     tags = lib.lists.unique (lib.concatMap ({tags ? [], ...}: tags) streams);
-  in ''
+    tagStreams = tag: lib.filter ({tags ? [], ...}: lib.elem tag tags) streams;
-    rm -rf /var/lib/mpd/playlists
+    makePlaylist = name: streams: pkgs.writeText "${name}.m3u" (lib.concatMapStringsSep "\n" (lib.getAttr "stream") streams);
-    install -d /var/lib/mpd/playlists
+  in
-    ln -sfn "${toString (makePlaylist "all" streams)}" "/var/lib/mpd/playlists/all.m3u"
+    map (tag:
-    ${lib.concatMapStringsSep "\n" (
+      tmpfilesConfig {
-        tag: let
+        type = "L+";
-          playlistStreams = lib.filter ({tags ? [], ...}: lib.elem tag tags) streams;
+        path = "/var/lib/mpd/playlists/${tag}.m3u";
-        in ''
+        mode = "0644";
-          ln -sfn "${toString (makePlaylist tag playlistStreams)}" "/var/lib/mpd/playlists/${tag}.m3u"
+        user = "mpd";
-        ''
+        group = "mpd";
-      )
+        argument = makePlaylist tag (tagStreams tag);
-      tags}
+      })
-  '';
+    tags
+    ++ [
+      (tmpfilesConfig {
+        type = "L+";
+        mode = "0644";
+        user = "mpd";
+        group = "mpd";
+        path = "/var/lib/mpd/playlist/all.m3u";
+        argument = makePlaylist "all" streams;
+      })
+    ];
 
   services.tuna = {
     enable = true;