From 65e1ab6bff14cdf9d7ca2b46c91462da9148db72 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 25 Sep 2022 14:46:39 +0200 Subject: [PATCH 1/5] ma gui: pulseaudio -> pipewire --- makefu/2configs/gui/base.nix | 9 +++---- makefu/2configs/hw/bluetooth.nix | 42 ++++++++++++++++---------------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix index 4ae816d5f..b2192c7f9 100644 --- a/makefu/2configs/gui/base.nix +++ b/makefu/2configs/gui/base.nix @@ -17,8 +17,10 @@ in { imports = [ ./urxvtd.nix + ./pipewire.nix ]; + services.xserver = { enable = true; layout = "us"; @@ -49,7 +51,7 @@ in }; users.users.${mainUser} = { - extraGroups = [ "audio" ]; + extraGroups = [ "pipewire" "audio" ]; packages = with pkgs;[ pavucontrol xlockmore @@ -57,10 +59,6 @@ in ]; }; - hardware.pulseaudio = { - enable = true; - # systemWide = true; - }; services.xserver.displayManager.sessionCommands = let xdefaultsfile = pkgs.writeText "Xdefaults" '' cat |derp < Date: Sun, 25 Sep 2022 18:20:34 +0200 Subject: [PATCH 2/5] ma gui/pipewire: init --- makefu/2configs/gui/pipewire.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 makefu/2configs/gui/pipewire.nix diff --git a/makefu/2configs/gui/pipewire.nix b/makefu/2configs/gui/pipewire.nix new file mode 100644 index 000000000..ed552fe2e --- /dev/null +++ b/makefu/2configs/gui/pipewire.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs, ... }: +# TODO test `alsactl init` after suspend to reinit mic +{ + security.rtkit.enable = true; + + environment.systemPackages = with pkgs; [ + alsaUtils + pulseaudio + ponymix + ]; + + services.pipewire = { + enable = true; + systemWide = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + jack.enable = true; + }; +} From d4a27e3a28c555ce0db9c180623d9f708be631c9 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 22 Oct 2022 10:00:59 +0200 Subject: [PATCH 3/5] ma rss: no need to look for sofa anymore --- makefu/1systems/gum/config.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index ff0c18795..26bfd0731 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -99,6 +99,7 @@ in { # services + # postgres backend # # { krebs.exim.enable = mkDefault true; } @@ -144,14 +145,18 @@ in { users.users.nextcloud.extraGroups = [ "download" ]; # nextcloud-setup fails as it cannot set permissions for nextcloud systemd.services.nextcloud-setup.serviceConfig.SuccessExitStatus = "0 1"; - fileSystems."/var/lib/nextcloud/data" = { - device = "/media/cloud/nextcloud-data"; - options = [ "bind" ]; - }; - fileSystems."/var/backup" = { - device = "/media/cloud/gum-backup"; - options = [ "bind" ]; - }; + systemd.tmpfiles.rules = [ + "L /var/lib/nextcloud/data - - - - /media/cloud/nextcloud-data" + "L /var/backup - - - - /media/cloud/gum-backup" + ]; + #fileSystems."/var/lib/nextcloud/data" = { + # device = "/media/cloud/nextcloud-data"; + # options = [ "bind" ]; + #}; + #fileSystems."/var/backup" = { + # device = "/media/cloud/gum-backup"; + # options = [ "bind" ]; + #}; } @@ -159,6 +164,7 @@ in { + ## # # From a612a6bbe4209824165a7c8fd18f0309e8d5385b Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 23 Oct 2022 13:43:24 +0200 Subject: [PATCH 4/5] ma pipewire: ensure pulseaudio is disabled --- makefu/2configs/gui/pipewire.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/makefu/2configs/gui/pipewire.nix b/makefu/2configs/gui/pipewire.nix index ed552fe2e..eb94f75b7 100644 --- a/makefu/2configs/gui/pipewire.nix +++ b/makefu/2configs/gui/pipewire.nix @@ -2,6 +2,7 @@ # TODO test `alsactl init` after suspend to reinit mic { security.rtkit.enable = true; + hardware.pulseaudio.enable = lib.mkForce false; environment.systemPackages = with pkgs; [ alsaUtils From e6513be864c7d27c36eb9d6ba504de65e48fde13 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 30 Oct 2022 08:51:18 +0100 Subject: [PATCH 5/5] ma music.omo: add alias --- krebs/3modules/makefu/default.nix | 2 ++ makefu/2configs/home/music.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index ffdd99274..0d5359989 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -131,6 +131,8 @@ in { "dcpp.omo.r" "backup.makefu.r" "torrent.omo.r" + "music.omo.r" + "music.makefu.r" ]; }; }; diff --git a/makefu/2configs/home/music.nix b/makefu/2configs/home/music.nix index 7dd8ca6e1..42c458275 100644 --- a/makefu/2configs/home/music.nix +++ b/makefu/2configs/home/music.nix @@ -18,6 +18,8 @@ in "navidrome.lan" "music" "music.lan" "musik" "musik.lan" + "music.omo.r" + "music.makefu.r" "music.makefu" ]; locations."/".proxyPass = "http://localhost:${toString port}";