diff --git a/hosts/profiles/desktop/default.nix b/hosts/profiles/desktop/default.nix index ed716255..8011ceab 100644 --- a/hosts/profiles/desktop/default.nix +++ b/hosts/profiles/desktop/default.nix @@ -67,6 +67,7 @@ in { unstable.liferea unstable.gh unstable.flyctl + unstable.sublime-music kooha light diff --git a/hosts/profiles/jacket/default.nix b/hosts/profiles/jacket/default.nix index 39313b9e..b362a298 100644 --- a/hosts/profiles/jacket/default.nix +++ b/hosts/profiles/jacket/default.nix @@ -2,10 +2,10 @@ { services.jackett = { enable = true; - host = "0.0.0.0"; port = 8011; user = "jackett"; group = "transmission"; + package = pkgs.unstable.jackett; }; services.nginx.virtualHosts."jackett.mossnet.lan" = { enableACME = false; @@ -19,10 +19,8 @@ }; services.lidarr = { enable = true; - host = "0.0.0.0"; - port = 8012; - user = "lidarr"; - group = "transmission"; + user = "headphones"; + group = "audio"; }; services.nginx.virtualHosts."lidarr.mossnet.lan" = { enableACME = false; @@ -30,7 +28,7 @@ locations."/" = { extraConfig = '' - proxy_pass http://127.0.0.1:8012/; + proxy_pass http://127.0.0.1:8686/; ''; }; }; diff --git a/hosts/profiles/transmission/default.nix b/hosts/profiles/transmission/default.nix index 9b66b636..0b0ac4b4 100644 --- a/hosts/profiles/transmission/default.nix +++ b/hosts/profiles/transmission/default.nix @@ -1,5 +1,6 @@ { pkgs, ... }: { + environment.systemPackages = [ pkgs.beets ]; services.transmission = { enable = true; settings = { @@ -9,11 +10,10 @@ script-torrent-done-enabled = true; # Normally, I would write this into the homedir with home-manager # And explictly set the dir to be the output of the home-manager location - # But this seems better, if it'll work? script-torrent-done-filename = pkgs.writeShellScript "beet-import.sh" '' #!/usr/bin/env bash -beet import -ql "$TR_TORRENT_DIR" +beet -p fetchart import -l /home/anish/music.log -q -g "$TR_TORRENT_DIR" ''; rpc-url = "/transmission/rpc/"; download-dir = "/mnt/two/new-music"; diff --git a/modules/nixos/gonic.nix b/modules/nixos/gonic.nix index c3374977..354d954e 100644 --- a/modules/nixos/gonic.nix +++ b/modules/nixos/gonic.nix @@ -57,7 +57,7 @@ in { #... }; serviceConfig = { - ExecStart = "${pkgs.gonic}/bin/gonic -config-path /etc/gonic/config"; + ExecStart = "${pkgs.gonic}/bin/gonic -config-path /etc/gonic/config -scan-watcher-enabled -scan-interval 600"; WorkingDirectory = dataFolder; TimeoutStopSec = "20"; KillMode = "process"; diff --git a/overlays/default.nix b/overlays/default.nix index 02df4d94..9399d530 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -11,7 +11,16 @@ propagatedBuildInputs = prevAttrs.propagatedBuildInputs ++ [ final.python3.pkgs.jsonschema ]; # allow kobo sync stuff }); mautrix-signal = prev.mautrix-signal.overrideAttrs (prevAttrs: rec { - buildInputs = prevAttrs.propagatedBuildInputs ++ [ final.python3.pkgs.aiosqlite ]; # We're using sqlite and upstream doesn't package this dependency + buildInputs = prevAttrs.buildInputs ++ [ final.python3.pkgs.aiosqlite ]; # We're using sqlite and upstream doesn't package this dependency + withGoolm = true; + }); + # headphones is not very stable... + # this is fixed in newer commits, but no release has gone out + # patching whitespace with sed is insane + headphones = prev.headphones.overrideAttrs (prevAttrs: rec { + patchPhase = '' + sed -i '1395s/^\([[:space:]]*\).*/\1"cat": "3000",/' headphones/searcher.py + ''; }); wallabag = prev.wallabag.overrideAttrs (attrs: {