From 84f9d3236621c4e13a736278c01094cce8724270 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Wed, 23 Nov 2022 10:37:01 +0100
Subject: [PATCH] Use native signal desktop app again

As the pidgin integration is failing.
I no longer can register pidgin with my signal app.
---
 home.nix                            |  1 -
 home/modules/programs/my-pidgin.nix |  4 ---
 home/modules/programs/signald.nix   | 38 -----------------------------
 home/packages.nix                   |  1 +
 4 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 home/modules/programs/signald.nix

diff --git a/home.nix b/home.nix
index a5f8d22..5542481 100644
--- a/home.nix
+++ b/home.nix
@@ -11,7 +11,6 @@ in {
     ./home/modules/programs/khal.nix
     ./home/modules/programs/languagetool.nix
     ./home/modules/programs/mailhog.nix
-    ./home/modules/programs/signald.nix
     ./home/modules/programs/my-pidgin.nix
   ];
 
diff --git a/home/modules/programs/my-pidgin.nix b/home/modules/programs/my-pidgin.nix
index f631855..a31dd6b 100644
--- a/home/modules/programs/my-pidgin.nix
+++ b/home/modules/programs/my-pidgin.nix
@@ -10,7 +10,6 @@
         pkgs.pidgin-window-merge
 
         # Protocols
-        pkgs.purple-signald
         pkgs.purple-slack
         (pkgs.callPackage ./../../packages/purple-mattermost { })
         (pkgs.callPackage ./../../packages/purple-microsoft-teams { })
@@ -21,9 +20,6 @@
       ];
     };
 
-    # Necessary to connect to signal from pidgin
-    programs.signald.enable = true;
-
     home.file = {
       pidginGtkRc = {
         target = ".purple/gtkrc-2.0";
diff --git a/home/modules/programs/signald.nix b/home/modules/programs/signald.nix
deleted file mode 100644
index 45119c9..0000000
--- a/home/modules/programs/signald.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.programs.signald;
-in {
-  options.programs.signald = {
-    enable = mkEnableOption "signald";
-
-    package = mkOption {
-      type = types.package;
-      default = pkgs.signald;
-      description = "signald package to install.";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.user.services.signald = {
-      Unit = {
-        Description = "A  daemon for interacting with the Signal Private Messenger";
-        Wants = "network.target";
-        After = "network.target";
-      };
-
-      Service = {
-        Type = "simple";
-        ExecStart = "${cfg.package}/bin/signald";
-        Restart = "on-failure";
-        SuccessExitStatus = "143";
-      };
-
-      Install = {
-        WantedBy = [ "default.target" ];
-      };
-    };
-  };
-}
diff --git a/home/packages.nix b/home/packages.nix
index 730350f..cbc6b9a 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -66,6 +66,7 @@ with pkgs; [
   (callPackage ./packages/custom/customer-project { })
 
   # Communication
+  signal-desktop
   thunderbird
 
   # Media