From 55f4331e739904ded81ede32117d12301c2cfbaa Mon Sep 17 00:00:00 2001
From: cmacrae <calum0macrae@gmail.com>
Date: Tue, 27 Feb 2018 17:24:45 +0000
Subject: defaults: Add screencapture.location

---
 modules/examples/lnl.nix                  |  2 ++
 modules/system/defaults-write.nix         |  4 +++-
 modules/system/defaults/screencapture.nix | 16 ++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 modules/system/defaults/screencapture.nix

(limited to 'modules')

diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix
index 2323512..df674ae 100644
--- a/modules/examples/lnl.nix
+++ b/modules/examples/lnl.nix
@@ -21,6 +21,8 @@
   system.defaults.finder.QuitMenuItem = true;
   system.defaults.finder.FXEnableExtensionChangeWarning = false;
 
+  system.defaults.screencapture.location = "/tmp";
+
   system.defaults.trackpad.Clicking = true;
   system.defaults.trackpad.TrackpadThreeFingerDrag = true;
 
diff --git a/modules/system/defaults-write.nix b/modules/system/defaults-write.nix
index e1ec96c..80ffb08 100644
--- a/modules/system/defaults-write.nix
+++ b/modules/system/defaults-write.nix
@@ -26,6 +26,7 @@ let
   dock = defaultsToList "com.apple.dock" cfg.dock;
   finder = defaultsToList "com.apple.finder" cfg.finder;
   smb = defaultsToList "/Library/Preferences/SystemConfiguration/com.apple.smb.server" cfg.smb;
+  screencapture = defaultsToList "com.apple.screencapture" cfg.screencapture;
   trackpad = defaultsToList "com.apple.AppleMultitouchTrackpad" cfg.trackpad;
   trackpadBluetooth = defaultsToList "com.apple.driver.AppleBluetoothMultitouch.trackpad" cfg.trackpad;
 
@@ -43,7 +44,7 @@ in
       '';
 
     system.activationScripts.userDefaults.text = mkIfAttrs
-      [ NSGlobalDomain LaunchServices dock finder trackpad trackpadBluetooth ]
+      [ NSGlobalDomain LaunchServices dock finder screencapture trackpad trackpadBluetooth ]
       ''
         # Set defaults
         echo >&2 "user defaults..."
@@ -52,6 +53,7 @@ in
         ${concatStringsSep "\n" LaunchServices}
         ${concatStringsSep "\n" dock}
         ${concatStringsSep "\n" finder}
+        ${concatStringsSep "\n" screencapture}
         ${concatStringsSep "\n" trackpad}
         ${concatStringsSep "\n" trackpadBluetooth}
       '';
diff --git a/modules/system/defaults/screencapture.nix b/modules/system/defaults/screencapture.nix
new file mode 100644
index 0000000..42fe6b6
--- /dev/null
+++ b/modules/system/defaults/screencapture.nix
@@ -0,0 +1,16 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  options = {
+
+    system.defaults.screencapture.location = mkOption {
+      type = types.string;
+      default = "~/Desktop";
+      description = ''
+          The filesystem path to which screencaptures should be written.
+        '';
+    };
+  };
+}
-- 
cgit v1.2.3


From 93f0692422abe6ce8eed23c38920e854a49a9a3a Mon Sep 17 00:00:00 2001
From: cmacrae <calum0macrae@gmail.com>
Date: Wed, 28 Feb 2018 08:21:30 +0000
Subject: examples: remove screencapture.location from @LnL's confg (sorry!)

---
 modules/examples/lnl.nix | 2 --
 1 file changed, 2 deletions(-)

(limited to 'modules')

diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix
index df674ae..2323512 100644
--- a/modules/examples/lnl.nix
+++ b/modules/examples/lnl.nix
@@ -21,8 +21,6 @@
   system.defaults.finder.QuitMenuItem = true;
   system.defaults.finder.FXEnableExtensionChangeWarning = false;
 
-  system.defaults.screencapture.location = "/tmp";
-
   system.defaults.trackpad.Clicking = true;
   system.defaults.trackpad.TrackpadThreeFingerDrag = true;
 
-- 
cgit v1.2.3


From 9a1499b12899157a2fb8b0e3394d96e8fff5e954 Mon Sep 17 00:00:00 2001
From: cmacrae <calum0macrae@gmail.com>
Date: Thu, 1 Mar 2018 13:20:16 +0000
Subject: defaults: set screencapture.location's default to null

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

(limited to 'modules')

diff --git a/modules/system/defaults/screencapture.nix b/modules/system/defaults/screencapture.nix
index 42fe6b6..a101c00 100644
--- a/modules/system/defaults/screencapture.nix
+++ b/modules/system/defaults/screencapture.nix
@@ -6,8 +6,8 @@ with lib;
   options = {
 
     system.defaults.screencapture.location = mkOption {
-      type = types.string;
-      default = "~/Desktop";
+      type = types.nullOr types.str;
+      default = null;
       description = ''
           The filesystem path to which screencaptures should be written.
         '';
-- 
cgit v1.2.3