From 84cff06cf3b29d2feb56c4f2b7f30867eb2bb29d Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Mon, 8 Jul 2024 19:20:17 +0100
Subject: [PATCH] Move autorandr configuration so it works

...automatically when docking or undocking
---
 lib/nixos/default.nix                        |  1 +
 lib/nixos/home-manager/desktop.nix           |  1 -
 lib/nixos/home-manager/modules/autorandr.nix | 52 -------------------
 lib/nixos/modules/autorandr.nix              | 53 ++++++++++++++++++++
 4 files changed, 54 insertions(+), 53 deletions(-)
 delete mode 100644 lib/nixos/home-manager/modules/autorandr.nix
 create mode 100644 lib/nixos/modules/autorandr.nix

diff --git a/lib/nixos/default.nix b/lib/nixos/default.nix
index 842004b..3821659 100644
--- a/lib/nixos/default.nix
+++ b/lib/nixos/default.nix
@@ -46,6 +46,7 @@ inputs.nixpkgs.lib.nixosSystem {
         username
         ;
     })
+    (import ./modules/autorandr.nix)
     (import ./modules/gnome.nix)
     # (import ./modules/sway.nix { inherit inputs username; })
 
diff --git a/lib/nixos/home-manager/desktop.nix b/lib/nixos/home-manager/desktop.nix
index 123ba1b..0bcb550 100644
--- a/lib/nixos/home-manager/desktop.nix
+++ b/lib/nixos/home-manager/desktop.nix
@@ -7,7 +7,6 @@
 {
   imports = [
     ./modules/alacritty.nix
-    ./modules/autorandr.nix
     # ./modules/awesome.nix
     ./modules/copyq.nix
     ./modules/dunst.nix
diff --git a/lib/nixos/home-manager/modules/autorandr.nix b/lib/nixos/home-manager/modules/autorandr.nix
deleted file mode 100644
index a057098..0000000
--- a/lib/nixos/home-manager/modules/autorandr.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ username, ... }: {
-  services.autorandr.enable = true;
-
-  xdg.configFile."autorandr/postswitch" = {
-    executable = true;
-    text = ''
-      #!/usr/bin/env bash
-
-      feh --randomize --bg-scale /home/${username}/Pictures/Wallpaper/*;
-    '';
-  };
-
-  programs.autorandr = {
-    enable = true;
-
-    profiles = let
-      fingerprint =
-        "00ffffffffffff000daef21400000000161c0104a51f117802ee95a3544c99260f505400000001010101010101010101010101010101363680a0703820402e1e240035ad10000018000000fe004e3134304843472d4751320a20000000fe00434d4e0a202020202020202020000000fe004e3134304843472d4751320a2000bb";
-      name = "eDP-1";
-    in {
-      default = {
-        fingerprint = { "${name}" = fingerprint; };
-
-        config = {
-          "${name}" = {
-            enable = true;
-            mode = "1920x1080";
-          };
-        };
-      };
-
-      desktop = {
-        config = {
-          "${name}".enable = false;
-
-          "HDMI-1" = {
-            enable = true;
-            mode = "2560x1440";
-            primary = true;
-            rate = "59.95";
-          };
-        };
-
-        fingerprint = {
-          "${name}" = fingerprint;
-          "HDMI-1" =
-            "00ffffffffffff004c2d1710424e58432b1f0103803f24782ac8b5ad50449e250f5054bfef80714f810081c081809500a9c0b300010108e80030f2705a80b0588a0078682100001e000000fd00324b1e873c000a202020202020000000fc004c5532385235350a2020202020000000ff0048345a524130303132380a20200183020335f04961120313041f10605f2309070783010000e305c0006b030c002000b83c2000200167d85dc401788003e20f81e3060501023a801871382d40582c450078682100001e023a80d072382d40102c458078682100001e04740030f2705a80b0588a0078682100001e565e00a0a0a029503020350078682100001a000049";
-        };
-      };
-    };
-  };
-}
diff --git a/lib/nixos/modules/autorandr.nix b/lib/nixos/modules/autorandr.nix
new file mode 100644
index 0000000..72efcc6
--- /dev/null
+++ b/lib/nixos/modules/autorandr.nix
@@ -0,0 +1,53 @@
+{ username, ... }:
+{
+  # xdg.configFile."autorandr/postswitch" = {
+  #   executable = true;
+  #   text = ''
+  #     #!/usr/bin/env bash
+  #
+  #     feh --randomize --bg-scale /home/${username}/Pictures/Wallpaper/*;
+  #   '';
+  # };
+
+  services.autorandr = {
+    enable = true;
+
+    profiles =
+      let
+        fingerprint = "00ffffffffffff000daef21400000000161c0104a51f117802ee95a3544c99260f505400000001010101010101010101010101010101363680a0703820402e1e240035ad10000018000000fe004e3134304843472d4751320a20000000fe00434d4e0a202020202020202020000000fe004e3134304843472d4751320a2000bb";
+        name = "eDP-1";
+      in
+      {
+        default = {
+          fingerprint = {
+            "${name}" = fingerprint;
+          };
+
+          config = {
+            "${name}" = {
+              enable = true;
+              mode = "1920x1080";
+            };
+          };
+        };
+
+        desktop = {
+          config = {
+            "${name}".enable = false;
+
+            "HDMI-1" = {
+              enable = true;
+              mode = "2560x1440";
+              primary = true;
+              rate = "59.95";
+            };
+          };
+
+          fingerprint = {
+            "${name}" = fingerprint;
+            "HDMI-1" = "00ffffffffffff004c2d1710424e58432b1f0103803f24782ac8b5ad50449e250f5054bfef80714f810081c081809500a9c0b300010108e80030f2705a80b0588a0078682100001e000000fd00324b1e873c000a202020202020000000fc004c5532385235350a2020202020000000ff0048345a524130303132380a20200183020335f04961120313041f10605f2309070783010000e305c0006b030c002000b83c2000200167d85dc401788003e20f81e3060501023a801871382d40582c450078682100001e023a80d072382d40102c458078682100001e04740030f2705a80b0588a0078682100001e565e00a0a0a029503020350078682100001a000049";
+          };
+        };
+      };
+  };
+}