From c137417db261cca166350a4c86bd23bc7b162550 Mon Sep 17 00:00:00 2001
From: Adrian G L <adrian@lauterer.it>
Date: Wed, 3 Sep 2025 10:23:04 +0200
Subject: [PATCH] fix: formatting and merge conflicts

---
 home/colors.nix           | 10 ++++++----
 modules/develPackages.nix |  7 -------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/home/colors.nix b/home/colors.nix
index b959a3f..50db1a0 100644
--- a/home/colors.nix
+++ b/home/colors.nix
@@ -1,5 +1,10 @@
 # home.nix
-{ pkgs, config, nix-colors, ... }:
+{
+  pkgs,
+  config,
+  nix-colors,
+  ...
+}:
 
 let
   nix-colors-lib = nix-colors.lib.contrib { inherit pkgs; };
@@ -142,8 +147,6 @@ let
     @define-color tooltip_bg_color #${c.base01};
     @define-color tooltip_fg_color #${c.base05};
   '';
-  };
-
 in
 {
   imports = [ nix-colors.homeManagerModules.default ];
@@ -255,7 +258,6 @@ in
     };
   };
 
-
   home.packages = with pkgs; [
     papirus-icon-theme
     gnome-themes-extra
diff --git a/modules/develPackages.nix b/modules/develPackages.nix
index b12a5c9..a85261b 100644
--- a/modules/develPackages.nix
+++ b/modules/develPackages.nix
@@ -4,10 +4,6 @@
   lib,
   ...
 }:
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
 {
   environment.systemPackages = with pkgs; [
     gdb
@@ -62,8 +58,5 @@
 
   ];
 
-<<<<<<< Updated upstream
-=======
   programs.dconf.enable = lib.mkDefault true;
->>>>>>> Stashed changes
 }