From 78d8069a8806f4de07a975fd185c89ca5313fbe5 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Wed, 26 Jun 2024 13:19:54 +0200
Subject: [PATCH] Separate hm from os config

---
 modules/home/default.nix          |  2 ++
 modules/home/flatpak.nix          | 14 ++++++++++++++
 modules/home/virtualisation.nix   | 11 +++++++++++
 modules/system/flatpak.nix        | 16 +---------------
 modules/system/virtualisation.nix |  9 ---------
 users/seb/home.nix                |  2 ++
 6 files changed, 30 insertions(+), 24 deletions(-)
 create mode 100644 modules/home/flatpak.nix
 create mode 100644 modules/home/virtualisation.nix

diff --git a/modules/home/default.nix b/modules/home/default.nix
index 48da295..538fbee 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -8,5 +8,7 @@
     ./equalizer
     ./sops.nix
     ./night-light.nix
+    ./virtualisation.nix
+    ./flatpak.nix
   ];
 }
diff --git a/modules/home/flatpak.nix b/modules/home/flatpak.nix
new file mode 100644
index 0000000..47fe467
--- /dev/null
+++ b/modules/home/flatpak.nix
@@ -0,0 +1,14 @@
+{ config, lib, ... }:
+{
+  options.myConfig.flatpak.enable = lib.mkEnableOption "";
+
+  config = lib.mkIf config.myConfig.flatpak.enable {
+    xdg = {
+      enable = true;
+      systemDirs.data = [
+        "/var/lib/flatpak/exports/share"
+        "/home/seb/.local/share/flatpak/exports/share"
+      ];
+    };
+  };
+}
diff --git a/modules/home/virtualisation.nix b/modules/home/virtualisation.nix
new file mode 100644
index 0000000..4d82416
--- /dev/null
+++ b/modules/home/virtualisation.nix
@@ -0,0 +1,11 @@
+{ config, lib, ... }:
+{
+  options.myConfig.virtualisation.enable = lib.mkEnableOption "";
+
+  config = lib.mkIf config.myConfig.virtualisation.enable {
+    dconf.settings."org/virt-manager/virt-manager/connections" = {
+      autoconnect = [ "qemu:///system" ];
+      uris = [ "qemu:///system" ];
+    };
+  };
+}
diff --git a/modules/system/flatpak.nix b/modules/system/flatpak.nix
index b2069fa..7d943f5 100644
--- a/modules/system/flatpak.nix
+++ b/modules/system/flatpak.nix
@@ -2,19 +2,5 @@
 {
   options.myConfig.flatpak.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.myConfig.flatpak.enable {
-    services.flatpak.enable = true;
-
-    home-manager.sharedModules = [
-      {
-        xdg = {
-          enable = true;
-          systemDirs.data = [
-            "/var/lib/flatpak/exports/share"
-            "/home/seb/.local/share/flatpak/exports/share"
-          ];
-        };
-      }
-    ];
-  };
+  config = lib.mkIf config.myConfig.flatpak.enable { services.flatpak.enable = true; };
 }
diff --git a/modules/system/virtualisation.nix b/modules/system/virtualisation.nix
index 9cf631c..bbcf387 100644
--- a/modules/system/virtualisation.nix
+++ b/modules/system/virtualisation.nix
@@ -12,14 +12,5 @@
     programs.virt-manager.enable = true;
 
     environment.systemPackages = [ pkgs.quickemu ];
-
-    home-manager.sharedModules = [
-      {
-        dconf.settings."org/virt-manager/virt-manager/connections" = {
-          autoconnect = [ "qemu:///system" ];
-          uris = [ "qemu:///system" ];
-        };
-      }
-    ];
   };
 }
diff --git a/users/seb/home.nix b/users/seb/home.nix
index a9809d1..c5a79b2 100644
--- a/users/seb/home.nix
+++ b/users/seb/home.nix
@@ -13,6 +13,8 @@
     equalizer.enable = true;
     sops.enable = false;
     night-light.enable = true;
+    flatpak.enable = true;
+    virtualisation.enable = true;
   };
 
   home.packages = [