From 4e7b708d4c55a54ab28cd9a5e970d7d30d13caee Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene@technicalissues.us>
Date: Thu, 28 Dec 2023 20:18:20 -0500
Subject: [PATCH] Move Element to Flatpak / Homebrew

Element seems to need to compile electron every single update and, on
macOS, runs another app called electron that is not of use to me.
Flatpak and Homebrew will work faster and be user friendly all around.
---
 flake.lock                              | 16 ++++++++++++++++
 flake.nix                               |  7 ++++++-
 modules/home-manager/common/all-gui.nix |  4 ++--
 modules/system/common/all-darwin.nix    |  1 +
 modules/system/common/all-nixos.nix     | 10 ++++++++++
 5 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index dbb45d1..f2e4ebe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -130,6 +130,21 @@
         "type": "github"
       }
     },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1702756026,
+        "narHash": "sha256-KEYa3S0JZCR2WpbEnVn9EXmN5/oCgWGlGg9yHoz5MLc=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "4f39230e34e8d5056e5b58ed9e4bb264438090bd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
     "nix-homebrew": {
       "inputs": {
         "brew-src": "brew-src",
@@ -234,6 +249,7 @@
         "genebean-omp-themes": "genebean-omp-themes",
         "home-manager": "home-manager",
         "nix-darwin": "nix-darwin",
+        "nix-flatpak": "nix-flatpak",
         "nix-homebrew": "nix-homebrew",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-unstable": "nixpkgs-unstable",
diff --git a/flake.nix b/flake.nix
index cb5d41c..2e1469c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,6 +21,9 @@
     # Manage Homebrew itself
     nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
 
+    # Manage flatpaks
+    nix-flatpak.url = "github:gmodena/nix-flatpak"; # unstable branch. Use github:gmodena/nix-flatpak/?ref=<tag> to pin releases.
+
     # Format disks with nix-config
     disko = {
       url = "github:nix-community/disko";
@@ -40,7 +43,7 @@
     };
 
   }; # end inputs
-  outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, nix-darwin, home-manager, nix-homebrew, disko, sops-nix, genebean-omp-themes, ... }: let
+  outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, nix-darwin, home-manager, nix-homebrew, nix-flatpak, disko, sops-nix, genebean-omp-themes, ... }: let
 
     # creates a macOS system config
     darwinHostConfig = system: hostname: username: nix-darwin.lib.darwinSystem {
@@ -100,6 +103,8 @@
           };
         }
 
+        nix-flatpak.nixosModules.nix-flatpak
+
         sops-nix.nixosModules.sops # system wide secrets management
         ./modules/system/common/all-nixos.nix # system-wide stuff
         ./modules/hosts/nixos/${hostname} # host specific stuff
diff --git a/modules/home-manager/common/all-gui.nix b/modules/home-manager/common/all-gui.nix
index 3c77e03..2551d30 100644
--- a/modules/home-manager/common/all-gui.nix
+++ b/modules/home-manager/common/all-gui.nix
@@ -1,10 +1,10 @@
 { pkgs, genebean-omp-themes, ... }: {
   home.packages = with pkgs; [
-    element-desktop
+    # nothing here right now
   ];
   programs = {
     vscode = {
       enable = true;
     };
   };
-}
\ No newline at end of file
+}
diff --git a/modules/system/common/all-darwin.nix b/modules/system/common/all-darwin.nix
index 44a2af3..408fa99 100644
--- a/modules/system/common/all-darwin.nix
+++ b/modules/system/common/all-darwin.nix
@@ -40,6 +40,7 @@
       "angry-ip-scanner"
       "audacity"
       "balenaetcher"
+      "element"
       "firefox"
       "font-hack-nerd-font"
       "font-inconsolata-g-for-powerline"
diff --git a/modules/system/common/all-nixos.nix b/modules/system/common/all-nixos.nix
index 9dffacd..578c172 100644
--- a/modules/system/common/all-nixos.nix
+++ b/modules/system/common/all-nixos.nix
@@ -49,6 +49,16 @@
   security.sudo.wheelNeedsPassword = false;
 
   services = {
+    flatpak = {
+      enable = true;
+      packages = [
+        "im.riot.Riot"
+      ];
+      update.auto = {
+        enable = true;
+        onCalendar = "daily";
+      };
+    };
     openssh.enable = true;
     tailscale = {
       enable = true;