From 5ffa47cb44650e88f05f8d92e9afe5947e49bc91 Mon Sep 17 00:00:00 2001
From: Fabian Hauser <fabian@fh2.ch>
Date: Wed, 3 Jan 2024 13:20:24 +0800
Subject: [PATCH] Remove threema from flake.nix

---
 flake.lock                   | 23 +----------------------
 flake.nix                    |  5 +----
 home/fhauser/default.nix     |  4 +---
 host/hummelberg/default.nix  |  4 +---
 host/ochsenchopf/default.nix |  4 +---
 host/speer/default.nix       |  4 +---
 6 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/flake.lock b/flake.lock
index d1f90fd..c6a3a01 100644
--- a/flake.lock
+++ b/flake.lock
@@ -94,28 +94,7 @@
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs-stable": "nixpkgs-stable",
-        "nixpkgs-unstable": "nixpkgs-unstable",
-        "threema": "threema"
-      }
-    },
-    "threema": {
-      "inputs": {
-        "nixpkgs-unstable": [
-          "nixpkgs-unstable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1659736371,
-        "narHash": "sha256-X2DbyWtlk810SMx5I+rW5OHJWHFXf2wvwNvuQPS14Gs=",
-        "ref": "refs/heads/master",
-        "rev": "70fb60fabf3e454d2d131ae21db1f13c1b45ab12",
-        "revCount": 18,
-        "type": "git",
-        "url": "file:///etc/nixos/defaults/threema"
-      },
-      "original": {
-        "type": "git",
-        "url": "file:///etc/nixos/defaults/threema"
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 693ed1e..99d3165 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,8 +9,6 @@
     home-manager.url = "github:nix-community/home-manager/master";
     home-manager.inputs.nixpkgs.follows = "nixpkgs-stable";
 
-    threema.url = "git+file:///etc/nixos/defaults/threema";
-    threema.inputs.nixpkgs-unstable.follows = "nixpkgs-unstable";
     fcc-unlock = {
       url = "git+file:///etc/nixos/fcc-unlock";
       inputs.nixos-stable.follows = "nixpkgs-stable";
@@ -19,7 +17,7 @@
   };
 
   outputs = { self, nixpkgs-unstable, nixpkgs-stable, home-manager
-    , nixos-hardware, threema, fcc-unlock, ... }@inputs:
+    , nixos-hardware, fcc-unlock, ... }@inputs:
     let
       system = "x86_64-linux";
       pkgsUnstable = import nixpkgs-unstable {
@@ -40,7 +38,6 @@
       # `nix build .#nixosConfigurations.<hostname>.config.system.build.toplevel
       nixosConfigurations = let
         sharedSpecialArgs = {
-          threemaModules = threema.nixosModules;
           inherit pkgsUnstable;
           pkgFccUnlock = fcc-unlock.packages.${system}.default;
 
diff --git a/home/fhauser/default.nix b/home/fhauser/default.nix
index 4157e3d..7a8300f 100644
--- a/home/fhauser/default.nix
+++ b/home/fhauser/default.nix
@@ -1,11 +1,9 @@
-{ config, pkgs, lib, threemaModules, nixosConfig, ... }: {
+{ config, pkgs, lib, nixosConfig, ... }: {
   imports = [
     ./multimedia.nix
     ./applications
     ./mimetypes.nix
     # ./games.nix
-
-    threemaModules.home
   ];
   home.stateVersion = nixosConfig.system.stateVersion;
   systemd.user.targets.tray = {
diff --git a/host/hummelberg/default.nix b/host/hummelberg/default.nix
index cefd060..d8ea44b 100644
--- a/host/hummelberg/default.nix
+++ b/host/hummelberg/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, threemaModules, ... }: {
+{ config, pkgs, ... }: {
 
   imports = [
     ./filesystems.nix
@@ -11,8 +11,6 @@
     ../../defaults/desktop
     ../../defaults/hardware/thinkpad-p14s.nix
     #../../defaults/printing
-
-    threemaModules.openvpn
   ];
 
   #TODO: Clean up next section
diff --git a/host/ochsenchopf/default.nix b/host/ochsenchopf/default.nix
index a3e3192..6a418d8 100644
--- a/host/ochsenchopf/default.nix
+++ b/host/ochsenchopf/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, threemaModules, ... }: {
+{ config, pkgs, ... }: {
 
   imports = [
     ./filesystems.nix
@@ -9,8 +9,6 @@
     ../../defaults/base
     ../../defaults/cifs-auth-fix
     ../../defaults/desktop
-
-    threemaModules.openvpn
   ];
 
   virtualisation = { # TODO: This should probably be somewhere else.
diff --git a/host/speer/default.nix b/host/speer/default.nix
index 8f2ba2b..a710fd1 100644
--- a/host/speer/default.nix
+++ b/host/speer/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, threemaModules, ... }: {
+{ config, pkgs, ... }: {
 
   imports = [
     ./filesystems.nix
@@ -12,8 +12,6 @@
     ../../defaults/hardware/amd-board.nix
     ../../defaults/hardware/ecc-memory.nix
     #../../defaults/printing
-
-    threemaModules.openvpn
   ];
 
   virtualisation = { # TODO: This should probably be somewhere else.