this repo has no description
merigraf stuff
+43
-10
+9
-9
darwin/flake.lock
+9
-9
darwin/flake.lock
···
68
68
]
69
69
},
70
70
"locked": {
71
-
"lastModified": 1738448366,
72
-
"narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=",
71
+
"lastModified": 1739198052,
72
+
"narHash": "sha256-fvAgCGK2phagbKv2S4YH4AIM566TKasfWMqYl3c3mPQ=",
73
73
"owner": "nix-community",
74
74
"repo": "home-manager",
75
-
"rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
75
+
"rev": "b0bd29bb4b8df265b13bbb4a6639afa74faaa831",
76
76
"type": "github"
77
77
},
78
78
"original": {
···
89
89
]
90
90
},
91
91
"locked": {
92
-
"lastModified": 1738277753,
93
-
"narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=",
92
+
"lastModified": 1739034224,
93
+
"narHash": "sha256-Mj/8jDzh1KNmUhWqEeVlW3hO9MZkxqioJGnmR7rivaE=",
94
94
"owner": "LnL7",
95
95
"repo": "nix-darwin",
96
-
"rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9",
96
+
"rev": "0b6f96a6b9efcfa8d3cc8023008bcbcd1b9bc1a4",
97
97
"type": "github"
98
98
},
99
99
"original": {
···
105
105
},
106
106
"nixpkgs": {
107
107
"locked": {
108
-
"lastModified": 1738297584,
109
-
"narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=",
108
+
"lastModified": 1739019272,
109
+
"narHash": "sha256-7Fu7oazPoYCbDzb9k8D/DdbKrC3aU1zlnc39Y8jy/s8=",
110
110
"owner": "NixOS",
111
111
"repo": "nixpkgs",
112
-
"rev": "9189ac18287c599860e878e905da550aa6dec1cd",
112
+
"rev": "fa35a3c8e17a3de613240fea68f876e5b4896aec",
113
113
"type": "github"
114
114
},
115
115
"original": {
+1
darwin/flake.nix
+1
darwin/flake.nix
+24
dotfiles/.gitattributes
+24
dotfiles/.gitattributes
···
1
+
*.java merge=mergiraf
2
+
*.rs merge=mergiraf
3
+
*.go merge=mergiraf
4
+
*.js merge=mergiraf
5
+
*.jsx merge=mergiraf
6
+
*.json merge=mergiraf
7
+
*.yml merge=mergiraf
8
+
*.yaml merge=mergiraf
9
+
*.toml merge=mergiraf
10
+
*.html merge=mergiraf
11
+
*.htm merge=mergiraf
12
+
*.xhtml merge=mergiraf
13
+
*.xml merge=mergiraf
14
+
*.c merge=mergiraf
15
+
*.h merge=mergiraf
16
+
*.cc merge=mergiraf
17
+
*.cpp merge=mergiraf
18
+
*.hpp merge=mergiraf
19
+
*.cs merge=mergiraf
20
+
*.dart merge=mergiraf
21
+
*.scala merge=mergiraf
22
+
*.sbt merge=mergiraf
23
+
*.ts merge=mergiraf
24
+
*.py merge=mergiraf
+8
-1
dotfiles/.gitconfig
+8
-1
dotfiles/.gitconfig
···
61
61
[url "git@github.com:"]
62
62
insteadOf = https://github.com/
63
63
[checkout]
64
-
workers = 1
64
+
workers = 10
65
+
[merge "mergiraf"]
66
+
name = mergiraf
67
+
driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P
68
+
69
+
# if you haven't got a global gitattributes file yet
70
+
[core]
71
+
attributesfile = ~/.gitattributes
+1
home-manager/home.nix
+1
home-manager/home.nix