WIP: mympd

feat(mpv): limit resolution
feat: more fonts
2026-03-16 18:21:07 +01:00 · 2022-04-15 01:16:50 +02:00 · 2022-04-14 13:40:11 +02:00 · 2022-04-13 09:01:23 +02:00 · 2022-04-13 09:01:23 +02:00 · 2022-04-11 23:02:02 +02:00
17 changed files with 529 additions and 150 deletions
--- a/configs/cloud.nix
+++ b/configs/cloud.nix
@@ -3,7 +3,9 @@
  lib,
  pkgs,
  ...
-}: {
+}: let
+  inherit (import <niveum/lib>) tmpfilesConfig;
+in {
  imports = [
    <niveum/modules/dropbox.nix>
  ];
@@ -12,13 +14,35 @@
    dropbox.enable = false;
  };

-  system.activationScripts.home-symlinks = ''
-    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
-    ln -sfn ${config.users.users.me.home}/cloud/Seafile/Uni ${config.users.users.me.home}/uni
-  '';
+  systemd.tmpfiles.rules = map tmpfilesConfig [
+    {
+      type = "L+";
+      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;
    services.nextcloud-client = {
      enable = true;
      startInBackground = true;
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -262,5 +262,6 @@ in {
    ./vscode.nix
    ./watson.nix
    ./zsh.nix
+    ./tor.nix
  ];
 }
--- a/configs/fonts.nix
+++ b/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
-      iosevka
-      libertine
+      jetbrains-mono
+      joypixels
+      libertinus
+      libre-bodoni
      lmodern
+      merriweather
      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
+      ocr-a
      roboto
      roboto-mono
      roboto-slab
+      scheherazade-new
      source-code-pro
-      source-serif-pro
      source-sans-pro
-      ubuntu_font_family
-      gfs-fonts
-      jetbrains-mono
-      twemoji-color-font
-      joypixels
+      source-serif-pro
+      theano
      tocharian-font
-    ];
-    fontconfig.defaultFonts = {
-      monospace = ["JetBrains Mono" "JoyPixels"];
-      serif = ["Roboto Slab"];
-      sansSerif = ["Roboto" "Noto Sans"];
-      emoji = ["JoyPixels"];
+      vistafonts
+      vollkorn
+      zilla-slab
+    ]; # google-fonts league-of-moveable-type
+    fontconfig.defaultFonts = let
+      emojiFont = "JoyPixels";
+    in {
+      monospace = ["JetBrains Mono" emojiFont];
+      serif = ["Merriweather"];
+      sansSerif = ["Cantarell" emojiFont];
+      emoji = [emojiFont];
    };
  };
 }
--- a/configs/mpv.nix
+++ b/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";
      };
--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -161,7 +161,7 @@ in {
    scripts.vimv
    scripts.swallow # window swallowing
    scripts.literature-quote
-    scripts.nav # json navigation
+    jless # less(1) for json
    scripts.notetags
    scripts.booksplit
    scripts.dmenurandr
--- a/configs/telegram-bots/astrology.nix
+++ b/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"];
--- a/configs/tor.nix
+++ b/configs/tor.nix
@@ -1,4 +1,4 @@
-{
+{pkgs, ...}: {
  services.tor.enable = true;
-  services.tor.torsocks.enable = true;
+  environment.systemPackages = [pkgs.tor];
 }
--- a/flake.lock
+++ b/flake.lock
@@ -22,11 +22,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1647175256,
-        "narHash": "sha256-7H+veXPM7IwdN1DoZqliwb9sghlN56koV5dnCu1kpsc=",
+        "lastModified": 1648834319,
+        "narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "a8d00f5c038cf7ec54e7dac9c57b171c1217f008",
+        "rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0",
        "type": "github"
      },
      "original": {
@@ -62,11 +62,11 @@
    "menstruation-backend": {
      "flake": false,
      "locked": {
-        "lastModified": 1634573652,
-        "narHash": "sha256-FIj8oCOJO+Wqxr2o5MMqIShvzMJud4iUq3o8y4NIRvw=",
+        "lastModified": 1649545504,
+        "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": 1647992509,
-        "narHash": "sha256-AG40Nt5OWz0LBs5p457emOuwLKOvTtcv/2fUdnEN3Ws=",
+        "lastModified": 1649490789,
+        "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d2caa9377539e3b5ff1272ac3aa2d15f3081069f",
+        "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",
        "type": "github"
      },
      "original": {
@@ -125,11 +125,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1648337267,
-        "narHash": "sha256-8DRg8UDvs63iaIaHEbWG7/lnD9ImQlMNsTZMY3PvFLc=",
+        "lastModified": 1649541735,
+        "narHash": "sha256-JdOywA2jcdGCxNgu0dJA7ZNtaV7sS0HwuZg9YaXd94c=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6de161729c81dc98e844793cc9c8fda29d5ef62a",
+        "rev": "c2b6e029cd1efa0efd37daab89264ef040ae5669",
        "type": "github"
      },
      "original": {
@@ -194,11 +194,11 @@
    "scripts": {
      "flake": false,
      "locked": {
-        "lastModified": 1648314795,
-        "narHash": "sha256-hGIXkAcGiJnVXnl8kigZpI3VFrLmAr2+yr85hi5JwP0=",
+        "lastModified": 1648400983,
+        "narHash": "sha256-I9ADWgUN1orbnXPBW4kulHpv8wkx6C8zsQcg9wphpPg=",
        "owner": "kmein",
        "repo": "scripts",
-        "rev": "d1d525b92a34e55b1ad886807c284106e58716b2",
+        "rev": "f5df67a2416d8f05a7dbfea269c44668854c7887",
        "type": "github"
      },
      "original": {
@@ -210,11 +210,11 @@
    "stockholm": {
      "flake": false,
      "locked": {
-        "lastModified": 1648214990,
-        "narHash": "sha256-rptATGq+jcpL+P+Cr6d3OajV6zYkbHPWlt3aQNZI2TY=",
+        "lastModified": 1649089964,
+        "narHash": "sha256-ybuVI8rnpMyBUoyoIXJ1e3QBMBIOoEgKTiFzIPfzy8A=",
        "ref": "master",
-        "rev": "ae9c0b12710b5361d0d45510eb401eebfc1b3fb0",
-        "revCount": 10497,
+        "rev": "b3833baee96d7bce2c54295110b40c646468a1ff",
+        "revCount": 10500,
        "type": "git",
        "url": "https://cgit.lassul.us/stockholm"
      },
--- a/lib/streams.nix
+++ b/lib/streams.nix
--- a/systems/makanek/hedgedoc.nix
+++ b/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} = {
-    owner = "codimd";
-    group = "codimd";
-    umask = "0002";
-  };
+  systemd.tmpfiles.rules = [
+    (tmpfilesConfig {
+      user = "codimd";
+      group = "codimd";
+      mode = "0755";
+      type = "d";
+      path = backupLocation;
+    })
+  ];

  systemd.services.hedgedoc-backup = {
    description = "Hedgedoc backup service";
--- a/systems/makanek/monitoring/default.nix
+++ b/systems/makanek/monitoring/default.nix
@@ -238,16 +238,6 @@ in {
        }
      ];
    }
-    {
-      job_name = "tahina";
-      static_configs = [
-        {
-          targets = [
-            "tahina.r:${toString config.services.prometheus.exporters.node.port}"
-          ];
-        }
-      ];
-    }
  ];

  services.prometheus.exporters.blackbox = {
--- a/systems/makanek/weechat.nix
+++ b/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'';
--- a/systems/tahina/configuration.nix
+++ b/systems/tahina/configuration.nix
@@ -11,23 +11,22 @@ in {
    <niveum/configs/spacetime.nix>
    <niveum/modules/retiolum.nix>
    <niveum/configs/sshd.nix>
-    {
-      console.keyMap = "de";
-      i18n.defaultLocale = "de_DE.UTF-8";
-      services.xserver = {
-        layout = "de";
-        libinput.enable = true;
-      };
-    }
-    {
-      nix.nixPath = ["/var/src"];
-    }
  ];

+  nix.nixPath = ["/var/src"];
+
+  console.keyMap = "de";
+  i18n.defaultLocale = "de_DE.UTF-8";
+  services.xserver = {
+    layout = "de";
+    libinput.enable = true;
+  };
+
  users.users.xenos = {
    name = "xenos";
    password = "xenos";
    isNormalUser = true;
+    extraGroups = ["networkmanager"];
  };

  services.xserver = {
--- a/systems/tahina/hardware-configuration.nix
+++ b/systems/tahina/hardware-configuration.nix
@@ -26,17 +26,23 @@
    extraModulePackages = [];
  };

-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/e9a8bd34-61eb-4317-888d-bd7d6248a906";
-    fsType = "xfs";
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/e9a8bd34-61eb-4317-888d-bd7d6248a906";
+      fsType = "xfs";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/9B2F-31E1";
+      fsType = "vfat";
+    };
  };

-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/9B2F-31E1";
-    fsType = "vfat";
-  };
-
-  swapDevices = [];
+  swapDevices = [
+    {
+      device = "/swapfile";
+      size = 2048;
+    }
+  ];

  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
--- 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/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";
+    };
+  };
+}
--- a/systems/zaatar/tuna.nix
+++ b/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,13 +72,31 @@ in {
    extraStopCommands = firewall.removeRules rules;
  };

-  system.activationScripts.mpd-playlists = let
-    playlistFile = pkgs.writeText "radio.m3u" (lib.concatMapStringsSep "\n" (lib.getAttr "stream") streams);
-  in ''
-    rm -rf /var/lib/mpd/playlists
-    install -d /var/lib/mpd/playlists
-    ln -sfn "${toString playlistFile}" "/var/lib/mpd/playlists/radio.m3u"
-  '';
+  systemd.tmpfiles.rules = let
+    tags = lib.lists.unique (lib.concatMap ({tags ? [], ...}: tags) streams);
+    tagStreams = tag: lib.filter ({tags ? [], ...}: lib.elem tag tags) streams;
+    makePlaylist = name: streams: pkgs.writeText "${name}.m3u" (lib.concatMapStringsSep "\n" (lib.getAttr "stream") streams);
+  in
+    map (tag:
+      tmpfilesConfig {
+        type = "L+";
+        path = "/var/lib/mpd/playlists/${tag}.m3u";
+        mode = "0644";
+        user = "mpd";
+        group = "mpd";
+        argument = makePlaylist tag (tagStreams tag);
+      })
+    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;
@@ -87,33 +106,15 @@ in {
      logo ? "https://picsum.photos/seed/${builtins.hashString "md5" stream}/300",
      stream,
      station,
+      ...
    }: {inherit id desc logo stream station;})
    streams;
-    webPort = 8080;
+    webPort = 7044;
  };

-  systemd.services.tuna-stations = let
-    stations = lib.lists.imap0 (id: {
-      desc ? "",
-      logo ? "https://picsum.photos/seed/${builtins.hashString "md5" stream}/300",
-      stream,
-      station,
-    }: {inherit id desc logo stream station;})
-    streams;
-    stationsJson = (pkgs.formats.json {}).generate "stations.json" stations;
-  in {
-    enable = false;
-    wantedBy = ["tuna.service"];
-    startAt = "hourly";
-    script = ''
-      mkdir -p /etc/tuna
-      antenne_asb_url=$(
-        ${pkgs.curl}/bin/curl -sS 'https://www.caster.fm/widgets/em_player.php?jsinit=true&uid=529295&t=blue&c=' \
-          | grep streamUrl \
-          | sed ${lib.escapeShellArg "s/^.*'\\([^']*\\)'.*/\\1/"}
-      )
-      ${pkgs.jq}/bin/jq "map(if .station == \"Antenne ASB\" then .stream |= \"$antenne_asb_url\" else . end)" < ${stationsJson} > /etc/tuna/stations.json
-    '';
+  services.ympd = {
+    enable = true;
+    mpd.port = config.services.mpd.network.port;
  };

  services.nginx = {
@@ -125,7 +126,7 @@ in {
    virtualHosts."radio.kmein.r" = {
      basicAuth.dj = password;
      locations."/" = {
-        proxyPass = "http://127.0.0.1:${toString config.services.tuna.webPort}";
+        proxyPass = "http://127.0.0.1:${config.services.ympd.webPort}";
        proxyWebsockets = true;
      };
    };
Author	SHA1	Message	Date
Kierán Meinhardt	d06d0a9de4	WIP: mympd	2022-04-15 01:16:50 +02:00
Kierán Meinhardt	d4e82500ae	feat(mpv): limit resolution	2022-04-14 13:40:11 +02:00
Kierán Meinhardt	6aa9be6f70	feat: more fonts	2022-04-13 09:01:23 +02:00
Kierán Meinhardt	4e362678ca	feat(astrology): pause bot	2022-04-13 09:01:23 +02:00
Kierán Meinhardt	a2081dece4	feat(weechat): block people	2022-04-11 23:02:02 +02:00
Kierán Meinhardt	98cf188a17	feat: use more tmpfiles.d	2022-04-10 19:38:47 +02:00
Kierán Meinhardt	4932c7c08a	chore(update)	2022-04-10 09:13:34 +02:00
Kierán Meinhardt	c8a6991f09	fix(menstruation): update to pinning version	2022-04-10 00:36:07 +02:00
Kierán Meinhardt	5d3c9a67ab	fix(monitoring): remove tahina	2022-04-04 18:35:32 +02:00
github-actions[bot]	659a888c3d	flake.lock: Update Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/a8d00f5c038cf7ec54e7dac9c57b171c1217f008' (2022-03-13) → 'github:nix-community/home-manager/0bdbdea2e26c984b096f4f7d10e3c88536a980b0' (2022-04-01) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d2caa9377539e3b5ff1272ac3aa2d15f3081069f' (2022-03-22) → 'github:NixOS/nixpkgs/6f88260faaaa3cda8f4e478be72be6c0861c47ad' (2022-04-01) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/6de161729c81dc98e844793cc9c8fda29d5ef62a' (2022-03-26) → 'github:NixOS/nixpkgs/21299f3dd3ff475f19bc8933f30ebb6a135799f1' (2022-04-02) • Updated input 'scripts': 'github:kmein/scripts/d1d525b92a34e55b1ad886807c284106e58716b2' (2022-03-26) → 'github:kmein/scripts/f5df67a2416d8f05a7dbfea269c44668854c7887' (2022-03-27) • Updated input 'stockholm': 'git+https://cgit.lassul.us/stockholm?ref=master&rev=ae9c0b12710b5361d0d45510eb401eebfc1b3fb0' (2022-03-25) → 'git+https://cgit.lassul.us/stockholm?ref=master&rev=b9e0a7ec71e0318a992ff2b275a6aaee3cef63bd' (2022-03-28)	2022-04-03 00:47:09 +00:00
Kierán Meinhardt	26908b03a3	chore(tahina): clean	2022-03-30 18:29:16 +02:00
Kierán Meinhardt	feccea5234	feat(streams): add soma playlist	2022-03-30 18:29:04 +02:00
Kierán Meinhardt	8ffb0bd245	feat: jless	2022-03-30 09:17:58 +02:00
Kierán Meinhardt	c1b777b689	feat(tor): enable	2022-03-29 20:13:29 +02:00
Kierán Meinhardt	e85a8f7634	feat(mpd): tag stations	2022-03-29 20:13:29 +02:00
Kierán Meinhardt	25bc6f573c	chore(tahina): clean	2022-03-29 09:54:56 +02:00
Kierán Meinhardt	4b5915354b	fix(nextcloud): start with gnome-keyring	2022-03-29 09:54:37 +02:00
Kierán Meinhardt	43ab6b3210	feat(tahina): init as guest laptop	2022-03-29 01:07:01 +02:00