summary refs log tree commit diff stats
path: root/user/settings
diff options
context:
space:
mode:
authorAlan Pearce2025-03-24 00:29:46 +0100
committerAlan Pearce2025-03-24 00:29:46 +0100
commit6ad43ebe21d27c0eb8b8a971c7fbcece166bd3b5 (patch)
treeab11561a6457a422d149e0be9d269780393fc2ed /user/settings
parent42194145e701ff01992b309c41d3e3b73b43ba05 (diff)
downloadnixfiles-6ad43ebe21d27c0eb8b8a971c7fbcece166bd3b5.tar.lz
nixfiles-6ad43ebe21d27c0eb8b8a971c7fbcece166bd3b5.tar.zst
nixfiles-6ad43ebe21d27c0eb8b8a971c7fbcece166bd3b5.zip
workstation: don't clobber programs.git.attributes
Diffstat (limited to 'user/settings')
-rw-r--r--user/settings/workstation.nix44
1 files changed, 39 insertions, 5 deletions
diff --git a/user/settings/workstation.nix b/user/settings/workstation.nix
index 44a6e6b4..8a3c5dfd 100644
--- a/user/settings/workstation.nix
+++ b/user/settings/workstation.nix
@@ -33,6 +33,45 @@
     difftastic = {
       enable = true;
     };
+    attributes = [
+      # `mergiraf languages --gitattributes`
+      "*.java merge=mergiraf"
+      "*.kt merge=mergiraf"
+      "*.rs merge=mergiraf"
+      "*.go merge=mergiraf"
+      "*.js merge=mergiraf"
+      "*.jsx merge=mergiraf"
+      "*.mjs merge=mergiraf"
+      "*.json merge=mergiraf"
+      "*.yml merge=mergiraf"
+      "*.yaml merge=mergiraf"
+      "*.toml merge=mergiraf"
+      "*.html merge=mergiraf"
+      "*.htm merge=mergiraf"
+      "*.xhtml merge=mergiraf"
+      "*.xml merge=mergiraf"
+      "*.c merge=mergiraf"
+      "*.h merge=mergiraf"
+      "*.cc merge=mergiraf"
+      "*.cpp merge=mergiraf"
+      "*.hpp merge=mergiraf"
+      "*.cs merge=mergiraf"
+      "*.dart merge=mergiraf"
+      "*.dts merge=mergiraf"
+      "*.scala merge=mergiraf"
+      "*.sbt merge=mergiraf"
+      "*.ts merge=mergiraf"
+      "*.tsx merge=mergiraf"
+      "*.py merge=mergiraf"
+      "*.php merge=mergiraf"
+      "*.phtml merge=mergiraf"
+      "*.sol merge=mergiraf"
+      "*.lua merge=mergiraf"
+      "*.rb merge=mergiraf"
+      "*.nix merge=mergiraf"
+      "*.sv merge=mergiraf"
+      "*.svh merge=mergiraf"
+    ];
     extraConfig = {
       "merge.mergiraf" = {
         name = "mergiraf";
@@ -61,9 +100,4 @@
       };
     };
   };
-  xdg.configFile."git/attributes" = {
-    source = (pkgs.runCommandLocal "mergiraf-gitattributes" { } ''
-      ${pkgs.mergiraf}/bin/mergiraf languages --gitattributes >> $out
-    '');
-  };
 }