From 1a83d6b195e390f1c7ee3d8db7aeac0a4b7cb152 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Fri, 10 Jan 2025 13:36:38 -0500
Subject: [PATCH] Simplify flake

---
 flake.nix                                     | 26 +++----------------
 hosts/envy/default.nix                        |  8 +-----
 .../server/nextcloud/collabora/default.nix    |  2 +-
 3 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/flake.nix b/flake.nix
index 55edb8e..f0c2f6e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,34 +41,16 @@
     nur,
     blender,
     ...
-  }:
+  }@inputs:
+
   let
     mkNix = modules: nixpkgs.lib.nixosSystem {
       inherit modules;
-      specialArgs = {
-        inherit
-	  self
-          unstable
-          lanzaboote
-	  disko
-          impermanence
-          mailserver
-          minecraft
-          home-manager
-          nur
-          blender
-          ;
-      };
+      specialArgs = inputs;
     };
     mkHome = modules: pkgs: home-manager.lib.homeManagerConfiguration {
       inherit modules pkgs;
-      extraSpecialArgs = {
-        inherit
-          unstable
-          nur
-          blender
-          ;
-      };
+      extraSpecialArgs = inputs;
     };
   in {
     # nixos-rebuild switch --flake /etc/nixos#hostname
diff --git a/hosts/envy/default.nix b/hosts/envy/default.nix
index 3f4e622..88c4251 100644
--- a/hosts/envy/default.nix
+++ b/hosts/envy/default.nix
@@ -18,13 +18,7 @@
   system = {
     lanzaboote.enable = true;
     wireguard.client.enable = true;
+    libvirtd.enable = true;
     stateVersion = "24.11";
   };
-
-  # Special options
-  virtualisation.vmware.host.enable = true;
-  environment.persistence."/persist".directories = [
-    "/home/jimbo/.vmware"
-    "/home/jimbo/vmware"
-  ];
 }
diff --git a/modules/system/services/server/nextcloud/collabora/default.nix b/modules/system/services/server/nextcloud/collabora/default.nix
index 045250e..7220b25 100644
--- a/modules/system/services/server/nextcloud/collabora/default.nix
+++ b/modules/system/services/server/nextcloud/collabora/default.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }:
 {
-  services.collabora-online = {
+  services.collabora-online = lib.mkIf config.services.nextcloud.enable {
     enable = true;
   };
 }