4Lost/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge test

Browse Source
This commit is contained in:
4Lost
2025-04-30 13:41:48 +02:00
parent e257ff991d 7fb65ea258
commit 4364cc2d16
25 changed files with 1381 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
overlays/obsidian.nix
View File

@@ -3,7 +3,11 @@ final: prev: {
src = prev.fetchurl {
url = old.src.url;
<<<<<<< HEAD
hash = "sha256-bvmvzVyHrjh1Yj3JxEfry521CMX3E2GENmXddEeLwiE=";
=======
hash = "sha256-XVq0nQiyT2HvKQpzJIvhghsGgg4ye7uqZcyA1nH4O/o=";
>>>>>>> test
};
});
}

14
overlays/obsidian.nix.orig Normal file
View File

@@ -0,0 +1,14 @@
final: prev: {
obsidian = prev.obsidian.overrideAttrs (old: {
src = prev.fetchurl {
url = old.src.url;
<<<<<<< HEAD
hash = "sha256-bvmvzVyHrjh1Yj3JxEfry521CMX3E2GENmXddEeLwiE=";
=======
hash = "sha256-XVq0nQiyT2HvKQpzJIvhghsGgg4ye7uqZcyA1nH4O/o=";
>>>>>>> test
};
});
}