From 0745e9fc06f472ef29ceceecaaa64569f1994804 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sun, 25 Feb 2024 09:06:32 +0000
Subject: [PATCH] refactor: programs: split gnome-maps into own file

---
 hosts/common/programs/assorted.nix   | 14 --------------
 hosts/common/programs/default.nix    |  1 +
 hosts/common/programs/gnome-maps.nix | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 hosts/common/programs/gnome-maps.nix

diff --git a/hosts/common/programs/assorted.nix b/hosts/common/programs/assorted.nix
index 7989f758..a3ce6645 100644
--- a/hosts/common/programs/assorted.nix
+++ b/hosts/common/programs/assorted.nix
@@ -465,14 +465,6 @@ in
     "gnome.gnome-disk-utility".sandbox.whitelistDbus = [ "system" ];
     "gnome.gnome-disk-utility".sandbox.whitelistWayland = true;
 
-    # TODO: verify location services
-    # "gnome.gnome-maps".sandbox.method = "bwrap";
-    # "gnome.gnome-maps".sandbox.wrapperType = "inplace";
-    # "gnome.gnome-maps".sandbox.whitelistDri = true;
-    # "gnome.gnome-maps".sandbox.whitelistDbus = [ "user" ];  # for GPS (geoclue, portals)
-    # "gnome.gnome-maps".sandbox.whitelistWayland = true;
-    # "gnome.gnome-maps".sandbox.net = "clearnet";
-
     gnome-2048.sandbox.method = "bwrap";
     gnome-2048.sandbox.wrapperType = "wrappedDerivation";
     gnome-2048.sandbox.whitelistWayland = true;
@@ -495,12 +487,6 @@ in
       ".local/share/tessdata"  # 15M; dunno what all it is.
     ];
 
-    # TODO: gnome-maps: move to own file
-    "gnome.gnome-maps".persist.byStore.plaintext = [ ".cache/shumate" ];
-    "gnome.gnome-maps".persist.byStore.private = [
-      ({ path = ".local/share/maps-places.json"; type = "file"; })
-    ];
-
     # hitori rules:
     # - click to shade a tile
     # 1. no number may appear unshaded more than once in the same row/column
diff --git a/hosts/common/programs/default.nix b/hosts/common/programs/default.nix
index 3b33d74c..9a8fd63a 100644
--- a/hosts/common/programs/default.nix
+++ b/hosts/common/programs/default.nix
@@ -37,6 +37,7 @@
     ./git.nix
     ./gnome-feeds.nix
     ./gnome-keyring
+    ./gnome-maps.nix
     ./gnome-weather.nix
     ./go2tv.nix
     ./gpodder.nix
diff --git a/hosts/common/programs/gnome-maps.nix b/hosts/common/programs/gnome-maps.nix
new file mode 100644
index 00000000..f5f4b7aa
--- /dev/null
+++ b/hosts/common/programs/gnome-maps.nix
@@ -0,0 +1,17 @@
+{ ... }:
+{
+  sane.programs."gnome.gnome-maps" = {
+    # TODO: verify location services
+    # sandbox.method = "bwrap";
+    # sandbox.wrapperType = "inplace";
+    # sandbox.whitelistDri = true;  # for perf
+    # sandbox.whitelistDbus = [ "user" ];  # for GPS (geoclue, portals)
+    # sandbox.whitelistWayland = true;
+    # sandbox.net = "clearnet";
+
+    persist.byStore.plaintext = [ ".cache/shumate" ];
+    persist.byStore.private = [
+      ({ path = ".local/share/maps-places.json"; type = "file"; })
+    ];
+  };
+}