From 17f8ee38a0e3aaf0dfd17f26c8bdab1791574943 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Fri, 4 Jul 2025 22:06:35 -0400
Subject: [PATCH] Use fastfetch

---
 clients/quadraticserver/grapevine.nix   |  5 +-
 modules/common/fastfetch.nix            | 92 +++++++++++++++++++++++++
 modules/common/neowofetch/default.nix   |  3 -
 modules/common/neowofetch/neofetch.conf | 56 ---------------
 4 files changed, 93 insertions(+), 63 deletions(-)
 create mode 100644 modules/common/fastfetch.nix
 delete mode 100644 modules/common/neowofetch/default.nix
 delete mode 100644 modules/common/neowofetch/neofetch.conf

diff --git a/clients/quadraticserver/grapevine.nix b/clients/quadraticserver/grapevine.nix
index d995812..3ee3434 100644
--- a/clients/quadraticserver/grapevine.nix
+++ b/clients/quadraticserver/grapevine.nix
@@ -31,9 +31,6 @@
       };
     };
 
-    caddy.virtualHosts."${subdomain}" = {
-      serverAliases = ["${subdomain}:8448"];
-      extraConfig = "reverse_proxy 127.0.0.3:6167";
-    };
+    caddy.virtualHosts."${subdomain}".extraConfig = "reverse_proxy 127.0.0.3:6167";
   };
 }
diff --git a/modules/common/fastfetch.nix b/modules/common/fastfetch.nix
new file mode 100644
index 0000000..30d6602
--- /dev/null
+++ b/modules/common/fastfetch.nix
@@ -0,0 +1,92 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  environment.shellAliases.neofetch = "${lib.getExe pkgs.fastfetch} --config ${pkgs.writers.writeJSON "fastfetch.json" {
+    logo = rec {
+      height = 16;
+      width = height;
+    };
+    display.separator = "  ";
+    modules = [
+      "break"
+
+      {
+        type = "custom";
+        format = "{#light_blue}┌─────────{#} Hardware Information {#light_blue}──────────";
+      }
+      {
+        type = "cpu";
+        key = "├";
+      }
+      {
+        type = "gpu";
+        key = "├─󰍹";
+      }
+      {
+        type = "board";
+        key = "├";
+      }
+
+      {
+        type = "custom";
+        format = "{#light_blue}├─────────{#} Software Information {#light_blue}──────────";
+      }
+      {
+        type = "os";
+        key = "├";
+      }
+      {
+        type = "kernel";
+        key = "├";
+      }
+      {
+        type = "memory";
+        key = "├";
+      }
+      {
+        type = "disk";
+        key = "├";
+      }
+      {
+        type = "de";
+        key = "├";
+      }
+      {
+        type = "terminal";
+        key = "├󰆍";
+      }
+      {
+        type = "shell";
+        key = "├󰈺";
+      }
+      {
+        type = "font";
+        key = "├";
+      }
+      {
+        type = "wmtheme";
+        key = "├󰉼";
+      }
+      {
+        type = "icons";
+        key = "├";
+      }
+      {
+        type = "cursor";
+        key = "├󰇀";
+      }
+      {
+        type = "packages";
+        key = "├󰏖";
+      }
+      {
+        type = "custom";
+        format = "{#light_blue}└────────────────────────────────────────";
+      }
+
+      "break"
+    ];
+  }}";
+}
diff --git a/modules/common/neowofetch/default.nix b/modules/common/neowofetch/default.nix
deleted file mode 100644
index 7f92393..0000000
--- a/modules/common/neowofetch/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  environment.shellAliases.neofetch = "${pkgs.hyfetch}/bin/neowofetch --config ${./neofetch.conf}";
-}
diff --git a/modules/common/neowofetch/neofetch.conf b/modules/common/neowofetch/neofetch.conf
deleted file mode 100644
index 77130bb..0000000
--- a/modules/common/neowofetch/neofetch.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-print_info() {
-	prin "    ${cl7}┌─────────${cl0}\n Hardware Information \n${cl7}──────────"
-	info "├" cpu
-	info "├─󰍹" gpu
-	info "├" memory
-	prin "    ${cl7}├─────────${cl0}\n Software Information \n${cl7}──────────"
-	info "├" distro
-	info "├" kernel
-	info "├" de
-	info "├" shell
-	info "├󰆍" term
-	info "├" theme
-	info "├󰏖" packages
-	prin "    ${cl7}└────────────────────────────────────────"
-	prin "\n \n \n \n \n ${cl3} \n \n ${cl5} \n \n ${cl2} \n \n ${cl6}  \n \n ${cl4}  \n \n ${cl1}  \n \n ${cl7}  \n \n ${cl0}"
-}
-
-magenta="\033[1;35m"
-green="\033[1;32m"
-white="\033[1;37m"
-blue="\033[1;34m"
-red="\033[1;31m"
-black="\033[1;40;30m"
-yellow="\033[1;33m"
-cyan="\033[1;36m"
-reset="\033[0m"
-bgyellow="\033[1;43;33m"
-bgwhite="\033[1;47;37m"
-cl0="${reset}"
-cl1="${magenta}"
-cl2="${green}"
-cl3="${white}"
-cl4="${blue}"
-cl5="${red}"
-cl6="${yellow}"
-cl7="${cyan}"
-cl8="${black}"
-cl9="${bgyellow}"
-cl10="${bgwhite}"
-color_blocks="off"
-os_arch="off"
-memory_percent="on"
-package_managers="on"
-shell_version="off"
-speed_shorthand="on"
-cpu_brand="on"
-cpu_speed="off"
-cpu_cores="off"
-gtk_shorthand="on"
-de_version="off"
-separator="​"
-memory_display="on"
-disk_display="on"
-colors=(0 0 0 6 6 7)
-ascii_colors=(6 6 6 6 6 6)
-image_size="250px"
\ No newline at end of file