From 381cfbcd72f86c7906c403ffbf536226889205aa Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@gmail.com>
Date: Sun, 18 Feb 2024 16:31:46 +0100
Subject: [PATCH] [openconnect-sso] Fix poetry error

---
 nixos/flake.nix                                      | 10 ++++++++--
 nixos/hosts/Tibo-NixDesk/default.nix                 |  5 ++++-
 nixos/modules/networking/openconnect-sso/default.nix |  4 ++--
 nixos/overlays/openconnect-sso/default.nix           |  4 ----
 4 files changed, 14 insertions(+), 9 deletions(-)
 delete mode 100644 nixos/overlays/openconnect-sso/default.nix

diff --git a/nixos/flake.nix b/nixos/flake.nix
index 64bf1bc..b2dda58 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -14,6 +14,13 @@
       url = "github:nix-community/home-manager/release-23.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    openconnect-sso = {
+      url = github:ThinkChaos/openconnect-sso/fix/nix-flake;
+      inputs = {
+        flake-utils.follows = "utils";
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
     sops-nix = {
       url = "github:Mic92/sops-nix";
         inputs.nixpkgs.follows = "nixpkgs";
@@ -26,7 +33,7 @@
 
   outputs = inputs@{
     self, nixpkgs, nixpkgs-unstable,
-    devshell, flake-utils, home-manager, sops-nix, utils,
+    devshell, flake-utils, home-manager, openconnect-sso, sops-nix, utils,
     ... }:
     let
       system = "x86_64-linux";
@@ -50,7 +57,6 @@
         (import ./overlays/cmdtime)
         (import ./overlays/icosystem)
         (import ./overlays/letter)
-        (import ./overlays/openconnect-sso)
         (import ./overlays/spotify)
       ];
 
diff --git a/nixos/hosts/Tibo-NixDesk/default.nix b/nixos/hosts/Tibo-NixDesk/default.nix
index 5bec21e..be82054 100644
--- a/nixos/hosts/Tibo-NixDesk/default.nix
+++ b/nixos/hosts/Tibo-NixDesk/default.nix
@@ -11,7 +11,10 @@
       model = "RTX 2060";
     };
 
-    networking.openconnect-sso.enable = true;
+    networking = {
+      networkmanager.enable = true;
+      openconnect-sso.enable = true;
+    };
 
     nix = {
       flakes.enable = true;
diff --git a/nixos/modules/networking/openconnect-sso/default.nix b/nixos/modules/networking/openconnect-sso/default.nix
index 3b400f8..b62bc89 100644
--- a/nixos/modules/networking/openconnect-sso/default.nix
+++ b/nixos/modules/networking/openconnect-sso/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, inputs, lib, pkgs, ... }:
 
 let
   cfg = config.sisyphus.networking.openconnect-sso;
@@ -14,7 +14,7 @@ in {
     };
 
     environment.systemPackages = with pkgs; [
-      openconnect-sso
+      inputs.openconnect-sso.packages.${config.nixpkgs.localSystem.system}.default
     ];
   };
 }
diff --git a/nixos/overlays/openconnect-sso/default.nix b/nixos/overlays/openconnect-sso/default.nix
deleted file mode 100644
index 4759c18..0000000
--- a/nixos/overlays/openconnect-sso/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import "${builtins.fetchTarball {
-  url = "https://github.com/vlaci/openconnect-sso/archive/master.tar.gz";
-  sha256 = "08cqd40p9vld1liyl6qrsdrilzc709scyfghfzmmja3m1m7nym94";
-}}/overlay.nix"