schrottkatze/nix-configs
1
2
Fork 0
Code Issues Pull requests Activity

Merge remote branch 'origin/master'

Browse source 
Conflicts:
	flake.lock
This commit is contained in:
Schrottkatze 2022-11-20 22:15:41 +01:00
commit dd1b696ded
4 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.lock generated
View file

@ -39,11 +39,19 @@
"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": {
@ -123,11 +131,19 @@
},
"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": {
@ -138,6 +154,7 @@
},
"nixpkgs": {
"locked": {
<<<<<<< ours
"lastModified": 1602702596,
"narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=",
"owner": "NixOS",
@ -174,6 +191,13 @@
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "adf91a16c0354ba34f27c00c8ed3f4c73f2fd4d5",
=======
"lastModified": 1668905981,
"narHash": "sha256-RBQa/+9Uk1eFTqIOXBSBezlEbA3v5OkgP+qptQs1OxY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "690ffff026b4e635b46f69002c0f4e81c65dfc2e",
>>>>>>> theirs
"type": "github"
},
"original": {
@ -194,11 +218,11 @@
},
"utils": {
"locked": {
"lastModified": 1667077288,
"narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {