Update customer and project specifics

Use 3 way annotation within files.
Use other algorithm.

home/files/phpactor/phpactor.yml

@@ -7,9 +7,13 @@
 "indexer.exclude_patterns":
   - "**\/var\/**\/*"
   - "**\/typo3temp\/**\/*"
+  - "**\/typo3export\/**\/*"
+  - "**\/imgserver\/**\/*"
   - "**\/fileadmin\/**\/*"
   - "**\/uploads\/**\/*"
   - "**\/Resources\/Public\/**\/*"
+  - "**\/*Assert.php"
+  - "**\/*Database.php"
   - "**\/node_modules\/**\/*"
   - "**\/stubs-rector\/**\/*"
   - "**\/.ddev\/**\/*"

home/programs/firefox.nix

@@ -287,6 +287,7 @@ in {
         "pref.privacy.disable_button.view_passwords" = false;
         "app.shield.optoutstudies.enabled" = false;
 
+        "cookiebanners.service.mode" = 1;
         "cookiebanners.service.mode.privateBrowsing" = 1;
         "cookiebanners.ui.desktop.enabled" = true;
 

home/programs/git.nix

@@ -94,10 +94,11 @@
       whitespace = "-blank-at-eol,-space-before-tab,-indent-with-non-tab,-tab-in-indent,-blank-at-eof,-trailing-space-,cr-at-eol";
     };
 
-    # Not possible right now, due to: https://github.com/gitonomy/gitlib/issues/114 for onw customer project
-    # diff = {
-    #   noprefix = true;
-    # };
+    diff = {
+      # Not possible right now, due to: https://github.com/gitonomy/gitlib/issues/114 for own customer project
+      # noprefix = true;
+      algorithm = "histogram";
+    };
 
     pager = {
       branch = false;
@@ -133,6 +134,7 @@
 
     merge = {
       ff = true;
+      conflictstyle = "zdiff3";
       tool = "nvimdiff4";
     };