summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2020-01-10 19:37:56 +0100
committerlassulus <lassulus@lassul.us>2020-01-10 19:37:56 +0100
commit4104b5d6d8e0acb80308e44e436a9cbe8863961a (patch)
treeb753694bb258edace7269bce688ced3bbd4b0133 /makefu/2configs
parentf491fac2025b2e99788be8e26181da1b26995e84 (diff)
parent5d3fbb2af9c1c7d166ca45cd9d119bd77a3acd80 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/homeautomation/default.nix1
-rw-r--r--makefu/2configs/hw/bluetooth.nix10
-rw-r--r--makefu/2configs/hw/network-manager.nix6
3 files changed, 14 insertions, 3 deletions
diff --git a/makefu/2configs/homeautomation/default.nix b/makefu/2configs/homeautomation/default.nix
index c4fef1bfc..4e9ac0ee3 100644
--- a/makefu/2configs/homeautomation/default.nix
+++ b/makefu/2configs/homeautomation/default.nix
@@ -108,7 +108,6 @@ in {
];
services.home-assistant = {
- package = pkgs.home-assistant.override { python3 = pkgs.python36; };
config = {
homeassistant = {
name = "Home"; time_zone = "Europe/Berlin";
diff --git a/makefu/2configs/hw/bluetooth.nix b/makefu/2configs/hw/bluetooth.nix
index e556b43c0..972753080 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 ];
+ });
+ })];
}
diff --git a/makefu/2configs/hw/network-manager.nix b/makefu/2configs/hw/network-manager.nix
index d7b262b91..1004ea06e 100644
--- a/makefu/2configs/hw/network-manager.nix
+++ b/makefu/2configs/hw/network-manager.nix
@@ -20,13 +20,17 @@
RestartSec = "5";
};
};
- networking.networkmanager.enable = true;
# nixOSUnstable
+ networking.networkmanager.enable = true;
networking.networkmanager.wifi = {
powersave = true;
scanRandMacAddress = true;
+ backend = "iwd";
};
+ services.gnome3.gnome-keyring.enable = true;
+ networking.wireless.iwd.enable = true;
+
state = [
"/etc/NetworkManager/system-connections" #NM stateful config files
];