From 2d1dfe3195af0f634727b4ce11ba760b046fcaf2 Mon Sep 17 00:00:00 2001
From: Grigory Shipunov <blame@oxapentane.com>
Date: Wed, 22 Mar 2023 21:45:06 +0100
Subject: [PATCH] move upstream back to nixos

---
 flake.lock                    | 40 +++++++++++++++++------------------
 flake.nix                     |  2 +-
 hosts/dishwasher/microvms.nix |  4 ++--
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index 507b1bc..eef83c2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1679207026,
-        "narHash": "sha256-3BrBOSwYGlgTq69+OeHCQoFBGTzpDp9PkKjWkxpA108=",
+        "lastModified": 1679466129,
+        "narHash": "sha256-BQt0ADAhPAwuoq3z+iprmHyw1NeyerOw1GiIEJkANGc=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "efc838bd45cfdfd21836f239605f2082d7245464",
+        "rev": "49237f7a76b98954306e77a7bd42f6491ad5c6a7",
         "type": "github"
       },
       "original": {
@@ -82,11 +82,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1678629299,
-        "narHash": "sha256-29SSjmIxeuwXgKWynNoAEJ3uKFlXP0iIvSLDtGPdA+Y=",
+        "lastModified": 1679514259,
+        "narHash": "sha256-3CrzJa/Cw/+jn5mC9aq2EzVRX6+glm4FD82JMp3PZcw=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "55667b89c0f2b60c8d95a203f3784d2dca2ea31a",
+        "rev": "de01a4082d78979e198a8f1d3ebe52e80a6013f5",
         "type": "github"
       },
       "original": {
@@ -97,11 +97,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1679139072,
-        "narHash": "sha256-Gtw2Yj8DfETie3u7iHv1y5Wt+plGRmp6nTQ0EEfaPho=",
+        "lastModified": 1679318992,
+        "narHash": "sha256-uoj5Oy6hruIHuxzfQZtcalObe5kPrX9v+ClUMFEOzmE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "08ef7dc8334521605a5c8b7086cc248e74ee338b",
+        "rev": "e2c97799da5f5cd87adfa5017fba971771e123ef",
         "type": "github"
       },
       "original": {
@@ -129,15 +129,15 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1679268048,
-        "narHash": "sha256-VfSAlbOJa89ObRgEYZntW+EC7cuxrts8h2d7wZ5tq24=",
-        "owner": "oxapentane",
+        "lastModified": 1679262748,
+        "narHash": "sha256-DQCrrAFrkxijC6haUzOC5ZoFqpcv/tg2WxnyW3np1Cc=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "082ac90f4f42a950b3b51ea2a0adaf109594ff91",
+        "rev": "60c1d71f2ba4c80178ec84523c2ca0801522e0a6",
         "type": "github"
       },
       "original": {
-        "owner": "oxapentane",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -157,11 +157,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1679123187,
-        "narHash": "sha256-Jf9hN2BIHdZ2Of4A0zAyB0fhe1EFujLa9XjWRC9ZKiY=",
+        "lastModified": 1679428647,
+        "narHash": "sha256-gyS7UDFNzQfRKJvUDlVuM8wXCIyreBmVq+aiPXhfTlk=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "7c05f55f0c9e9bec28464b329194fe244ca2c7a9",
+        "rev": "3321799e8fac622db50fe8c3284062f7d0f1bf53",
         "type": "github"
       },
       "original": {
@@ -196,11 +196,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1679194991,
-        "narHash": "sha256-SSJ/NvhXJeDzSgfEjKO1V/2olI4UlEAxK54DVWJIPjA=",
+        "lastModified": 1679377997,
+        "narHash": "sha256-O8rmc/b/qgNgoHj2tL5+3Ovkj7A+Sok7gazRoWbpnqg=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "08a0b5f25a73130869b3cc375eaf0e6ff317435e",
+        "rev": "d8827a8368c307fbc6ed594c9a31d619e7360bed",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 734dbd3..a91452f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs-unstable.url = "github:oxapentane/nixpkgs/nixos-unstable";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
 
diff --git a/hosts/dishwasher/microvms.nix b/hosts/dishwasher/microvms.nix
index e6ee65b..e395f10 100644
--- a/hosts/dishwasher/microvms.nix
+++ b/hosts/dishwasher/microvms.nix
@@ -2,11 +2,11 @@
   microvm.vms = {
     nextcloud = {
       flake = inputs.self;
-      updateFlake = "git+https://git.sr.ht/~oxapentane/oxalab-config?ref=master";
+      updateFlake = "github:oxapentane/nix-config/master";
     };
     music = {
       flake = inputs.self;
-      updateFlake = "git+https://git.sr.ht/~oxapentane/oxalab-config?ref=master";
+      updateFlake = "github:oxapentane/nix-config/master";
     };
   };
 }