From 8f4f9a7bd9876670d7221dec41c27450b18bdecf Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Thu, 20 Jun 2024 15:37:46 +0200
Subject: [PATCH 1/4] Add vesktop

---
 home/programs/graphical/apps/default.nix      |  1 +
 .../graphical/apps/vesktop/default.nix        | 30 +++++++++++++++++++
 hosts/voyager/default.nix                     |  5 ++++
 options/home/programs/default.nix             |  4 +++
 4 files changed, 40 insertions(+)
 create mode 100644 home/programs/graphical/apps/vesktop/default.nix

diff --git a/home/programs/graphical/apps/default.nix b/home/programs/graphical/apps/default.nix
index a2cb1cb..df8e966 100644
--- a/home/programs/graphical/apps/default.nix
+++ b/home/programs/graphical/apps/default.nix
@@ -1,5 +1,6 @@
 _: {
   imports = [
     ./spotify
+    ./vesktop
   ];
 }
diff --git a/home/programs/graphical/apps/vesktop/default.nix b/home/programs/graphical/apps/vesktop/default.nix
new file mode 100644
index 0000000..8ef56eb
--- /dev/null
+++ b/home/programs/graphical/apps/vesktop/default.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  osConfig,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfg = osConfig.myOptions.home-manager.programs.vesktop;
+in {
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [ vesktop ];
+
+    systemd.user.services."vesktop" = mkIf cfg.autoStart {
+      Unit = {
+        Description = "Vesktop (An alternate client for Discord with Vencord built-in)";
+        After = [ "graphical-session.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        Type = "simple";
+        Restart = "on-failure";
+        ExecStart = "${pkgs.vesktop}/bin/vesktop";
+      };
+
+      Install.WantedBy = [ "graphical-session.target" ];
+    };
+  };
+}
diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix
index 8e98428..2aeb09d 100644
--- a/hosts/voyager/default.nix
+++ b/hosts/voyager/default.nix
@@ -62,6 +62,7 @@
             ".mozilla"
             ".mullvad"
             ".config/chromium"
+            ".config/vesktop"
             ".local/share/gnupg"
             ".local/share/zoxide"
             ".local/share/wakatime"
@@ -137,6 +138,10 @@
         };
         spotify.enable = true;
         stremio.enable = true;
+        vesktop = {
+          enable = true;
+          autoStart = true;
+        };
       };
     };
   };
diff --git a/options/home/programs/default.nix b/options/home/programs/default.nix
index 594e834..f271c18 100644
--- a/options/home/programs/default.nix
+++ b/options/home/programs/default.nix
@@ -28,5 +28,9 @@ in
 
     spotify.enable = mkEnableOption "Spotify";
     stremio.enable = mkEnableOption "Stremio free media center";
+    vesktop = {
+      enable = mkEnableOption "Vesktop (An alternate client for Discord with Vencord built-in)";
+      autoStart = mkEnableOption "Auto-Start for Vesktop";
+    };
   };
 }

From 5c1b4748e0e4251a9f7a4ccf84321c227d8722e3 Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Thu, 20 Jun 2024 16:04:20 +0200
Subject: [PATCH 2/4] Fix typo (in eww-window service partof)

---
 home/programs/graphical/bars/eww/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/programs/graphical/bars/eww/default.nix b/home/programs/graphical/bars/eww/default.nix
index cb06535..fa511f9 100644
--- a/home/programs/graphical/bars/eww/default.nix
+++ b/home/programs/graphical/bars/eww/default.nix
@@ -43,7 +43,7 @@ in {
         Unit = {
           Description = "Open %I eww (ElKowar's Wacky Widgets) window";
           After = [ "eww.service" ];
-          PartOf = [ "graphical-session-pre.target" ];
+          PartOf = [ "graphical-session.target" ];
         };
 
         Service = {

From 5df0ffe4e56c58d98a8cc9a272d2de3f89f85bf4 Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Thu, 20 Jun 2024 16:09:01 +0200
Subject: [PATCH 3/4] Add hyfetch settings

---
 home/programs/terminal/tools/hyfetch.nix | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/home/programs/terminal/tools/hyfetch.nix b/home/programs/terminal/tools/hyfetch.nix
index 2f07c9e..53be5f8 100644
--- a/home/programs/terminal/tools/hyfetch.nix
+++ b/home/programs/terminal/tools/hyfetch.nix
@@ -1,3 +1,21 @@
 {
-  programs.hyfetch.enable = true;
+  programs.hyfetch = {
+    enable = true;
+    settings = {
+      preset = "rainbow";
+      mode = "rgb";
+      light_dark = "dark";
+      lightness = 0.65;
+      color_align = {
+        mode = "horizontal";
+        custom_colors = [];
+        force_back = null;
+      };
+      backend = "neofetch";
+      args = null;
+      distro = null;
+      pride_month_shown = [];
+      pride_month_disable = true;
+    };
+  };
 }

From 4f7c9e8a7192a4c0f82c35b4695c954244acf79e Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Thu, 20 Jun 2024 16:20:55 +0200
Subject: [PATCH 4/4] Add fastfetch + toggleability

---
 home/programs/terminal/tools/fastfetch.nix | 14 ++++++++
 home/programs/terminal/tools/hyfetch.nix   | 42 +++++++++++++---------
 hosts/voyager/default.nix                  |  4 +++
 options/home/programs/default.nix          |  5 +++
 4 files changed, 49 insertions(+), 16 deletions(-)
 create mode 100644 home/programs/terminal/tools/fastfetch.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";
+    };
   };
 }