summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2020-01-10 09:35:45 +0100
committermakefu <github@syntax-fehler.de>2020-01-10 09:35:45 +0100
commit8c0cf30a2d271c3360d356209350774e634a4543 (patch)
tree21272ae90687571ba3d6ba29937c5266e46ee9bd
parent6cbfc2514f6ab54829f9aac41ccf0f887b03ffb4 (diff)
krebs module: add shack network to filebitch
-rw-r--r--krebs/3modules/krebs/default.nix6
-rw-r--r--makefu/2configs/hw/bluetooth.nix10
2 files changed, 15 insertions, 1 deletions
diff --git a/krebs/3modules/krebs/default.nix b/krebs/3modules/krebs/default.nix
index 1b7d971f..de09b425 100644
--- a/krebs/3modules/krebs/default.nix
+++ b/krebs/3modules/krebs/default.nix
@@ -38,6 +38,12 @@ in {
ci = true;
cores = 4;
nets = {
+ shack = {
+ ip4.addr = "10.42.0.50" ;
+ aliases = [
+ "filebitch.shack"
+ ];
+ };
retiolum = {
ip4.addr = "10.243.189.130";
aliases = [ "filebitch.r" ];
diff --git a/makefu/2configs/hw/bluetooth.nix b/makefu/2configs/hw/bluetooth.nix
index e556b43c..97275308 100644
--- a/makefu/2configs/hw/bluetooth.nix
+++ b/makefu/2configs/hw/bluetooth.nix
@@ -5,6 +5,7 @@
hardware.pulseaudio = {
enable = true;
package = pkgs.pulseaudioFull;
+ extraModules = [ pkgs.pulseaudio-modules-bt ];
# systemWide = true;
support32Bit = true;
configFile = pkgs.writeText "default.pa" ''
@@ -23,7 +24,7 @@
load-module module-switch-on-port-available
'';
};
-
+ services.blueman.enable = true;
# presumably a2dp Sink
# Enable profile:
## pacmd set-card-profile "$(pactl list cards short | egrep -o bluez_card[[:alnum:]._]+)" a2dp_sink
@@ -32,10 +33,17 @@
hardware.bluetooth = {
enable = true;
powerOnBoot = false;
+
extraConfig = ''
[general]
Enable=Source,Sink,Media,Socket
'';
};
services.dbus.packages = [ pkgs.blueman ];
+ nixpkgs.overlays = [
+ (self: super: {
+ blueman = super.blueman.overrideAttrs (oldAttrs: {
+ buildInputs = oldAttrs.buildInputs ++ [ self.gnome3.adwaita-icon-theme ];
+ });
+ })];
}