diff --git a/home/programs/terminal/tools/default.nix b/home/programs/terminal/tools/default.nix
index 00fcb55..6dd48fb 100644
--- a/home/programs/terminal/tools/default.nix
+++ b/home/programs/terminal/tools/default.nix
@@ -9,6 +9,7 @@ _: {
     ./zoxide.nix
     ./tealdeer.nix
     ./hyfetch.nix
+    ./fastfetch.nix
     ./btop.nix
     ./bottom.nix
     ./bat.nix
diff --git a/home/programs/terminal/tools/fastfetch.nix b/home/programs/terminal/tools/fastfetch.nix
new file mode 100644
index 0000000..ae82717
--- /dev/null
+++ b/home/programs/terminal/tools/fastfetch.nix
@@ -0,0 +1,14 @@
+{
+  lib,
+  osConfig,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfg = osConfig.myOptions.home-manager.programs.tools.fastfetch;
+in {
+  config = mkIf cfg.enable {
+    programs.fastfetch.enable = true;
+  };
+}
+
diff --git a/home/programs/terminal/tools/hyfetch.nix b/home/programs/terminal/tools/hyfetch.nix
index 53be5f8..cc2ff7f 100644
--- a/home/programs/terminal/tools/hyfetch.nix
+++ b/home/programs/terminal/tools/hyfetch.nix
@@ -1,21 +1,31 @@
 {
-  programs.hyfetch = {
-    enable = true;
-    settings = {
-      preset = "rainbow";
-      mode = "rgb";
-      light_dark = "dark";
-      lightness = 0.65;
-      color_align = {
-        mode = "horizontal";
-        custom_colors = [];
-        force_back = null;
+  lib,
+  osConfig,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfg = osConfig.myOptions.home-manager.programs.tools.hyfetch;
+in {
+  config = mkIf cfg.enable {
+    programs.hyfetch = {
+      enable = true;
+      settings = {
+        preset = "rainbow";
+        mode = "rgb";
+        light_dark = "dark";
+        lightness = 0.65;
+        color_align = {
+          mode = "custom";
+          custom_colors = {};
+          force_back = null;
+        };
+        backend = "neofetch";
+        args = null;
+        distro = null;
+        pride_month_shown = [];
+        pride_month_disable = true;
       };
-      backend = "neofetch";
-      args = null;
-      distro = null;
-      pride_month_shown = [];
-      pride_month_disable = true;
     };
   };
 }
diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix
index 2aeb09d..1fde840 100644
--- a/hosts/voyager/default.nix
+++ b/hosts/voyager/default.nix
@@ -136,6 +136,10 @@
           chromium.enable = true;
           mullvad-browser.enable = true;
         };
+        tools = {
+          fastfetch.enable = true;
+          hyfetch.enable = true;
+        };
         spotify.enable = true;
         stremio.enable = true;
         vesktop = {
diff --git a/options/home/programs/default.nix b/options/home/programs/default.nix
index f271c18..422399e 100644
--- a/options/home/programs/default.nix
+++ b/options/home/programs/default.nix
@@ -32,5 +32,10 @@ in
       enable = mkEnableOption "Vesktop (An alternate client for Discord with Vencord built-in)";
       autoStart = mkEnableOption "Auto-Start for Vesktop";
     };
+
+    tools = {
+      fastfetch.enable = mkEnableOption "FastFetch (fast neofetch)";
+      hyfetch.enable = mkEnableOption "Neofetch with pride flags";
+    };
   };
 }