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/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 { + ## # # 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 <