From 6b3c30c700976b22d978fe6247682d6d183260af Mon Sep 17 00:00:00 2001
From: Ryan Schanzenbacher <ryan@rschanz.org>
Date: Wed, 29 Jan 2025 12:30:37 -0500
Subject: [PATCH] Added chromium, delta is git pager, updated hyprland and
 friends

---
 home-config/gitconfig                  | 9 +++++++++
 home-config/nix-home-manager/flake.nix | 6 +++---
 home-config/nix-home-manager/home.nix  | 3 +++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/home-config/gitconfig b/home-config/gitconfig
index 6fa1c67..7b9df6a 100644
--- a/home-config/gitconfig
+++ b/home-config/gitconfig
@@ -8,6 +8,15 @@
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
+[core]
+    pager = delta
+[interactive]
+    diffFilter = delta --color-only
+[delta]
+    navigate = true
+    side-by-side = true
+[merge]
+    conflictStyle = zdiff3
 [color]
 	ui = auto
 [init]
diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix
index f600506..60a9c5a 100644
--- a/home-config/nix-home-manager/flake.nix
+++ b/home-config/nix-home-manager/flake.nix
@@ -17,16 +17,16 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprland = {
-      url = "github:hyprwm/hyprland/0dc7367a7006cc3cc877d52bf34c4998144bff84";
+      url = "github:hyprwm/hyprland/v0.47.0";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.aquamarine.url = "github:hyprwm/aquamarine/7fe006981fae53e931f513026fc754e322f13145";
+      inputs.aquamarine.url = "github:hyprwm/aquamarine/v0.7.2";
     };
     nixgl = {
       url = "github:ryan77627/nixGL/3865170cbc23b32ec7cc8df1ec811fd44b6c2a58";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     wpaperd = {
-      url = "github:danyspin97/wpaperd/7865433233ff58f33ca4af94fd5031e26f409f52";
+      url = "github:danyspin97/wpaperd/b0b7e66fd32dca36c431a174784a2e87af7edb77";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     #mozff.url = "github:mozilla/nixpkgs-mozilla";
diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix
index cf1b56e..bdb3b08 100644
--- a/home-config/nix-home-manager/home.nix
+++ b/home-config/nix-home-manager/home.nix
@@ -400,6 +400,9 @@
     taskwarrior3
     delta
 
+    # Here until i can fix firefox's stupid devtools issue
+    chromium
+
     # Wrapped programs for some env variables
     (pkgs.writeScriptBin "hyprlock" ''
       #! ${pkgs.bash}/bin/bash