mirror of
https://forge.katzen.cafe/schrottkatze/nix-configs.git
synced 2024-11-05 15:16:23 +01:00
wtfstuff
This commit is contained in:
parent
2ca763bfde
commit
576e539bc5
|
@ -24,13 +24,19 @@
|
||||||
"mac-brcm-fw": {
|
"mac-brcm-fw": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
<<<<<<< HEAD
|
||||||
"lastModified": 1664744853,
|
"lastModified": 1664744853,
|
||||||
"narHash": "sha256-i5EFVTIDHQCtFg/OFLmjOzbJqhpwy4MjwBmFUnq0DjI=",
|
"narHash": "sha256-i5EFVTIDHQCtFg/OFLmjOzbJqhpwy4MjwBmFUnq0DjI=",
|
||||||
"path": "/home/jade/mac-brcm-fw",
|
"path": "/home/jade/mac-brcm-fw",
|
||||||
|
=======
|
||||||
|
"lastModified": 1,
|
||||||
|
"narHash": "sha256-ewzM8IBKNFCx73ah5rflcdx605ukRF3oTWwih2CTsvs=",
|
||||||
|
"path": "./mac-brcm-fw",
|
||||||
|
>>>>>>> 801cd65 (stuff)
|
||||||
"type": "path"
|
"type": "path"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"path": "../mac-brcm-fw",
|
"path": "./mac-brcm-fw",
|
||||||
"type": "path"
|
"type": "path"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
};
|
};
|
||||||
nixos-hardware.url = "github:kekrby/nixos-hardware";
|
nixos-hardware.url = "github:kekrby/nixos-hardware";
|
||||||
mac-brcm-fw = {
|
mac-brcm-fw = {
|
||||||
url = "path:../mac-brcm-fw";
|
url = "path:./mac-brcm-fw";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
3
mac-brcm-fw/default.nix
Normal file
3
mac-brcm-fw/default.nix
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
{ ... }: {}
|
||||||
|
|
||||||
|
# dummy
|
Loading…
Reference in a new issue