diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 953db1b..0000000 --- a/flake.lock +++ /dev/null @@ -1,237 +0,0 @@ -{ - "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1603796912, - "narHash": "sha256-6ayqpH/4XiEXylNdWI3AghubqS6XuiPg3Y60jY8RTo4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "19576c2aea7f074ff0da818b21a8b0950ff6ec86", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "locked": { - "lastModified": 1605370193, - "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5021eac20303a61fafe17224c087f5519baed54d", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { -<<<<<<< ours - "lastModified": 1667234164, - "narHash": "sha256-oPMAvHZBDgamjmIQly5+sw2LtfKwY7qcWZZwKiwKQy8=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "722e8d65d3aba6f527100cc2d1539e4ca04d066f", -======= - "lastModified": 1668900402, - "narHash": "sha256-IhVlueHoQNoN0SOHZIceKU3LyEL00g2ei0aUlaNypbQ=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "c0f9cbcf93ca22e4f0ca66843be61a4bdf6f0a44", ->>>>>>> theirs - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1598695561, - "narHash": "sha256-gyH/5j+h/nWw0W8AcR2WKvNBUsiQ7QuxqSJNXAwV+8E=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "1705b4a26fbf065d9574dce47a94e8c7c79e052f", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, - "mac-brcm-fw": { - "flake": false, - "locked": { - "lastModified": 1664744853, - "narHash": "sha256-i5EFVTIDHQCtFg/OFLmjOzbJqhpwy4MjwBmFUnq0DjI=", - "path": "/home/jade/mac-brcm-fw", - "type": "path" - }, - "original": { - "path": "./mac-brcm-fw", - "type": "path" - } - }, - "mms": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nix": "nix", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1656185874, - "narHash": "sha256-sv7lsuARTT+LgMq0mFdFP73CHeqTeIvz2ZHzceQAK+0=", - "owner": "mkaito", - "repo": "nixos-modded-minecraft-servers", - "rev": "74477f0041e76097a6800cda892744b4c4ab26d2", - "type": "github" - }, - "original": { - "owner": "mkaito", - "repo": "nixos-modded-minecraft-servers", - "type": "github" - } - }, - "nix": { - "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1606150835, - "narHash": "sha256-xHRCqa8aq8fug9jVs1FT6PE9/7IfVz2Slg7GtVZbk68=", - "owner": "NixOS", - "repo": "nix", - "rev": "605bacdc929db4d820b8d5866450de7d1ec6e6cf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nix", - "type": "github" - } - }, - "nixos-hardware": { - "locked": { -<<<<<<< ours - "lastModified": 1667057402, - "narHash": "sha256-MEIxCUD0Aiwr+QrZIbbcb8ReBsTYaleKie1AU6tRHfM=", - "owner": "kekrby", - "repo": "nixos-hardware", - "rev": "5e738ab9bda8a53f284b52c74b7c5ac185e4a297", -======= - "lastModified": 1668193714, - "narHash": "sha256-bmy4EBz5TQNH/DdQsDiOrpuXQQEoRMRf7bubxIfOz/o=", - "owner": "kekrby", - "repo": "nixos-hardware", - "rev": "f77985ad09ee071d9c98947f2e8896e23c013894", ->>>>>>> theirs - "type": "github" - }, - "original": { - "owner": "kekrby", - "repo": "nixos-hardware", - "type": "github" - } - }, - "nixpkgs": { - "locked": { -<<<<<<< ours - "lastModified": 1602702596, - "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ad0d20345219790533ebe06571f82ed6b034db31", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-20.09-small", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1606086654, - "narHash": "sha256-VFl+3eGIMqNp7cyOMJ6TjM/+UcsLKtodKoYexrlTJMI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "19db3e5ea2777daa874563b5986288151f502e27", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-20.09", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1667301035, - "narHash": "sha256-o8sbiXh7vcIHgpAe/WdU5f7Kq/s3BD0ccyNSVAy7oKk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "adf91a16c0354ba34f27c00c8ed3f4c73f2fd4d5", -======= - "lastModified": 1668905981, - "narHash": "sha256-RBQa/+9Uk1eFTqIOXBSBezlEbA3v5OkgP+qptQs1OxY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "690ffff026b4e635b46f69002c0f4e81c65dfc2e", ->>>>>>> theirs - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "home-manager": "home-manager", - "mac-brcm-fw": "mac-brcm-fw", - "mms": "mms", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3" - } - }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -}