From 559126c4647e0779237337e4d2f0892bd9d244b2 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 8 Aug 2023 10:45:13 +0100
Subject: [PATCH] Revert some kanshi changes to fix things

---
 flake.lock                | 26 +++++++++++++-------------
 home/hyprland/default.nix |  2 +-
 hosts/Ronin/home.nix      | 13 ++++++++-----
 hosts/hyprland.nix        |  5 ++++-
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6c37d94a..59bb0492 100644
--- a/flake.lock
+++ b/flake.lock
@@ -49,11 +49,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691312444,
-        "narHash": "sha256-J9e9dGwAPTX+UlAn8jehoyaEq6fwK+L+gunfx0cYT4E=",
+        "lastModified": 1690303752,
+        "narHash": "sha256-2YiwFHQERGoaORNORmsdmVlPD8CVVwlwbV2+f77sFhg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "903e06d734bcae48efb79b9afd51b406d2744179",
+        "rev": "ba2c0737cc848db03470828fdb5e86df75ed42a8",
         "type": "github"
       },
       "original": {
@@ -72,11 +72,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1691429655,
-        "narHash": "sha256-0k4uXBllt7uhiXyXPW+sm3y0aHVN6BVeq5EKouhQsus=",
+        "lastModified": 1690453540,
+        "narHash": "sha256-UDM0gIZcXbooKE+pTL6xAJgHhGIQxSE3XrD8bz8vv3k=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "cebab759d52747c2067217d93096b47281722e57",
+        "rev": "2ea7d10d049e26c9829912da1d16f7f35f5b265d",
         "type": "github"
       },
       "original": {
@@ -108,11 +108,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1691368598,
-        "narHash": "sha256-ia7li22keBBbj02tEdqjVeLtc7ZlSBuhUk+7XTUFr14=",
+        "lastModified": 1690272529,
+        "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5a8e9243812ba528000995b294292d3b5e120947",
+        "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
         "type": "github"
       },
       "original": {
@@ -167,18 +167,18 @@
       "flake": false,
       "locked": {
         "host": "gitlab.freedesktop.org",
-        "lastModified": 1691073628,
-        "narHash": "sha256-LlxE3o3UzRY7APYVLGNKM30DBMcDifCRIQiMVSbYLIc=",
+        "lastModified": 1690165843,
+        "narHash": "sha256-gv5kjss6REeQG0BmvK2gTx7jHLRdCnP25po6It6I6N8=",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5",
+        "rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3",
         "type": "gitlab"
       },
       "original": {
         "host": "gitlab.freedesktop.org",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5",
+        "rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3",
         "type": "gitlab"
       }
     },
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index dbe295d4..bfa5992a 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -36,7 +36,7 @@ in {
   services.kanshi = {
     enable = true;
     systemdTarget = "hyprland-session.target";
-    profiles.wallpaper = {
+    profiles.default = {
       outputs = [{ criteria = "*"; }];
       exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}";
     };
diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix
index 3af9ccdc..8dc032a5 100644
--- a/hosts/Ronin/home.nix
+++ b/hosts/Ronin/home.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, shellConfig, ... }:
+{ pkgs, lib, shellConfig, wallpapers, ... }:
 let
   username = "elitherl";
   homeDirectory = "/home/${username}";
@@ -144,14 +144,15 @@ in {
   services.kanshi.profiles = {
     undocked = {
       outputs = [{
-        criteria = "AU Optronics 0x1F92";
+        criteria = "eDP-1";
         position = "0,0";
       }];
+      exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}";
     };
     work = {
       outputs = [
         {
-          criteria = "AU Optronics 0x1F92";
+          criteria = "eDP-1";
           position = "0,485";
         }
         {
@@ -163,6 +164,7 @@ in {
           position = "1920,0";
         }
       ];
+      exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}";
     };
     home = {
       outputs = [
@@ -171,14 +173,15 @@ in {
           position = "0,0";
         }
         {
-          criteria = "AU Optronics 0x1F92";
+          criteria = "eDP-1";
           position = "1920,0";
         }
       ];
+      exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}";
     };
   };
   xdg.configFile."hypr/display.conf".text = ''
-    monitor=desc:AU Optronics 0x1F92,preferred,auto,1.25
+    monitor=desc:eDP-1,preferred,auto,1.25
     monitor=desc:Iiyama North America PLB2403WS 0574281251316,preferred,0x185,1
     monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,preferred,1920x0,1,transform,1
     monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,auto,1
diff --git a/hosts/hyprland.nix b/hosts/hyprland.nix
index e17f09ff..39f415db 100644
--- a/hosts/hyprland.nix
+++ b/hosts/hyprland.nix
@@ -30,7 +30,10 @@
     extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
   };
   programs = {
-    hyprland.enable = true;
+    hyprland = {
+      enable = true;
+      package = hyprland.packages.${pkgs.system}.hyprland;
+    };
     thunar = {
       enable = true;
       plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ];