From a8c93f5f5cdae581327fe58aa85b47864b1040f3 Mon Sep 17 00:00:00 2001
From: Fabian Hauser <fabian@fh2.ch>
Date: Tue, 12 Apr 2022 13:03:42 +0200
Subject: [PATCH] Add threema environment support

---
 defaults/threema |  2 +-
 flake.lock       | 28 ++++++++++++++++++----------
 flake.nix        |  4 ++--
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/defaults/threema b/defaults/threema
index c8a15fa..ed32144 160000
--- a/defaults/threema
+++ b/defaults/threema
@@ -1 +1 @@
-Subproject commit c8a15fae4a6bec1c2a3cbd4065fa3c0f7cf8bdb0
+Subproject commit ed32144ca2c2ec82fe88fadfebcc98732bc52364
diff --git a/flake.lock b/flake.lock
index 10d7735..7be76c2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -126,13 +126,17 @@
         "nixpkgs-nixos-unstable": "nixpkgs-nixos-unstable"
       },
       "locked": {
-        "narHash": "sha256-UV3bsGWywqN6sDKyK0DetIEgCSMHhsBACLJNXclxj94=",
-        "path": "/etc/nixos/qois-infrastructure",
-        "type": "path"
+        "lastModified": 1649702020,
+        "narHash": "sha256-wUFuh5CKX7fzTvcHZKF7EOaN5eWG/yOql/e+aG8LM7I=",
+        "ref": "master",
+        "rev": "f7e0a51e165a6f2cd35e9edd001db504ea6fe5f7",
+        "revCount": 216,
+        "type": "git",
+        "url": "file:///etc/nixos/qois-infrastructure"
       },
       "original": {
-        "path": "/etc/nixos/qois-infrastructure",
-        "type": "path"
+        "type": "git",
+        "url": "file:///etc/nixos/qois-infrastructure"
       }
     },
     "root": {
@@ -153,13 +157,17 @@
         ]
       },
       "locked": {
-        "narHash": "sha256-PkbfwcRwiMkVSQuP9KBruXCmmyzuJ7/jIxmr3/rE3Ts=",
-        "path": "/etc/nixos/defaults/threema",
-        "type": "path"
+        "lastModified": 1649761393,
+        "narHash": "sha256-tqHVp5iIZpv5r+oT8N9GYDOdDPxUtD532aJuV4GZeVQ=",
+        "ref": "main",
+        "rev": "ed32144ca2c2ec82fe88fadfebcc98732bc52364",
+        "revCount": 3,
+        "type": "git",
+        "url": "file:///etc/nixos/defaults/threema"
       },
       "original": {
-        "path": "/etc/nixos/defaults/threema",
-        "type": "path"
+        "type": "git",
+        "url": "file:///etc/nixos/defaults/threema"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index ebda0a2..884c550 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,8 +5,8 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     home-manager.url = "github:nix-community/home-manager/release-21.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs-stable";
-    qois-infrastructure.url = "path:/etc/nixos/qois-infrastructure";
-    threema.url = "path:/etc/nixos/defaults/threema";
+    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";