diff --git a/bin/btoggle.sh b/bin/btoggle.sh
new file mode 100755
index 0000000..47db351
--- /dev/null
+++ b/bin/btoggle.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+MAC=94:DB:56:79:7D:86
+bluetoothctl info "$MAC" | grep -q 'Connected: yes' &&
+    bluetoothctl disconnect "$MAC"  || bluetoothctl connect "$MAC"
diff --git a/home-manager/arbtt.nix b/home-manager/arbtt.nix
deleted file mode 100644
index e4768b2..0000000
--- a/home-manager/arbtt.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.services.arbtt;
-
-in {
-
-  options.services.arbtt = {
-    enable = mkEnableOption "arbtt";
-
-    package = mkOption { type = types.package; default = pkgs.haskellPackages.arbtt; };
-
-  };
-
-  config = mkIf cfg.enable {
-    systemd.user.services.arbtt = {
-      Unit = {
-        Description = "arbtt";
-        After = [ "graphical-session-pre.target" ];
-        PartOf = [ "graphical-session.target" ];
-      };
-
-      Install = {
-        WantedBy = [ "graphical-session.target" ];
-      };
-
-      Service = {
-        ExecStart = ''
-          ${cfg.package}/bin/arbtt-capture
-        '';
-      };
-    };
-
-  };
-
-}
diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix
index 1189612..d72f879 100644
--- a/home-manager/desktop.nix
+++ b/home-manager/desktop.nix
@@ -17,11 +17,15 @@ let
 in
 {
   # TODO: waybar module from home-manager
-  xdg.configFile."waybar" = {
-    source = ./waybar;
-    recursive = true;
+  xdg.configFile."waybar/config" = {
+    text = builtins.toJSON (builtins.fromTOML (builtins.readFile ./waybar.toml));
     onChange = "systemctl --user restart waybar";
   };
+  programs.waybar = {
+    enable = true;
+    style = ./waybar.css;
+    systemd.enable = true;
+  };
   programs.mako.enable = true;
   services = {
     gpg-agent.extraConfig = ''
@@ -160,22 +164,6 @@ in
     XDG_CURRENT_DESKTOP = "sway";
   };
 
-  systemd.user.services.waybar = {
-    Unit = {
-      Description = "waybar";
-      After = [ "graphical-session-pre.target" ];
-      PartOf = [ "graphical-session.target" ];
-    };
-
-    Install = { WantedBy = [ "graphical-session.target" ]; };
-
-    Service = {
-      ExecStart = ''
-        ${pkgs.waybar}/bin/waybar
-      '';
-    };
-  };
-
   systemd.user.services.gebaard = {
     Unit = {
       Description = "gebaard";
diff --git a/home-manager/home.nix b/home-manager/home.nix
index e463442..778b5f4 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -10,7 +10,7 @@ let
       HOME = "/build";
     } "${pkgs.thefuck}/bin/thefuck -a > $out";
 in {
-  imports = [ ./arbtt.nix ./desktop.nix ];
+  imports = [ ./desktop.nix ];
   nixpkgs = {
     config.allowUnfree = true;
     inherit (import /home/yorick/dotfiles/config.nix) overlays;
diff --git a/home-manager/waybar/style.css b/home-manager/waybar.css
similarity index 100%
rename from home-manager/waybar/style.css
rename to home-manager/waybar.css
diff --git a/home-manager/waybar.toml b/home-manager/waybar.toml
new file mode 100644
index 0000000..1583c44
--- /dev/null
+++ b/home-manager/waybar.toml
@@ -0,0 +1,73 @@
+layer = "top"
+height = 26
+modules-left = [ "sway/workspaces", "sway/mode", "custom/spotify" ]
+modules-center = [ "sway/window" ]
+modules-right = [ "pulseaudio", "network", "disk", "battery", "clock", "tray" ]
+
+["sway/workspaces"]
+all-outputs = false
+format = "{icon} {name}"
+
+["sway/workspaces".format-icons]
+1 = ""
+2 = "#"
+3 = ""
+4 = ""
+5 = ""
+6 = ""
+7 = ""
+urgent = ""
+focused = ""
+default = ""
+
+["sway/mode"]
+format = '<span style="italic">{}</span>'
+
+[tray]
+spacing = 10
+
+[clock]
+format = "{:%Y-%m-%d %H:%M}"
+on-click = "xdg-open https://calendar.google.com"
+
+[disk]
+format = "{free} "
+
+[battery]
+format = "{capacity}% {icon}"
+format-icons = [ "", "", "", "", "" ]
+
+[battery.states]
+warning = 30
+critical = 15
+
+[network]
+format-wifi = "{essid} "
+format-ethernet = "{ifname} "
+format-disconnected = "Disconnected ⚠"
+tooltip-format = "{ipaddr}"
+
+[pulseaudio]
+scroll-step = 5
+format = "{volume}% {icon}"
+format-bluetooth = "{volume}% {icon}"
+format-muted = ""
+on-click = "pkill pavucontrol; pavucontrol"
+# toggle headphones
+on-click-right = "~/dotfiles/bin/btoggle.sh"
+
+[pulseaudio.format-icons]
+headphones = ""
+handsfree = ""
+headset = ""
+phone = ""
+portable = ""
+car = ""
+default = [ "", "" ]
+
+["custom/spotify"]
+format = " {}"
+escape = true
+max-length = 40
+on-click = "playerctl play-pause"
+exec = "$HOME/dotfiles/bin/spotify_meta.sh 2> /dev/null"
diff --git a/home-manager/waybar/config b/home-manager/waybar/config
deleted file mode 100644
index 7107991..0000000
--- a/home-manager/waybar/config
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-    "layer": "top", // Waybar at top layer
-    // "position": "bottom", // Waybar at the bottom of your screen
-    "height": 26, // Waybar height
-    // "width": 1280, // Waybar width
-    // Choose the order of the modules
-    "modules-left": ["sway/workspaces", "sway/mode", "custom/spotify"],
-    "modules-center": ["sway/window"],
-    "modules-right": ["pulseaudio", "network", "disk", "battery", "clock", "tray"],
-    // Modules configuration
-    "sway/workspaces": {
-        "all-outputs": false,
-        "format": "{icon} {name}",
-        "format-icons": {
-            "1": "",
-            "2": "#",
-            "3": "",
-            "4": "",
-            "5": "",
-            "6": "",
-            "7": "",
-            "urgent": "",
-            "focused": "",
-            "default": ""
-        }
-    },
-    "sway/mode": {
-        "format": "<span style=\"italic\">{}</span>"
-    },
-    "tray": {
-        // "icon-size": 21,
-        "spacing": 10
-    },
-    "clock": {
-        "format-alt": "{:%Y-%m-%d}"
-    },
-    "cpu": {
-        "format": "{load}% "
-    },
-    "memory": {
-        "format": "{}% "
-    },
-    "disk": {
-        "format": "{free} "
-    },
-    "battery": {
-        "states": {
-            // "good": 95,
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "{capacity}% {icon}",
-        // "format-good": "", // An empty format will hide the module
-        // "format-full": "",
-        "format-icons": ["", "", "", "", ""]
-    },
-    "network": {
-        //"interface": "wlp58s0", // (Optional) To force the use of this interface
-        "format-wifi": "{essid} ",
-        "format-ethernet": "{ifname} ",
-        "format-disconnected": "Disconnected ⚠"
-    },
-    "pulseaudio": {
-        "scroll-step": 5,
-        "format": "{volume}% {icon}",
-        "format-bluetooth": "{volume}% {icon}",
-        "format-muted": "",
-        "format-icons": {
-            "headphones": "",
-            "handsfree": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", ""]
-        },
-        "on-click": "pavucontrol"
-    },
-    "custom/spotify": {
-        "format": " {}",
-        "escape": true,
-        "max-length": 40,
-        "on-click": "playerctl play-pause",
-        "exec": "$HOME/dotfiles/bin/spotify_meta.sh 2> /dev/null" // Script in resources folder
-    }
-}