From 58e227efc01c367b1476f4c7f94d7641007a5190 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Sun, 8 Sep 2024 19:09:10 -0400
Subject: [PATCH] phone: Move dconf config to dconf module

---
 home/dconf.nix                | 68 +++++++++++++++++++++++++++++++++++
 hosts/phone/configuration.nix | 64 +--------------------------------
 2 files changed, 69 insertions(+), 63 deletions(-)
 create mode 100644 home/dconf.nix

diff --git a/home/dconf.nix b/home/dconf.nix
new file mode 100644
index 00000000..002699af
--- /dev/null
+++ b/home/dconf.nix
@@ -0,0 +1,68 @@
+{ pkgs, lib, ... }:
+
+let
+  inherit (lib.gvariant) mkTuple mkUint32;
+in
+{
+  dconf.settings = {
+    "sm/puri/phosh" = {
+      app-filter-mode = [ ];
+      enable-suspend = true;
+
+      favorites = [
+        "org.gnome.Calls.desktop"
+        "sm.puri.Chatty.desktop"
+        "kitty.desktop"
+        "librewolf.desktop"
+      ];
+    };
+
+    "sm/puri/phosh/lockscreen" = {
+      shuffle-keypad = true;
+    };
+
+    "sm/puri/phosh/plugins" = {
+      quick-settings = [
+        "night-light-quick-setting"
+        "caffeine-quick-setting"
+      ];
+    };
+
+    "org/gnome/desktop/interface" = {
+      show-battery-percentage = true;
+    };
+
+    "org/postmarketos/megapixels" = {
+      save-raw = false;
+      postprocessor = "${pkgs.megapixels}/share/megapixels/postprocess.sh";
+    };
+
+    "org/gnome/desktop/session" = {
+      idle-delay = mkUint32 60;
+    };
+
+    "org/gnome/desktop/input-sources" = {
+      sources = [
+        (mkTuple [
+          "xkb"
+          "us"
+        ])
+
+        (mkTuple [
+          "xkb"
+          "jp+kana"
+        ])
+      ];
+    };
+
+    "org/gnome/eog/ui" = {
+      image-gallery = true;
+      sidebar = false;
+    };
+
+    "org/gnome/settings-daemon/plugins/power" = {
+      sleep-inactive-ac-type = "nothing";
+      sleep-inactive-battery-type = "suspend";
+    };
+  };
+}
diff --git a/hosts/phone/configuration.nix b/hosts/phone/configuration.nix
index fb315779..7d786826 100644
--- a/hosts/phone/configuration.nix
+++ b/hosts/phone/configuration.nix
@@ -8,7 +8,6 @@
 
 let
   inherit (lib) mkIf mkForce;
-  inherit (lib.gvariant) mkTuple mkUint32;
   inherit (config.modules.system) username;
   inherit (builtins) attrValues;
 
@@ -32,6 +31,7 @@ in
 
   home-manager.sharedModules = attrValues {
     inherit (self.homeModules)
+      dconf
       eza
       fish
       git
@@ -102,68 +102,6 @@ in
           videos = mkForce "/home/${username}";
         };
       };
-
-      dconf.settings = {
-        "sm/puri/phosh" = {
-          app-filter-mode = [ ];
-          enable-suspend = true;
-
-          favorites = [
-            "org.gnome.Calls.desktop"
-            "sm.puri.Chatty.desktop"
-            "kitty.desktop"
-            "librewolf.desktop"
-          ];
-        };
-
-        "sm/puri/phosh/lockscreen" = {
-          shuffle-keypad = true;
-        };
-
-        "sm/puri/phosh/plugins" = {
-          quick-settings = [
-            "night-light-quick-setting"
-            "caffeine-quick-setting"
-          ];
-        };
-
-        "org/gnome/desktop/interface" = {
-          show-battery-percentage = true;
-        };
-
-        "org/postmarketos/megapixels" = {
-          save-raw = false;
-          postprocessor = "${pkgs.megapixels}/share/megapixels/postprocess.sh";
-        };
-
-        "org/gnome/desktop/session" = {
-          idle-delay = mkUint32 60;
-        };
-
-        "org/gnome/desktop/input-sources" = {
-          sources = [
-            (mkTuple [
-              "xkb"
-              "us"
-            ])
-
-            (mkTuple [
-              "xkb"
-              "jp+kana"
-            ])
-          ];
-        };
-
-        "org/gnome/eog/ui" = {
-          image-gallery = true;
-          sidebar = false;
-        };
-
-        "org/gnome/settings-daemon/plugins/power" = {
-          sleep-inactive-ac-type = "nothing";
-          sleep-inactive-battery-type = "suspend";
-        };
-      };
     };
   };