From d3d23a119837bbe4a9a717e52976931e043831de Mon Sep 17 00:00:00 2001
From: fleaz <mail@felixbreidenstein.de>
Date: Tue, 18 Jun 2024 21:19:57 +0200
Subject: [PATCH 1/3] modules: Fix swapped filenames

---
 modules/bluetooth.nix      | 4 +---
 modules/networkmanager.nix | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/bluetooth.nix b/modules/bluetooth.nix
index 71e0133..3dac4a1 100644
--- a/modules/bluetooth.nix
+++ b/modules/bluetooth.nix
@@ -1,5 +1,3 @@
 {
-  # Laptops need NetworkManger
-  networking.networkmanager.enable = true;
-  programs.nm-applet.enable = true;
+  hardware.bluetooth.enable = true;
 }
diff --git a/modules/networkmanager.nix b/modules/networkmanager.nix
index 3dac4a1..71e0133 100644
--- a/modules/networkmanager.nix
+++ b/modules/networkmanager.nix
@@ -1,3 +1,5 @@
 {
-  hardware.bluetooth.enable = true;
+  # Laptops need NetworkManger
+  networking.networkmanager.enable = true;
+  programs.nm-applet.enable = true;
 }

From 4c6f3b277fa58436c36f15d8d0e03d5c44cfddad Mon Sep 17 00:00:00 2001
From: fleaz <mail@felixbreidenstein.de>
Date: Tue, 18 Jun 2024 21:20:31 +0200
Subject: [PATCH 2/3] fixup! Update to 24.05

---
 home-manager/modules/gpg.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/home-manager/modules/gpg.nix b/home-manager/modules/gpg.nix
index 91e4a33..bc049d2 100644
--- a/home-manager/modules/gpg.nix
+++ b/home-manager/modules/gpg.nix
@@ -1,6 +1,8 @@
+{pkgs, ...}:
 {
   services.gpg-agent = {
     enable = true;
+    pinentryPackage = pkgs.pinentry-gnome3;
   };
 }
 

From 1bfb290532722f7b52ec45d28529cd6ea6fdf346 Mon Sep 17 00:00:00 2001
From: fleaz <mail@felixbreidenstein.de>
Date: Tue, 18 Jun 2024 21:37:12 +0200
Subject: [PATCH 3/3] more 24.05 changes

---
 home-manager/modules/kanshi.nix | 28 ++++++++++++++--------------
 home-manager/modules/sway.nix   |  5 +++++
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/home-manager/modules/kanshi.nix b/home-manager/modules/kanshi.nix
index d8b864b..2c07b36 100644
--- a/home-manager/modules/kanshi.nix
+++ b/home-manager/modules/kanshi.nix
@@ -1,17 +1,18 @@
 { nixosConfig, ... }:
 let
   machines = {
-    smithers = {
-      "laptop-only" = {
-        outputs = [
-          {
-            criteria = "eDP-1";
-            scale = 1.3;
-          }
-        ];
-      };
-      "homeoffice" = {
-        outputs = [
+    smithers = [{
+      profile.name = "laptop-only";
+      profile.outputs = [
+        {
+          criteria = "eDP-1";
+          scale = 1.3;
+        }
+      ];
+    }
+      {
+        profile.name = "homeoffice";
+        profile.outputs = [
           {
             criteria = "eDP-1";
             status = "disable";
@@ -27,14 +28,13 @@ let
             position = "2952,0";
           }
         ];
-      };
-    };
+      }];
   };
 in
 {
   services.kanshi = {
     enable = true;
-    profiles = machines."${nixosConfig.networking.hostName}";
+    settings = machines."${nixosConfig.networking.hostName}";
   };
 
 }
diff --git a/home-manager/modules/sway.nix b/home-manager/modules/sway.nix
index bc7b24b..6995b3f 100644
--- a/home-manager/modules/sway.nix
+++ b/home-manager/modules/sway.nix
@@ -8,6 +8,11 @@ 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;