diff --git a/homes/x86_64-linux/theobori@laptop/default.nix b/homes/x86_64-linux/theobori@laptop/default.nix
index 943c72e..027cf83 100644
--- a/homes/x86_64-linux/theobori@laptop/default.nix
+++ b/homes/x86_64-linux/theobori@laptop/default.nix
@@ -1,6 +1,6 @@
 { lib, namespace, ... }:
 let
-  inherit (lib.${namespace}) enabled;
+  inherit (lib.${namespace}) enabled disabled;
 in
 {
   theobori-nix = {
@@ -10,6 +10,9 @@ in
       gaming = enabled;
     };
 
+    # xonotic-data is too long to download
+    games.xonotic = disabled;
+
     user = {
       enable = true;
       name = "theobori";
diff --git a/modules/home/cli/programs/fastfetch/default.nix b/modules/home/cli/programs/fastfetch/default.nix
new file mode 100644
index 0000000..fcf92c4
--- /dev/null
+++ b/modules/home/cli/programs/fastfetch/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  config,
+  namespace,
+  ...
+}:
+let
+  inherit (lib) mkIf;
+  inherit (lib.${namespace}) mkBoolOpt;
+
+  cfg = config.${namespace}.cli.programs.fastfetch;
+in
+{
+  options.${namespace}.cli.programs.fastfetch = {
+    enable = mkBoolOpt false "Whether or not to enable fastfetch.";
+  };
+
+  config = mkIf cfg.enable {
+    programs.fastfetch = {
+      enable = true;
+    };
+  };
+}
diff --git a/modules/home/games/ninvaders/default.nix b/modules/home/games/ninvaders/default.nix
new file mode 100644
index 0000000..c58a3e6
--- /dev/null
+++ b/modules/home/games/ninvaders/default.nix
@@ -0,0 +1,20 @@
+{
+  pkgs,
+  config,
+  lib,
+  namespace,
+  ...
+}:
+let
+  inherit (lib) mkIf;
+  inherit (lib.${namespace}) mkBoolOpt;
+
+  cfg = config.${namespace}.games.ninvaders;
+in
+{
+  options.${namespace}.games.ninvaders = {
+    enable = mkBoolOpt false "Enable ninvaders.";
+  };
+
+  config = mkIf cfg.enable { home.packages = with pkgs; [ ninvaders ]; };
+}
diff --git a/modules/home/games/space-cadet-pinball/default.nix b/modules/home/games/space-cadet-pinball/default.nix
new file mode 100644
index 0000000..cd3b42a
--- /dev/null
+++ b/modules/home/games/space-cadet-pinball/default.nix
@@ -0,0 +1,20 @@
+{
+  pkgs,
+  config,
+  lib,
+  namespace,
+  ...
+}:
+let
+  inherit (lib) mkIf;
+  inherit (lib.${namespace}) mkBoolOpt;
+
+  cfg = config.${namespace}.games.space-cadet-pinball;
+in
+{
+  options.${namespace}.games.space-cadet-pinball = {
+    enable = mkBoolOpt false "Enable space-cadet-pinball.";
+  };
+
+  config = mkIf cfg.enable { home.packages = with pkgs; [ space-cadet-pinball ]; };
+}
diff --git a/modules/home/games/xonotic/default.nix b/modules/home/games/xonotic/default.nix
new file mode 100644
index 0000000..c49ab4f
--- /dev/null
+++ b/modules/home/games/xonotic/default.nix
@@ -0,0 +1,20 @@
+{
+  pkgs,
+  config,
+  lib,
+  namespace,
+  ...
+}:
+let
+  inherit (lib) mkIf;
+  inherit (lib.${namespace}) mkBoolOpt;
+
+  cfg = config.${namespace}.games.xonotic;
+in
+{
+  options.${namespace}.games.xonotic = {
+    enable = mkBoolOpt false "Enable xonotic.";
+  };
+
+  config = mkIf cfg.enable { home.packages = with pkgs; [ xonotic ]; };
+}
diff --git a/modules/home/roles/development/default.nix b/modules/home/roles/development/default.nix
index 5e5b78f..1c74059 100644
--- a/modules/home/roles/development/default.nix
+++ b/modules/home/roles/development/default.nix
@@ -32,6 +32,7 @@ in
           direnv = enabled;
           eza = enabled;
           fzf = enabled;
+          fastfetch = enabled;
           git = enabled;
           gpg = enabled;
           htop = enabled;
diff --git a/modules/home/roles/gaming/default.nix b/modules/home/roles/gaming/default.nix
index cc6b065..bcf86a6 100644
--- a/modules/home/roles/gaming/default.nix
+++ b/modules/home/roles/gaming/default.nix
@@ -22,6 +22,9 @@ in
         taterclient-ddnet = enabled;
         supermariowar = enabled;
         vkquake = enabled;
+        ninvaders = enabled;
+        space-cadet-pinball = enabled;
+        # xonotic = enabled;
       };
     };
   };