diff --git a/home-manager/modules/gpg.nix b/home-manager/modules/gpg.nix
index bc049d2..91e4a33 100644
--- a/home-manager/modules/gpg.nix
+++ b/home-manager/modules/gpg.nix
@@ -1,8 +1,6 @@
-{pkgs, ...}:
 {
   services.gpg-agent = {
     enable = true;
-    pinentryPackage = pkgs.pinentry-gnome3;
   };
 }
 
diff --git a/home-manager/modules/kanshi.nix b/home-manager/modules/kanshi.nix
index 2c07b36..d8b864b 100644
--- a/home-manager/modules/kanshi.nix
+++ b/home-manager/modules/kanshi.nix
@@ -1,18 +1,17 @@
 { nixosConfig, ... }:
 let
   machines = {
-    smithers = [{
-      profile.name = "laptop-only";
-      profile.outputs = [
-        {
-          criteria = "eDP-1";
-          scale = 1.3;
-        }
-      ];
-    }
-      {
-        profile.name = "homeoffice";
-        profile.outputs = [
+    smithers = {
+      "laptop-only" = {
+        outputs = [
+          {
+            criteria = "eDP-1";
+            scale = 1.3;
+          }
+        ];
+      };
+      "homeoffice" = {
+        outputs = [
           {
             criteria = "eDP-1";
             status = "disable";
@@ -28,13 +27,14 @@ let
             position = "2952,0";
           }
         ];
-      }];
+      };
+    };
   };
 in
 {
   services.kanshi = {
     enable = true;
-    settings = machines."${nixosConfig.networking.hostName}";
+    profiles = machines."${nixosConfig.networking.hostName}";
   };
 
 }
diff --git a/home-manager/modules/sway.nix b/home-manager/modules/sway.nix
index 6995b3f..bc7b24b 100644
--- a/home-manager/modules/sway.nix
+++ b/home-manager/modules/sway.nix
@@ -8,11 +8,6 @@ in
     package = pkgs.swayfx;
     wrapperFeatures.gtk = true;
 
-    # Sway can't find wallpaper.jpg and failes to build
-    # swayfx also has some problems:
-    # https://discourse.nixos.org/t/sway-fails-with-cannot-create-gles2-renderer-after-update/45703/2
-    checkConfig = false;
-
     config = {
       modifier = "Mod4";
       focus.followMouse = false;
diff --git a/modules/bluetooth.nix b/modules/bluetooth.nix
index 3dac4a1..71e0133 100644
--- a/modules/bluetooth.nix
+++ b/modules/bluetooth.nix
@@ -1,3 +1,5 @@
 {
-  hardware.bluetooth.enable = true;
+  # Laptops need NetworkManger
+  networking.networkmanager.enable = true;
+  programs.nm-applet.enable = true;
 }
diff --git a/modules/networkmanager.nix b/modules/networkmanager.nix
index 71e0133..3dac4a1 100644
--- a/modules/networkmanager.nix
+++ b/modules/networkmanager.nix
@@ -1,5 +1,3 @@
 {
-  # Laptops need NetworkManger
-  networking.networkmanager.enable = true;
-  programs.nm-applet.enable = true;
+  hardware.bluetooth.enable = true;
 }