fonts, steam: convert to nixos modules

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";

services/default.nix

@@ -1,5 +1,7 @@
 {
   imports = [
+    ./fonts.nix
     ./forgejo.nix
+    ./steam.nix
   ];
 }

services/evolution.nix

@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  programs.evolution.enable = true;
-}

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
+    ];
+  };
 }

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;
-}
+  config = mkIf cfg.enable {
+    programs.steam = {
+      enable = true;
+      remotePlay.openFirewall = true;
+      dedicatedServer.openFirewall = true;
+    };
+
+    services.joycond.enable = true;
+  };
+}