merge conflict

home/lilith/firefox/default.nix

@@ -1,7 +1,7 @@
 {zen-browser, system, pkgs, lib, ...}: {
   imports = [ zen-browser.homeManagerModules.zen-browser ];
 
-  # home.file.".mozilla/native-messaging-hosts".source = lib.mkForce "/home/lilith/.mozilla/native-messaging-hosts";
+  home.file.".mozilla/native-messaging-hosts".source = lib.mkForce "/home/lilith/.mozilla/native-messaging-hosts";
 
   programs.zen-browser = {
     enable = true;

home/lilith/hyprpanel.nix

@@ -7,5 +7,47 @@
     overlay.enable = true;
 
     hyprland.enable = true;
+
+    layout."*" = {
+      left = [ "dashboard" "workspaces" "windowtitle"];
+      middle = [ "media" ];
+      right = [ "volume" "network" "bluetooth" "systray" "clock" "battery" "notifications"];
+    };
+
+    settings = {
+      bar = {
+        clock.format = "%F %H:%M";
+        
+        battery.label = true;
+
+        launcher.icon = "";
+
+        workspaces = {
+          ignored = "-.+";
+          show_numbered = true;
+        };
+      };
+
+      menus.dashboard = {
+        directories.enabled = false;
+        powermenu.logout = "hyprlock";
+        shortcuts.enabled = false;
+        stats.enable_gpu = true;
+      };
+
+      theme = {
+        bar.transparent = true;
+
+        font.name = "JetBrains Mono NF";
+        
+        matugen = true;
+        matugen_settings = {
+          # contrast = 0.3;
+          variation = "standard_3";
+        };
+      };
+      wallpaper.enable = true;
+      wallpaper.image = "${../../wallpapers/default.jpg}";
+    };
   };
 }

system/optional/stylix.nix

@@ -14,7 +14,7 @@
     stylix = {
       enable = true;
 
-      image = ../../wallpapers/default.png;
+      image = ../../wallpapers/default.jpg;
       polarity = "dark";
 
       opacity = {