diff --git a/flake.lock b/flake.lock index 4c6f23b..c3941fd 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1643452512, - "narHash": "sha256-X+ZZhxzSSI0UyNVbVn3YH53Iiai0cUPZLq2ls751z4I=", + "lastModified": 1643787431, + "narHash": "sha256-8IwuVgXulRE3ZWq6z8mytarawC32pKPKR20EyDtSH+w=", "owner": "serokell", "repo": "deploy-rs", - "rev": "3180b55ad44777edd90c08f9f9d4df74ec1549b9", + "rev": "4154ba1aaaf7333a916384c348d867d03b6f1409", "type": "github" }, "original": { @@ -25,11 +25,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1643411645, - "narHash": "sha256-q1TjWmK1MeGNfcU8ud11v9ZTqq2UI8YiCVKCD2MeAEk=", + "lastModified": 1643933104, + "narHash": "sha256-NZPuFxRsZKN8pjRuHPpzlMyt6JQhcjiduBG8bMghSjE=", "owner": "nix-community", "repo": "home-manager", - "rev": "acf824c9ed70f623b424c2ca41d0f6821014c67c", + "rev": "63dccc4e60422c1db2c3929b2fd1541f36b7e664", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1643347846, - "narHash": "sha256-O0tyXF//ppRpe9yT1Uu5n34yI2MWDyY6ZiJ4Qn5zIkE=", + "lastModified": 1643805626, + "narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5bb20f9dc70e9ee16e21cc404b6508654931ce41", + "rev": "554d2d8aa25b6e583575459c297ec23750adb6cb", "type": "github" }, "original": { @@ -83,11 +83,11 @@ }, "utils": { "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", "type": "github" }, "original": { diff --git a/home/apps/clementine.nix b/home/apps/clementine.nix deleted file mode 100644 index 1ed4e58..0000000 --- a/home/apps/clementine.nix +++ /dev/null @@ -1 +0,0 @@ -{ config, pkgs, ... }: { home.packages = with pkgs; [ clementine ]; } diff --git a/home/apps/nicotine-plus.nix b/home/apps/nicotine-plus.nix new file mode 100644 index 0000000..5617e76 --- /dev/null +++ b/home/apps/nicotine-plus.nix @@ -0,0 +1 @@ +{ config, pkgs, ... }: { home.packages = with pkgs; [ nicotine-plus ]; } diff --git a/home/apps/strawberry.nix b/home/apps/strawberry.nix new file mode 100644 index 0000000..9f13c7c --- /dev/null +++ b/home/apps/strawberry.nix @@ -0,0 +1 @@ +{ config, pkgs, ... }: { home.packages = with pkgs; [ strawberry ]; } diff --git a/hosts/hetzner-vm/services/mpd.nix b/hosts/hetzner-vm/services/mpd.nix index 25b495d..5c5a42c 100644 --- a/hosts/hetzner-vm/services/mpd.nix +++ b/hosts/hetzner-vm/services/mpd.nix @@ -1,5 +1,5 @@ { pkgs, lib, tree, ... }: { - imports = [ ./mpd-broadcast/broadcast.nix ]; + #imports = [ ./mpd-broadcast/broadcast.nix ]; environment.systemPackages = with pkgs; [ mpc_cli ]; @@ -15,15 +15,20 @@ }]; extraConfig = '' host_permissions "127.0.0.1 read,add,control,admin" - samplerate_converter "1" + samplerate_converter "0" + metadata_to_use "title,artist" + auto_update "yes" + volume_normalization "yes" + audio_buffer_size "4096" + replaygain "track" audio_output_format "44100:16:2" audio_output { type "httpd" name "HTTP Music Out" encoder "opus" port "8012" - bitrate "64000" - format "48000:16:2" + bitrate "96000" + format "44100:16:2" always_on "yes" tags "yes" } diff --git a/hosts/lappy/lappy.nix b/hosts/lappy/lappy.nix index 3416ddb..7f2bf06 100644 --- a/hosts/lappy/lappy.nix +++ b/hosts/lappy/lappy.nix @@ -59,9 +59,10 @@ home.apps.telegram home.apps.quassel home.apps.mpv - home.apps.clementine + home.apps.strawberry home.apps.file-roller home.apps.nautilus + home.apps.nicotine-plus home.programming home.programming.languages.go diff --git a/overlay/default.nix b/overlay/default.nix index c7baf01..e7f91f9 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -12,5 +12,4 @@ final: prev: { }; roc-toolkit-patched = final.callPackage ./roc-toolkit-patched { }; roc-send-pcm = final.callPackage ./roc-send-pcm { }; - }