more 24.05 changes

home-manager/modules/gpg.nix

@@ -1,6 +1,8 @@
+{pkgs, ...}:
 {
   services.gpg-agent = {
     enable = true;
+    pinentryPackage = pkgs.pinentry-gnome3;
   };
 }
 

home-manager/modules/kanshi.nix

@@ -1,17 +1,18 @@
 { nixosConfig, ... }:
 let
   machines = {
-    smithers = {
+    smithers = [{
-      "laptop-only" = {
+      profile.name = "laptop-only";
-        outputs = [
+      profile.outputs = [
         {
           criteria = "eDP-1";
           scale = 1.3;
         }
       ];
-      };
+    }
-      "homeoffice" = {
+      {
-        outputs = [
+        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}";
   };
 
 }

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;

modules/bluetooth.nix

@@ -1,5 +1,3 @@
 {
-  # Laptops need NetworkManger
+  hardware.bluetooth.enable = true;
-  networking.networkmanager.enable = true;
-  programs.nm-applet.enable = true;
 }

modules/networkmanager.nix

@@ -1,3 +1,5 @@
 {
-  hardware.bluetooth.enable = true;
+  # Laptops need NetworkManger
+  networking.networkmanager.enable = true;
+  programs.nm-applet.enable = true;
 }