From 5dd486eabdec439cc67b2341519d1afdd577c34f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 31 May 2018 10:33:08 +0200
Subject: ma bluetooth: separate file

---
 makefu/1systems/x/config.nix | 47 +++++++-------------------------------------
 1 file changed, 7 insertions(+), 40 deletions(-)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 93bb27efe..451689f91 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -19,6 +19,7 @@ with import <stockholm/lib>;
 
       # Debugging
       # <stockholm/makefu/2configs/disable_v6.nix>
+      # <stockholm/makefu/2configs/pyload.nix>
 
       # Testing
       # <stockholm/makefu/2configs/deployment/gitlab.nix>
@@ -67,7 +68,9 @@ with import <stockholm/lib>;
       # <stockholm/makefu/2configs/hw/rtl8812au.nix>
       <stockholm/makefu/2configs/hw/network-manager.nix>
       <stockholm/makefu/2configs/hw/stk1160.nix>
-      # <stockholm/makefu/2configs/rad1o.nix>
+      <stockholm/makefu/2configs/hw/irtoy.nix>
+      <stockholm/makefu/2configs/hw/bluetooth.nix>
+      # <stockholm/makefu/2configs/hw/rad1o.nix>
 
       # Filesystem
       <stockholm/makefu/2configs/fs/sda-crypto-root-home.nix>
@@ -103,44 +106,9 @@ with import <stockholm/lib>;
           ];
         };
       }
-      { # bluetooth+pulse config
-        # for blueman-applet
-        users.users.makefu.packages = [
-          pkgs.blueman
-        ];
-        hardware.pulseaudio = {
-          enable = true;
-          package = pkgs.pulseaudioFull;
-          # systemWide = true;
-          support32Bit = true;
-          configFile = pkgs.writeText "default.pa" ''
-            load-module module-udev-detect
-            load-module module-bluetooth-policy
-            load-module module-bluetooth-discover
-            load-module module-native-protocol-unix
-            load-module module-always-sink
-            load-module module-console-kit
-            load-module module-systemd-login
-            load-module module-intended-roles
-            load-module module-position-event-sounds
-            load-module module-filter-heuristics
-            load-module module-filter-apply
-            load-module module-switch-on-connect
-            load-module module-switch-on-port-available
-            '';
-        };
-
-        # presumably a2dp Sink
-        # Enable profile:
-        ## pacmd set-card-profile "$(pactl list cards short | egrep -o bluez_card[[:alnum:]._]+)" a2dp_sink
-        hardware.bluetooth.extraConfig = '';
-          [general]
-          Enable=Source,Sink,Media,Socket
-        '';
-
-        # connect via https://nixos.wiki/wiki/Bluetooth#Using_Bluetooth_headsets_with_PulseAudio
-        hardware.bluetooth.enable = true;
-      }
+      # {
+      #   services.zerotierone.enable = true;
+      # }
 
     ];
 
@@ -166,7 +134,6 @@ with import <stockholm/lib>;
   # hard dependency because otherwise the device will not be unlocked
   boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
 
-  nix.package = pkgs.nixUnstable;
   environment.systemPackages = [ pkgs.passwdqc-utils pkgs.nixUnstable ];
   nixpkgs.overlays = [ (import <python/overlay.nix>) ];
 
-- 
cgit v1.2.3


From b31dff172455519e93292ccee5e3c8441a5888e3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 31 May 2018 10:33:48 +0200
Subject: ma omo.r: also deploy torrent secrets

---
 makefu/1systems/omo/source.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/omo/source.nix b/makefu/1systems/omo/source.nix
index 94fd9cbe6..da0d87aad 100644
--- a/makefu/1systems/omo/source.nix
+++ b/makefu/1systems/omo/source.nix
@@ -1,3 +1,4 @@
 import <stockholm/makefu/source.nix> {
   name="omo";
+  torrent = true;
 }
-- 
cgit v1.2.3