From 5290f25062708b607ba63ef2573258ce389b870c Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Fri, 6 Sep 2024 02:50:40 +0100
Subject: [PATCH] steam: move to common config

---
 common/default.nix      |  1 +
 common/steam.nix        | 10 ++++++++++
 hosts/tohru/default.nix |  4 ++--
 services/default.nix    |  1 -
 services/steam.nix      | 21 ---------------------
 5 files changed, 13 insertions(+), 24 deletions(-)
 create mode 100644 common/steam.nix
 delete mode 100644 services/steam.nix

diff --git a/common/default.nix b/common/default.nix
index f6c8c0a..849dc3d 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -7,5 +7,6 @@
     ./nginx.nix
     ./openssh.nix
     ./security.nix
+    ./steam.nix
   ];
 }
\ No newline at end of file
diff --git a/common/steam.nix b/common/steam.nix
new file mode 100644
index 0000000..5f538fa
--- /dev/null
+++ b/common/steam.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+
+{
+  programs.steam = {
+    remotePlay.openFirewall = true;
+    dedicatedServer.openFirewall = true;
+  };
+
+  services.joycond.enable = config.programs.steam.enable;
+}
diff --git a/hosts/tohru/default.nix b/hosts/tohru/default.nix
index 06e6736..c8d2ec3 100644
--- a/hosts/tohru/default.nix
+++ b/hosts/tohru/default.nix
@@ -46,9 +46,9 @@
   ];
   home-manager.users.qenya.imports = [ ./home.nix ];
 
-  programs.evolution.enable = true;
+  programs.evolution.enable = true; # not in home-manager yet; not declaratively configurable yet
+  programs.steam.enable = true;
   qenya.services.fonts.enable = true;
-  qenya.services.steam.enable = true;
 
   system.stateVersion = "23.11";
 }
diff --git a/services/default.nix b/services/default.nix
index 7c73723..d9c3ff2 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -2,6 +2,5 @@
   imports = [
     ./fonts.nix
     ./forgejo.nix
-    ./steam.nix
   ];
 }
\ No newline at end of file
diff --git a/services/steam.nix b/services/steam.nix
deleted file mode 100644
index d7ef010..0000000
--- a/services/steam.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.qenya.services.steam;
-in
-{
-  options.qenya.services.steam = {
-    enable = mkEnableOption "Steam";
-  };
-
-  config = mkIf cfg.enable {
-    programs.steam = {
-      enable = true;
-      remotePlay.openFirewall = true;
-      dedicatedServer.openFirewall = true;
-    };
-
-    services.joycond.enable = true;
-  };
-}