6 files changed, 66 insertions, 9 deletions
diff --git a/makefu/2configs/hw/bluetooth.nix b/makefu/2configs/hw/bluetooth.nix
new file mode 100644
index 000000000..85c3190ff
--- /dev/null
+++ b/makefu/2configs/hw/bluetooth.nix
@@ -0,0 +1,39 @@
+{ pkgs, ... }:
+{ # 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;
+}
diff --git a/makefu/2configs/hw/irtoy.nix b/makefu/2configs/hw/irtoy.nix
new file mode 100644
index 000000000..688f1b2b9
--- /dev/null
+++ b/makefu/2configs/hw/irtoy.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+{
+
+  users.users.makefu.packages = with pkgs; [
+    lirc
+  ];
+
+  users.extraUsers.${config.krebs.build.user.name}.extraGroups = [ "dialout" ];
+
+  services.udev.extraRules = ''
+    SUBSYSTEMS=="usb", ATTRS{idProduct}=="fd08", ATTRS{idVendor}=="04d8", SYMLINK+="irtoy", MODE="0666", GROUP="dialout"
+  '';
+}
+
diff --git a/makefu/2configs/rad1o.nix b/makefu/2configs/hw/rad1o.nix
index 6eca69e0c..6eca69e0c 100644
--- a/makefu/2configs/rad1o.nix
+++ b/makefu/2configs/hw/rad1o.nix
diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix
index 2bb438f16..b6554e040 100644
--- a/makefu/2configs/tools/all.nix
+++ b/makefu/2configs/tools/all.nix
@@ -5,6 +5,7 @@
     ./core.nix
     ./core-gui.nix
     ./dev.nix
+    ./desktop.nix
     ./extra-gui.nix
     ./games.nix
     ./media.nix
diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
index 7e9a459c3..604288904 100644
--- a/makefu/2configs/tools/core.nix
+++ b/makefu/2configs/tools/core.nix
@@ -24,7 +24,6 @@
 
     # io
     pv
-    sshpass
     usbutils
     p7zip
     hdparm
@@ -39,11 +38,6 @@
     wol
     iftop
 
-    mkpasswd
-    mutt
-    weechat
-    tmux
-
     # stockholm
     git
     gnumake
@@ -55,8 +49,5 @@
     rxvt_unicode.terminfo
     krebspaste
 
-    # TODO:
-    taskwarrior
-    pass
   ];
 }
diff --git a/makefu/2configs/tools/desktop.nix b/makefu/2configs/tools/desktop.nix
new file mode 100644
index 000000000..1fe03e111
--- /dev/null
+++ b/makefu/2configs/tools/desktop.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  users.users.makefu.packages = with pkgs; [
+    taskwarrior
+    pass
+    mutt
+    weechat
+    tmux
+  ];
+}