From 5459fddb01990c935bb578d618606ccec1ebc11a Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Thu, 11 Nov 2021 19:47:18 +0000
Subject: [PATCH] koishi: Mic mute + networkmanager

---
 config/hosts/koishi.nix                     |  4 +--
 config/profiles/hardware/default.nix        |  2 +-
 config/profiles/hardware/networkmanager.nix | 29 +++++++++++++++++++++
 config/users/kat/sway/sway.nix              |  1 +
 overlays/zfsUnstable/default.nix            |  5 ----
 5 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 config/profiles/hardware/networkmanager.nix
 delete mode 100644 overlays/zfsUnstable/default.nix

diff --git a/config/hosts/koishi.nix b/config/hosts/koishi.nix
index 4d5d05e2..6e21e323 100644
--- a/config/hosts/koishi.nix
+++ b/config/hosts/koishi.nix
@@ -55,7 +55,7 @@
     networking = {
       hostId = "dddbb888";
       useDHCP = false;
-      wireless = {
+      /* wireless = {
         enable = true;
         userControlled.enable = true;
         interfaces = singleton "wlp3s0";
@@ -65,7 +65,7 @@
           inherit (config.network.addresses.private.nixos.ipv4) address;
           prefixLength = 24;
         };
-      };
+      }; */
       defaultGateway = config.network.privateGateway;
     };
 
diff --git a/config/profiles/hardware/default.nix b/config/profiles/hardware/default.nix
index 7abe2551..82a9caa3 100644
--- a/config/profiles/hardware/default.nix
+++ b/config/profiles/hardware/default.nix
@@ -31,7 +31,7 @@
         x270
         intel
         laptop
-        wifi
+        networkmanager
       ];
     };
     eeepc-1015pem = {
diff --git a/config/profiles/hardware/networkmanager.nix b/config/profiles/hardware/networkmanager.nix
new file mode 100644
index 00000000..822fa713
--- /dev/null
+++ b/config/profiles/hardware/networkmanager.nix
@@ -0,0 +1,29 @@
+{ config, lib, ... }: with lib; {
+  options = {
+    home-manager.users = let
+      applets = { config, nixos, ... }: {
+        xsession.preferStatusNotifierItems = true;
+        services = {
+          network-manager-applet.enable = true;
+          blueman-applet.enable = true;
+        };
+      };
+    in mkOption {
+      type = types.attrsOf (types.submoduleWith {
+        modules = singleton applets;
+      });
+    };
+  };
+  config = {
+    hardware.bluetooth.enable = true;
+    services.blueman.enable = true;
+    networking = {
+      networkmanager = {
+        enable = true;
+        connectionConfig = {
+           "ipv6.ip6-privacy" = mkForce 0;
+        };
+      };
+    };
+  };
+}
diff --git a/config/users/kat/sway/sway.nix b/config/users/kat/sway/sway.nix
index 27bf10b3..b32ff3cc 100644
--- a/config/users/kat/sway/sway.nix
+++ b/config/users/kat/sway/sway.nix
@@ -227,6 +227,7 @@ let lockCommand = config.programs.swaylock.script; in
             "XF86AudioRaiseVolume" = "exec --no-startup-id ${pactl} set-sink-volume @DEFAULT_SINK@ +5%";
             "XF86AudioMute" = "exec --no-startup-id ${pactl} set-sink-mute @DEFAULT_SINK@ toggle";
             "XF86AudioMute+Shift" = "exec --no-startup-id ${pactl} set-source-mute @DEFAULT_SOURCE@ toggle";
+            "XF86AudioMicMute" = "exec --no-startup-id ${pactl} set-source-mute @DEFAULT_SOURCE@ toggle";
             "XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -U 5";
             "XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 5";
 
diff --git a/overlays/zfsUnstable/default.nix b/overlays/zfsUnstable/default.nix
deleted file mode 100644
index 826daab1..00000000
--- a/overlays/zfsUnstable/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-final: prev: {
-  linuxPackagesFor = kernel: (final.linuxPackagesFor kernel).extend (_: kfinal: {
-    zfsUnstable = kfinal.zfsUnstable.overrideAttrs (old: { meta = old.meta // { broken = false; }; });
-  });
-}