From e3068a144a7c071c71ac5408db4316351bc5823a Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Wed, 24 Jul 2024 18:29:29 +0100
Subject: [PATCH] fonts, steam: convert to nixos modules

---
 hosts/tohru/configuration.nix |  5 ++++-
 services/default.nix          |  2 ++
 services/evolution.nix        |  5 -----
 services/fonts.nix            | 16 +++++++++++++---
 services/steam.nix            | 22 ++++++++++++++++------
 5 files changed, 35 insertions(+), 15 deletions(-)
 delete mode 100644 services/evolution.nix

diff --git a/hosts/tohru/configuration.nix b/hosts/tohru/configuration.nix
index e969ad7..64d293a 100644
--- a/hosts/tohru/configuration.nix
+++ b/hosts/tohru/configuration.nix
@@ -5,7 +5,6 @@
     [
       ./hardware-configuration.nix
       ./home.nix
-      ../../services/evolution.nix
       ../../services/fonts.nix
       ../../services/steam.nix
       ./syncthing.nix
@@ -16,6 +15,10 @@
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.systemd-boot.editor = false;
 
+  programs.evolution.enable = true;
+  qenya.services.fonts.enable = true;
+  qenya.services.steam.enable = true;
+
   networking.networkmanager.enable = true;
 
   i18n.defaultLocale = "en_GB.UTF-8";
diff --git a/services/default.nix b/services/default.nix
index beecd73..7c73723 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -1,5 +1,7 @@
 {
   imports = [
+    ./fonts.nix
     ./forgejo.nix
+    ./steam.nix
   ];
 }
\ No newline at end of file
diff --git a/services/evolution.nix b/services/evolution.nix
deleted file mode 100644
index 900fb38..0000000
--- a/services/evolution.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  programs.evolution.enable = true;
-}
diff --git a/services/fonts.nix b/services/fonts.nix
index 1820cd9..2845030 100644
--- a/services/fonts.nix
+++ b/services/fonts.nix
@@ -1,7 +1,17 @@
 { config, lib, pkgs, ... }:
 
+let
+  cfg = config.qenya.services.fonts;
+  inherit (lib) mkIf mkEnableOption;
+in
 {
-  fonts.packages = with pkgs; [
-    corefonts
-  ];
+  options.qenya.services.fonts = {
+    enable = mkEnableOption "Fonts";
+  };
+
+  config = mkIf cfg.enable {
+    fonts.packages = with pkgs; [
+      corefonts
+    ];
+  };
 }
diff --git a/services/steam.nix b/services/steam.nix
index d59135c..0a3c3d4 100644
--- a/services/steam.nix
+++ b/services/steam.nix
@@ -1,11 +1,21 @@
 { config, lib, pkgs, ... }:
 
+let
+  cfg = config.qenya.services.steam;
+  inherit (lib) mkIf mkEnableOption;
+in
 {
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true;
-    dedicatedServer.openFirewall = true;
+  options.qenya.services.steam = {
+    enable = mkEnableOption "Steam";
   };
 
-  services.joycond.enable = true;
-}
\ No newline at end of file
+  config = mkIf cfg.enable {
+    programs.steam = {
+      enable = true;
+      remotePlay.openFirewall = true;
+      dedicatedServer.openFirewall = true;
+    };
+
+    services.joycond.enable = true;
+  };
+}