Merge pull request 'switch back to main' (#473) from Mic92-maddy into main

flake.lock

@@ -98,16 +98,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1699007274,
-        "narHash": "sha256-m0NH2trnW8cOhona6m3hWkeDZ28BV/wAGPd/YWik23g=",
-        "owner": "Mic92",
+        "lastModified": 1699354722,
+        "narHash": "sha256-abmqUReg4PsyQSwv4d0zjcWpMHrd3IFJiTb2tZpfF04=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fcb19bae00e9d3fd5ecf4a1f80cf33248bf7f714",
+        "rev": "cfbb29d76949ae53c457f152c52c173ea4bdd862",
         "type": "github"
       },
       "original": {
-        "owner": "Mic92",
-        "ref": "deltachat",
+        "owner": "NixOS",
+        "ref": "nixos-unstable-small",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -5,9 +5,7 @@
   nixConfig.extra-trusted-public-keys = [ "cache.clan.lol-1:3KztgSAB5R1M+Dz7vzkBGzXdodizbgLXGXKXlcQLA28=" ];
 
   inputs = {
-    #nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
-    # https://github.com/NixOS/nixpkgs/pull/265024
-    nixpkgs.url = "github:Mic92/nixpkgs/deltachat";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
     floco.url = "github:aakropotkin/floco";
     floco.inputs.nixpkgs.follows = "nixpkgs";
     disko.url = "github:nix-community/disko";