diff --git a/modules/apps/steam/default.nix b/modules/apps/steam/default.nix
new file mode 100644
index 0000000..229fa73
--- /dev/null
+++ b/modules/apps/steam/default.nix
@@ -0,0 +1,22 @@
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.aa.apps.steam;
+in {
+  options.aa.apps.steam = with types; {
+    enable = mkEnableOption "steam";
+  };
+
+  config = mkIf cfg.enable {
+    programs.steam = {
+      enable = true;
+      remotePlay.openFirewall = true;
+      dedicatedServer.openFirewall = true;
+    };
+  };
+}
diff --git a/modules/suites/gaming/default.nix b/modules/suites/gaming/default.nix
new file mode 100644
index 0000000..c6b4124
--- /dev/null
+++ b/modules/suites/gaming/default.nix
@@ -0,0 +1,20 @@
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.aa.suites.gaming;
+in {
+  options.aa.suites.gaming = with lib.types; {
+    enable = mkEnableOption "gaming configuration";
+  };
+
+  config = mkIf cfg.enable {
+    aa.apps = {
+      steam.enable = true;
+    };
+  };
+}
diff --git a/systems/x86_64-linux/gospel/default.nix b/systems/x86_64-linux/gospel/default.nix
index 50b1618..6d7fac1 100644
--- a/systems/x86_64-linux/gospel/default.nix
+++ b/systems/x86_64-linux/gospel/default.nix
@@ -13,6 +13,20 @@
     ./vpn.nix
   ];
 
+  aa = {
+    nix.enable = true;
+
+    suites.desktop.enable = true;
+    suites.gaming.enable = true;
+
+    tools.git.enable = true;
+    tools.zsh.enable = true;
+    tools.exa.enable = true;
+
+    apps.neovim.enable = true;
+    apps.tmux.enable = true;
+  };
+
   boot.binfmt.emulatedSystems = ["aarch64-linux" "armv6l-linux"];
 
   hardware.opengl = {
@@ -23,14 +37,6 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  nix = {
-    # Make ready for nix flakes
-    package = pkgs.nixVersions.stable;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-  };
-
   networking.hostName = "gospel"; # Define your hostname.
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
@@ -89,12 +95,6 @@
     extraPackages = with pkgs; [swaylock];
   };
 
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true;
-    dedicatedServer.openFirewall = true;
-  };
-
   fonts.fonts = with pkgs; [
     (nerdfonts.override {fonts = ["Hack"];})
   ];