From 4cdf7d0e041b9e564d196fbc1d6447de61c087b3 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Sun, 4 Jun 2023 09:14:19 -0400
Subject: [PATCH] nix: Simplify

This commit removes some premature modularization to make it easier to
see and manipulate everything at once.
---
 flake.nix                          |  2 +-
 games/osu/default.nix => games.nix |  5 +++++
 games/default.nix                  | 14 --------------
 games/srb2/default.nix             |  8 --------
 4 files changed, 6 insertions(+), 23 deletions(-)
 rename games/osu/default.nix => games.nix (65%)
 delete mode 100644 games/default.nix
 delete mode 100644 games/srb2/default.nix

diff --git a/flake.nix b/flake.nix
index 2b24add3..c576eb91 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,7 +47,7 @@
         ./user.nix
         ./desktop
         ./dev
-        ./games
+        ./games.nix
         ./host
         ./terminal
         ./containers/rar.nix
diff --git a/games/osu/default.nix b/games.nix
similarity index 65%
rename from games/osu/default.nix
rename to games.nix
index 86f7755c..20b661f3 100644
--- a/games/osu/default.nix
+++ b/games.nix
@@ -1,7 +1,12 @@
 { pkgs, lib, ... }:
 
 {
+  programs.gamemode.enable = true;
+
   environment.systemPackages = with pkgs; [
+    (pkgs.callPackage ./packages/srb2 { })
+    slade
+    typespeed
     osu-lazer-bin
   ];
 
diff --git a/games/default.nix b/games/default.nix
deleted file mode 100644
index 3ed852cc..00000000
--- a/games/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    ./osu
-    ./srb2
-  ];
-
-  programs.gamemode.enable = true;
-
-  environment.systemPackages = with pkgs; [
-    typespeed
-  ];
-}
diff --git a/games/srb2/default.nix b/games/srb2/default.nix
deleted file mode 100644
index 84a212dc..00000000
--- a/games/srb2/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    (pkgs.callPackage ../../packages/srb2 { })
-    slade
-  ];
-}