summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2020-01-14 21:35:10 +0100
committertv <tv@krebsco.de>2020-01-14 21:35:10 +0100
commit67cda2940f1228063efd09e08d39fad12fe9a0ef (patch)
treeac639d44c2e6378265621988b19c345d891c4909 /makefu
parent525c955b5f955dd23ec4d060ebd1ef1e149760ce (diff)
parenta01e3174e04fc946e7dfaf3569919aacf5a6763d (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu')
-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
-rw-r--r--makefu/5pkgs/studio-link/default.nix64
4 files changed, 33 insertions, 48 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
];
diff --git a/makefu/5pkgs/studio-link/default.nix b/makefu/5pkgs/studio-link/default.nix
index 6fa40139b..8c796b43b 100644
--- a/makefu/5pkgs/studio-link/default.nix
+++ b/makefu/5pkgs/studio-link/default.nix
@@ -1,44 +1,13 @@
-{ stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups
-, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2, nspr
-, nss, pango, systemd, xorg, utillinuxMinimal, unzip, openssl, zlib, libjack2 }:
+{ stdenv
+, fetchurl
+, alsaLib
+, unzip
+, openssl_1_0_2
+, zlib
+, libjack2
+, autoPatchelfHook
+}:
-let
- libPath = stdenv.lib.makeLibraryPath [
- alsaLib
- atk
- cairo
- cups
- dbus
- expat
- fontconfig
- freetype
- gcc.cc
- gdk_pixbuf
- glib
- gnome2.GConf
- gtk2
- nspr
- nss
- pango
-
- openssl
- zlib
- libjack2
-
- systemd
- xorg.libX11
- xorg.libXScrnSaver
- xorg.libXcomposite
- xorg.libXcursor
- xorg.libXdamage
- xorg.libXext
- xorg.libXfixes
- xorg.libXi
- xorg.libXrandr
- xorg.libXrender
- xorg.libXtst
- ];
-in
stdenv.mkDerivation rec {
name = "studio-link-${version}";
version = "17.03.1-beta";
@@ -46,19 +15,24 @@ stdenv.mkDerivation rec {
url = "https://github.com/Studio-Link-v2/backend/releases/download/v${version}/studio-link-standalone-linux.zip";
sha256 = "1y21nymin7iy64hcffc8g37fv305b1nvmh944hkf7ipb06kcx6r9";
};
- buildInputs = [ unzip ];
- phases = ["unpackPhase" "installPhase" "fixupPhase"];
+ nativeBuildInputs = [ unzip autoPatchelfHook ];
+ buildInputs = [
+ alsaLib
+
+ openssl_1_0_2
+ zlib
+ libjack2
+ ];
+
unpackPhase = ''
unzip $src
'';
+
installPhase = ''
mkdir -p $out/bin
cp studio-link-standalone $out/bin/studio-link
chmod +x $out/bin/studio-link
'';
- postFixup = ''
- patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}:\$ORIGIN" "$out/bin/studio-link"
- '';
meta = with stdenv.lib; {
homepage = https://studio-link.com;