From 3fc6ccfec7760d769ea40419aa583a6384e21f15 Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Fri, 8 Nov 2024 00:37:31 +0100
Subject: [PATCH] hyprland: setup hyprpanel, fix nvidia issues, accomodate new
 shadow config

a big part of this was an accidental commit of the gitbutler integration commit that i accidently commited when it broke due to nix rust issues. the new server was also added in this, but further config happens in #1
---
 modules/nixos/desktop/addons/hyprpaper/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/nixos/desktop/addons/hyprpaper/default.nix b/modules/nixos/desktop/addons/hyprpaper/default.nix
index 5f19b72..04d441a 100644
--- a/modules/nixos/desktop/addons/hyprpaper/default.nix
+++ b/modules/nixos/desktop/addons/hyprpaper/default.nix
@@ -1,7 +1,15 @@
 {
   config,
+<<<<<<< HEAD
   lib,
   namespace,
+=======
+  inputs,
+  lib,
+  namespace,
+  pkgs,
+  system,
+>>>>>>> 8f3c53de (hyprland: setup hyprpanel, fix nvidia issues, accomodate new shadow config)
   ...
 }:
 let
@@ -36,6 +44,5 @@ in
         };
       };
     };
-
   };
 }