From 9cc208d333d61af5be117877069962317923e417 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 27 Jul 2025 16:22:19 +0100
Subject: [PATCH] Move dconf configuration

---
 hosts/nixedo/configuration.nix |  1 -
 hosts/t480/configuration.nix   |  1 -
 hosts/t490/configuration.nix   |  4 ----
 modules/nixos/dconf.nix        | 14 --------------
 modules/nixos/default.nix      |  1 -
 modules2/dconf.nix             |  3 +++
 6 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 modules/nixos/dconf.nix
 create mode 100644 modules2/dconf.nix

diff --git a/hosts/nixedo/configuration.nix b/hosts/nixedo/configuration.nix
index 92626f62..ff872ebc 100644
--- a/hosts/nixedo/configuration.nix
+++ b/hosts/nixedo/configuration.nix
@@ -21,7 +21,6 @@
 
   features = {
     cli.podman.enable = true;
-    desktop.dconf.enable = true;
   };
 
   # TODO: why didn't it work when adding this to jitsi.nix?
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 880ac0a2..79eba643 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -27,7 +27,6 @@
     };
 
     desktop = {
-      dconf.enable = true;
       dwm.enable = true;
       st.enable = true;
     };
diff --git a/hosts/t490/configuration.nix b/hosts/t490/configuration.nix
index a53adc8a..5da6d5f9 100644
--- a/hosts/t490/configuration.nix
+++ b/hosts/t490/configuration.nix
@@ -15,10 +15,6 @@
     ../../users/opdavies.nix
   ];
 
-  features = {
-    desktop.dconf.enable = true;
-  };
-
   nixpad.enable = true;
 
   boot = {
diff --git a/modules/nixos/dconf.nix b/modules/nixos/dconf.nix
deleted file mode 100644
index eebbfa2c..00000000
--- a/modules/nixos/dconf.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.features.desktop.dconf;
-in
-{
-  options.features.desktop.dconf.enable = mkEnableOption "Enable dconf";
-
-  config = mkIf cfg.enable {
-    programs.dconf.enable = true;
-  };
-}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 0c2ab44a..674ee3fb 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./avahi.nix
-    ./dconf.nix
     ./dwm
     ./gitea-actions-runner.nix
     ./gnupg.nix
diff --git a/modules2/dconf.nix b/modules2/dconf.nix
new file mode 100644
index 00000000..2c56e04c
--- /dev/null
+++ b/modules2/dconf.nix
@@ -0,0 +1,3 @@
+{
+  flake.modules.nixos.pc.programs.dconf.enable = true;
+}