Merge branch 'main' of ssh://git.0x76.dev:42/v/infrastructure

# Conflicts:
#	flake.lock
This commit is contained in:
Vivian 2023-01-29 10:52:17 +01:00
commit 30506db808

View file

@ -429,11 +429,11 @@
"utils": "utils_2"
},
"locked": {
"lastModified": 1674771519,
"narHash": "sha256-U0W3S1nX6yEvLh3Vq70EORbmXecAKXfmEfCfaA4A+I8=",
"lastModified": 1674928308,
"narHash": "sha256-elVU4NUZEl11BdT4gC+lrpLYM8Ccxqxs19Ix84HTI9o=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "bb4b25b302dbf0f527f190461b080b5262871756",
"rev": "08a778d80308353f4f65c9dcd3790b5da02d6306",
"type": "github"
},
"original": {
@ -450,11 +450,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1674908798,
"narHash": "sha256-rDkkRmy6Wd/KNC5OE1ih9BxkohwFUqXR1Tzw3yUZuYM=",
"lastModified": 1674930518,
"narHash": "sha256-EVusv/SJYQHOY/6VmxXC2IFSFtQhrIk6/b0ugd6lxDk=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "61c9e50bcd6c51e026203f194bc186eda3c44a38",
"rev": "ce632b7a05a27d121c9544607ccd873adee8bd42",
"type": "github"
},
"original": {
@ -845,11 +845,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1674890375,
"narHash": "sha256-KTFQ7AkKVLJPoGg1cRAekFDyvDPT8A6jGPAu1liFD74=",
"lastModified": 1674916711,
"narHash": "sha256-8v0pdh5G7K2TvXWw1HylgThpDWEYvnntuCtnJCdqtHA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4fe4a0e8abadd05d9e81923c13531ab1476d6fd3",
"rev": "99563190d585896d7ddb43ea448a95574dfa2373",
"type": "github"
},
"original": {
@ -926,11 +926,11 @@
},
"nur": {
"locked": {
"lastModified": 1674910817,
"narHash": "sha256-Divh494EQtiKGz3B+5TTA0VR2xPaxVOy5LO6f34kLI4=",
"lastModified": 1674981967,
"narHash": "sha256-aSEQv63tfQ4+LAJBotBHaErtkLA6c01q4mY7xsKHg4U=",
"owner": "nix-community",
"repo": "NUR",
"rev": "0230b631c025c767653cacae223980ac05ecce20",
"rev": "fc2a9823dd0b99f740013ad480dae07a956b18e7",
"type": "github"
},
"original": {