From 1155e7d79b2ebeec042b8fe9124349ea371ec019 Mon Sep 17 00:00:00 2001
From: Fabian Hauser <fabian@fh2.ch>
Date: Sat, 23 Apr 2022 17:50:16 +0200
Subject: [PATCH] Clean up flakes

---
 flake.lock | 40 ++++++----------------------------------
 flake.nix  | 16 +++++++++++++---
 2 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/flake.lock b/flake.lock
index d8b0c4c..e32df69 100644
--- a/flake.lock
+++ b/flake.lock
@@ -56,38 +56,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-nixos-2111": {
-      "locked": {
-        "lastModified": 1650647313,
-        "narHash": "sha256-6ghnNPXDlG6/tXeIFdbP0cGnik6TGNwc615hhG9dpl4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a318a09a96a38382fe61a7f85d03ea6e25c46c56",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-21.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-nixos-unstable": {
-      "locked": {
-        "lastModified": 1650161686,
-        "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1650647313,
@@ -122,8 +90,12 @@
     },
     "qois-infrastructure": {
       "inputs": {
-        "nixpkgs-nixos-2111": "nixpkgs-nixos-2111",
-        "nixpkgs-nixos-unstable": "nixpkgs-nixos-unstable"
+        "nixpkgs-nixos-2111": [
+          "nixpkgs-stable"
+        ],
+        "nixpkgs-nixos-unstable": [
+          "nixpkgs-unstable"
+        ]
       },
       "locked": {
         "lastModified": 1650722675,
diff --git a/flake.nix b/flake.nix
index 7aec25c..38062fd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,15 +1,25 @@
 {
   inputs = {
+    # Upstream deps
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-21.11";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
+
+    # Packages
     home-manager.url = "github:nix-community/home-manager/release-21.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs-stable";
-    qois-infrastructure.url = "git+file:///etc/nixos/qois-infrastructure";
-    threema.url = "git+file:///etc/nixos/defaults/threema";
-    threema.inputs.nixpkgs-unstable.follows = "nixpkgs-unstable";
     fabianhauser-etaxes-sg.url = "github:fabianhauser/etaxes-sg-nix";
     fabianhauser-etaxes-sg.inputs.nixpkgs.follows = "nixpkgs-stable";
+
+    # Private Deps
+    qois-infrastructure = {
+      url = "git+file:///etc/nixos/qois-infrastructure";
+      inputs.nixpkgs-nixos-2111.follows = "nixpkgs-stable";
+      inputs.nixpkgs-nixos-unstable.follows = "nixpkgs-unstable";
+    };
+    threema.url = "git+file:///etc/nixos/defaults/threema";
+    threema.inputs.nixpkgs-unstable.follows = "nixpkgs-unstable";
+
   };
 
   outputs = { self, nixpkgs-unstable, nixpkgs-stable, home-manager