From 37033049ed98bb485fab7b860f901506382bf539 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 28 Aug 2023 13:11:45 -0700 Subject: [PATCH] update nixos --- flake.lock | 6 ++-- flammea.nix | 84 ++++++++++++++++++++++++++--------------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 6bcfaff..ca43185 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1692447944, - "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=", + "lastModified": 1693158576, + "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d", + "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780", "type": "github" }, "original": { diff --git a/flammea.nix b/flammea.nix index 7ea50b4..bdd5787 100644 --- a/flammea.nix +++ b/flammea.nix @@ -150,46 +150,46 @@ let mpdStreamingPort = 8080; in system.stateVersion = "22.11"; - services.mpd = { - enable = true; - # network.listenAddress = "127.0.0.1"; - # musicDirectory = "/mnt/aplysia/music"; - musicDirectory = "/home/gebner/Music"; - user = "gebner"; - extraConfig = '' - bind_to_address "100.125.210.32" - - # audio_output { - # type "alsa" - # name "dac" - # device "sysdefault:CARD=QAMP" - # } - - audio_output { - type "pulse" - name "pulse" - server "127.0.0.1" - } - - audio_output { - type "httpd" - name "http" - encoder "flac" - port "${toString mpdStreamingPort}" - } - - replaygain "auto" - restore_paused "yes" - ''; - }; - - environment.etc."pipewire/pipewire-pulse.conf.d/listen.conf".text = '' - pulse.properties = { - server.address = [ - "unix:native" - "tcp:127.0.0.1:4713" - # "tcp:100.97.134.100:4713" - ] - } - ''; + # services.mpd = { + # enable = true; + # # network.listenAddress = "127.0.0.1"; + # # musicDirectory = "/mnt/aplysia/music"; + # musicDirectory = "/home/gebner/Music"; + # user = "gebner"; + # extraConfig = '' + # bind_to_address "100.125.210.32" + # + # # audio_output { + # # type "alsa" + # # name "dac" + # # device "sysdefault:CARD=QAMP" + # # } + # + # audio_output { + # type "pulse" + # name "pulse" + # server "127.0.0.1" + # } + # + # audio_output { + # type "httpd" + # name "http" + # encoder "flac" + # port "${toString mpdStreamingPort}" + # } + # + # replaygain "auto" + # restore_paused "yes" + # ''; + # }; + # + # environment.etc."pipewire/pipewire-pulse.conf.d/listen.conf".text = '' + # pulse.properties = { + # server.address = [ + # "unix:native" + # "tcp:127.0.0.1:4713" + # # "tcp:100.97.134.100:4713" + # ] + # } + # ''; }