From 1977d6cce2069c7be9cbf20d8abfe2d2e3976116 Mon Sep 17 00:00:00 2001
From: Daryl Ronningen <relms@relms.dev>
Date: Wed, 4 Jan 2023 01:28:54 -0800
Subject: [PATCH] add xresources and switch to st

---
 users/relms/gui.nix | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/users/relms/gui.nix b/users/relms/gui.nix
index fff7d0b..32f8bfd 100644
--- a/users/relms/gui.nix
+++ b/users/relms/gui.nix
@@ -5,24 +5,32 @@
     gnome.gnome-software
     adw-gtk3
     numix-icon-theme-circle
+    (st.overrideAttrs (oldAttrs: {
+      src = builtins.fetchTarball {
+        url = "https://code.relms.dev/Relms/st/archive/25ed626850a7d8cc4f854215a1cf6100278f9929.tar.gz";
+        sha256 = "1y6k496lvcnzpbs8fjyj45gjdiih859ab2skx93xhfl83b5zy3br";
+      };
+      buildInputs = oldAttrs.buildInputs ++ [harfbuzz xorg.libXcursor];
+    }))
   ];
 
-  programs.gnome-terminal = {
+  xresources.extraConfig = builtins.readFile (
+    pkgs.fetchFromGitHub {
+      owner = "catppuccin";
+      repo = "xresources";
+      rev = "d82c02323e05158ad35f302771e3695affafab78";
+      sha256 = "0n6lcn44ih8hqibx470djjns9c7glmnllfrda207wk6w7cz51d4a";
+    }
+    + "/macchiato.Xresources"
+  );
+
+  programs.firefox = {
     enable = true;
-    profile = {
-      default = {
-        default = true;
-        font = "FiraCode Nerd Font Mono";
-        visibleName = "Default";
+    package = pkgs.firefox.override {
+      cfg = {
+        enableGnomeExtensions = true;
+        enableTridactylNative = true;
       };
     };
   };
-
-  programs.firefox.enable = true;
-  programs.firefox.package = pkgs.firefox.override {
-    cfg = {
-      enableGnomeExtensions = true;
-      enableTridactylNative = true;
-    };
-  };
 }