From d053e8ade5ca7e784e3793e5cd07889189385abe Mon Sep 17 00:00:00 2001
From: Thomas Boerger <thomas@webhippie.de>
Date: Sun, 9 Jan 2022 01:58:14 +0100
Subject: [PATCH 1/2] modules/system/defaults/dock.nix: add options for hot
 corners

---
 modules/system/defaults/dock.nix | 92 ++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/modules/system/defaults/dock.nix b/modules/system/defaults/dock.nix
index 83dffca4..5297d1e3 100644
--- a/modules/system/defaults/dock.nix
+++ b/modules/system/defaults/dock.nix
@@ -162,5 +162,97 @@ in {
       '';
     };
 
+    system.defaults.dock.wvous-tl-corner = mkOption {
+      type = types.nullOr types.int;
+      default = null;
+      description = ''
+        Hot corner action for top left corner. Valid values include:
+
+        <itemizedlist>
+        <listitem><para><literal>1</literal>: Disabled</para></listitem>
+        <listitem><para><literal>2</literal>: Mission Control</para></listitem>
+        <listitem><para><literal>3</literal>: Application Windows</para></listitem>
+        <listitem><para><literal>4</literal>: Desktop</para></listitem>
+        <listitem><para><literal>5</literal>: Start Screen Saver</para></listitem>
+        <listitem><para><literal>6</literal>: Disable Screen Saver</para></listitem>
+        <listitem><para><literal>7</literal>: Dashboard</para></listitem>
+        <listitem><para><literal>10</literal>: Put Display to Sleep</para></listitem>
+        <listitem><para><literal>11</literal>: Launchpad</para></listitem>
+        <listitem><para><literal>12</literal>: Notification Center</para></listitem>
+        <listitem><para><literal>13</literal>: Lock Screen</para></listitem>
+        <listitem><para><literal>14</literal>: Quick Note</para></listitem>
+        </itemizedlist>
+      '';
+    };
+
+    system.defaults.dock.wvous-bl-corner = mkOption {
+      type = types.nullOr types.int;
+      default = null;
+      description = ''
+        Hot corner action for bottom left corner. Valid values include:
+
+        <itemizedlist>
+        <listitem><para><literal>1</literal>: Disabled</para></listitem>
+        <listitem><para><literal>2</literal>: Mission Control</para></listitem>
+        <listitem><para><literal>3</literal>: Application Windows</para></listitem>
+        <listitem><para><literal>4</literal>: Desktop</para></listitem>
+        <listitem><para><literal>5</literal>: Start Screen Saver</para></listitem>
+        <listitem><para><literal>6</literal>: Disable Screen Saver</para></listitem>
+        <listitem><para><literal>7</literal>: Dashboard</para></listitem>
+        <listitem><para><literal>10</literal>: Put Display to Sleep</para></listitem>
+        <listitem><para><literal>11</literal>: Launchpad</para></listitem>
+        <listitem><para><literal>12</literal>: Notification Center</para></listitem>
+        <listitem><para><literal>13</literal>: Lock Screen</para></listitem>
+        <listitem><para><literal>14</literal>: Quick Note</para></listitem>
+        </itemizedlist>
+      '';
+    };
+
+    system.defaults.dock.wvous-tr-corner = mkOption {
+      type = types.nullOr types.int;
+      default = null;
+      description = ''
+        Hot corner action for top right corner. Valid values include:
+
+        <itemizedlist>
+        <listitem><para><literal>1</literal>: Disabled</para></listitem>
+        <listitem><para><literal>2</literal>: Mission Control</para></listitem>
+        <listitem><para><literal>3</literal>: Application Windows</para></listitem>
+        <listitem><para><literal>4</literal>: Desktop</para></listitem>
+        <listitem><para><literal>5</literal>: Start Screen Saver</para></listitem>
+        <listitem><para><literal>6</literal>: Disable Screen Saver</para></listitem>
+        <listitem><para><literal>7</literal>: Dashboard</para></listitem>
+        <listitem><para><literal>10</literal>: Put Display to Sleep</para></listitem>
+        <listitem><para><literal>11</literal>: Launchpad</para></listitem>
+        <listitem><para><literal>12</literal>: Notification Center</para></listitem>
+        <listitem><para><literal>13</literal>: Lock Screen</para></listitem>
+        <listitem><para><literal>14</literal>: Quick Note</para></listitem>
+        </itemizedlist>
+      '';
+    };
+
+    system.defaults.dock.wvous-br-corner = mkOption {
+      type = types.nullOr types.int;
+      default = null;
+      description = ''
+        Hot corner action for bottom right corner. Valid values include:
+
+        <itemizedlist>
+        <listitem><para><literal>1</literal>: Disabled</para></listitem>
+        <listitem><para><literal>2</literal>: Mission Control</para></listitem>
+        <listitem><para><literal>3</literal>: Application Windows</para></listitem>
+        <listitem><para><literal>4</literal>: Desktop</para></listitem>
+        <listitem><para><literal>5</literal>: Start Screen Saver</para></listitem>
+        <listitem><para><literal>6</literal>: Disable Screen Saver</para></listitem>
+        <listitem><para><literal>7</literal>: Dashboard</para></listitem>
+        <listitem><para><literal>10</literal>: Put Display to Sleep</para></listitem>
+        <listitem><para><literal>11</literal>: Launchpad</para></listitem>
+        <listitem><para><literal>12</literal>: Notification Center</para></listitem>
+        <listitem><para><literal>13</literal>: Lock Screen</para></listitem>
+        <listitem><para><literal>14</literal>: Quick Note</para></listitem>
+        </itemizedlist>
+      '';
+    };
+
     };
 }

From 4c243ea8c800cab6840ba55635e76bbf70195611 Mon Sep 17 00:00:00 2001
From: Thomas Boerger <thomas@webhippie.de>
Date: Fri, 14 Jan 2022 00:58:35 +0100
Subject: [PATCH 2/2] modules/system/defaults/dock.nix: make sure to use
 positive ints for hot corners

---
 modules/system/defaults/dock.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/system/defaults/dock.nix b/modules/system/defaults/dock.nix
index 5297d1e3..3e56fae8 100644
--- a/modules/system/defaults/dock.nix
+++ b/modules/system/defaults/dock.nix
@@ -163,7 +163,7 @@ in {
     };
 
     system.defaults.dock.wvous-tl-corner = mkOption {
-      type = types.nullOr types.int;
+      type = types.nullOr types.ints.positive;
       default = null;
       description = ''
         Hot corner action for top left corner. Valid values include:
@@ -186,7 +186,7 @@ in {
     };
 
     system.defaults.dock.wvous-bl-corner = mkOption {
-      type = types.nullOr types.int;
+      type = types.nullOr types.ints.positive;
       default = null;
       description = ''
         Hot corner action for bottom left corner. Valid values include:
@@ -209,7 +209,7 @@ in {
     };
 
     system.defaults.dock.wvous-tr-corner = mkOption {
-      type = types.nullOr types.int;
+      type = types.nullOr types.ints.positive;
       default = null;
       description = ''
         Hot corner action for top right corner. Valid values include:
@@ -232,7 +232,7 @@ in {
     };
 
     system.defaults.dock.wvous-br-corner = mkOption {
-      type = types.nullOr types.int;
+      type = types.nullOr types.ints.positive;
       default = null;
       description = ''
         Hot corner action for bottom right corner. Valid values include: