From 1a8333829e9611f16cda897e22ce92e23356ed02 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Sun, 6 Apr 2025 20:25:14 +0200
Subject: [PATCH] Minor module refactors

---
 modules/home/de-utils/gammastep.nix | 13 ++++++++++++-
 modules/home/virt-manager.nix       | 13 +++++++++++++
 modules/home/virtualisation.nix     | 13 -------------
 modules/system/sops.nix             | 15 +++------------
 4 files changed, 28 insertions(+), 26 deletions(-)
 create mode 100644 modules/home/virt-manager.nix
 delete mode 100644 modules/home/virtualisation.nix

diff --git a/modules/home/de-utils/gammastep.nix b/modules/home/de-utils/gammastep.nix
index 6216462..89e4fc7 100644
--- a/modules/home/de-utils/gammastep.nix
+++ b/modules/home/de-utils/gammastep.nix
@@ -1,8 +1,19 @@
-{ config, lib, ... }:
+{ config, lib, ... }@moduleArgs:
 {
   options.myConfig.deUtils.gammastep.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.myConfig.deUtils.gammastep.enable {
+    assertions = [
+      {
+        assertion =
+          let
+            inherit (moduleArgs.osConfig.services) geoclue2;
+          in
+          geoclue2.enable or true && geoclue2.appConfig.gammastep.isAllowed or true;
+        message = "gammastep requires geoclue";
+      }
+    ];
+
     services.gammastep = {
       enable = true;
       provider = "geoclue2";
diff --git a/modules/home/virt-manager.nix b/modules/home/virt-manager.nix
new file mode 100644
index 0000000..c0af4b5
--- /dev/null
+++ b/modules/home/virt-manager.nix
@@ -0,0 +1,13 @@
+{ config, lib, ... }@moduleArgs:
+{
+  options.myConfig.virt-manager.enable = lib.mkEnableOption "" // {
+    default = moduleArgs.osConfig.programs.virt-manager.enable or false;
+  };
+
+  config = lib.mkIf config.myConfig.virt-manager.enable {
+    dconf.settings."org/virt-manager/virt-manager/connections" = {
+      autoconnect = [ "qemu:///system" ];
+      uris = [ "qemu:///system" ];
+    };
+  };
+}
diff --git a/modules/home/virtualisation.nix b/modules/home/virtualisation.nix
deleted file mode 100644
index e1c6513..0000000
--- a/modules/home/virtualisation.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, ... }@moduleArgs:
-{
-  options.myConfig.virtualisation.enable = lib.mkEnableOption "" // {
-    default = moduleArgs.osConfig.myConfig.virtualisation.enable or false;
-  };
-
-  config = lib.mkIf config.myConfig.virtualisation.enable {
-    dconf.settings."org/virt-manager/virt-manager/connections" = {
-      autoconnect = [ "qemu:///system" ];
-      uris = [ "qemu:///system" ];
-    };
-  };
-}
diff --git a/modules/system/sops.nix b/modules/system/sops.nix
index f90c1dc..029aca4 100644
--- a/modules/system/sops.nix
+++ b/modules/system/sops.nix
@@ -5,24 +5,15 @@
   lib,
   ...
 }:
-let
-  cfg = config.myConfig.sops;
-in
 {
   imports = [ inputs.sops-nix.nixosModules.sops ];
 
-  options.myConfig.sops = {
-    enable = lib.mkEnableOption "";
-    defaultSopsFile = lib.mkOption {
-      type = lib.types.path;
-      default = "${self}/hosts/${config.networking.hostName}/secrets.yaml";
-    };
-  };
+  options.myConfig.sops.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf config.myConfig.sops.enable {
     sops = {
       age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
-      inherit (cfg) defaultSopsFile;
+      defaultSopsFile = "${self}/hosts/${config.networking.hostName}/secrets.yaml";
     };
   };
 }