From 63577aabb94f41fa4378f5a20e442ba0e2b70957 Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene@technicalissues.us>
Date: Mon, 1 Jan 2024 13:30:49 -0500
Subject: [PATCH] Flatpak doesn't need to be on cli-only systems

---
 modules/hosts/nixos/rainbow-planet/default.nix |  3 ++-
 modules/system/common/all-nixos.nix            | 10 ----------
 modules/system/common/linux/flatpaks.nix       | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 modules/system/common/linux/flatpaks.nix

diff --git a/modules/hosts/nixos/rainbow-planet/default.nix b/modules/hosts/nixos/rainbow-planet/default.nix
index 9ff3b0c..646974d 100644
--- a/modules/hosts/nixos/rainbow-planet/default.nix
+++ b/modules/hosts/nixos/rainbow-planet/default.nix
@@ -1,6 +1,7 @@
-{ config, pkgs, username, ... }: {
+{ pkgs, username, ... }: {
   imports = [
     ./hardware-configuration.nix
+    ../../../system/common/linux/flatpaks.nix
   ];
 
   system.stateVersion = "23.05";
diff --git a/modules/system/common/all-nixos.nix b/modules/system/common/all-nixos.nix
index 578c172..9dffacd 100644
--- a/modules/system/common/all-nixos.nix
+++ b/modules/system/common/all-nixos.nix
@@ -49,16 +49,6 @@
   security.sudo.wheelNeedsPassword = false;
 
   services = {
-    flatpak = {
-      enable = true;
-      packages = [
-        "im.riot.Riot"
-      ];
-      update.auto = {
-        enable = true;
-        onCalendar = "daily";
-      };
-    };
     openssh.enable = true;
     tailscale = {
       enable = true;
diff --git a/modules/system/common/linux/flatpaks.nix b/modules/system/common/linux/flatpaks.nix
new file mode 100644
index 0000000..aff137d
--- /dev/null
+++ b/modules/system/common/linux/flatpaks.nix
@@ -0,0 +1,15 @@
+
+{ ... }: {
+  services = {
+    flatpak = {
+      enable = true;
+      packages = [
+        "im.riot.Riot"
+      ];
+      update.auto = {
+        enable = true;
+        onCalendar = "daily";
+      };
+    };
+  };
+}