From 5466c59dded4ab364e0f47ccef5ac7a4c0bb6d7d Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Wed, 18 Mar 2026 21:06:43 -0500
Subject: [PATCH] cleanup

---
 .../root@macbook-pro-nixos/default.nix         | 18 +++---------------
 homes/aarch64-linux/root@pi5/default.nix       | 18 +++---------------
 .../x86_64-linux/nixos@iso-minimal/default.nix | 18 +++---------------
 homes/x86_64-linux/root@allyx/default.nix      | 18 +++---------------
 .../x86_64-linux/root@iso-minimal/default.nix  | 18 +++---------------
 homes/x86_64-linux/root@jallen-nas/default.nix | 18 +++---------------
 homes/x86_64-linux/root@matt-nixos/default.nix | 18 +++---------------
 homes/x86_64-linux/root@nuc-nixos/default.nix  | 18 +++---------------
 8 files changed, 24 insertions(+), 120 deletions(-)

diff --git a/homes/aarch64-linux/root@macbook-pro-nixos/default.nix b/homes/aarch64-linux/root@macbook-pro-nixos/default.nix
index 281b2f1..34ac6b8 100644
--- a/homes/aarch64-linux/root@macbook-pro-nixos/default.nix
+++ b/homes/aarch64-linux/root@macbook-pro-nixos/default.nix
@@ -1,18 +1,6 @@
-{
-  lib,
-  namespace,
-  ...
-}:
-let
-  inherit (lib.${namespace}) disabled;
-in
+{ lib, ... }:
 {
   home.username = "root";
-  services = {
-    nextcloud-client = lib.mkForce disabled;
-    kdeconnect = {
-      enable = false;
-      indicator = false;
-    };
-  };
+  services.nextcloud-client.enable = lib.mkForce false;
+  services.kdeconnect.enable = false;
 }
diff --git a/homes/aarch64-linux/root@pi5/default.nix b/homes/aarch64-linux/root@pi5/default.nix
index 281b2f1..34ac6b8 100644
--- a/homes/aarch64-linux/root@pi5/default.nix
+++ b/homes/aarch64-linux/root@pi5/default.nix
@@ -1,18 +1,6 @@
-{
-  lib,
-  namespace,
-  ...
-}:
-let
-  inherit (lib.${namespace}) disabled;
-in
+{ lib, ... }:
 {
   home.username = "root";
-  services = {
-    nextcloud-client = lib.mkForce disabled;
-    kdeconnect = {
-      enable = false;
-      indicator = false;
-    };
-  };
+  services.nextcloud-client.enable = lib.mkForce false;
+  services.kdeconnect.enable = false;
 }
diff --git a/homes/x86_64-linux/nixos@iso-minimal/default.nix b/homes/x86_64-linux/nixos@iso-minimal/default.nix
index 012bbfc..4504a07 100644
--- a/homes/x86_64-linux/nixos@iso-minimal/default.nix
+++ b/homes/x86_64-linux/nixos@iso-minimal/default.nix
@@ -1,18 +1,6 @@
-{
-  lib,
-  namespace,
-  ...
-}:
-let
-  inherit (lib.${namespace}) disabled;
-in
+{ lib, ... }:
 {
   home.username = "nixos";
-  services = {
-    nextcloud-client = lib.mkForce disabled;
-    kdeconnect = {
-      enable = false;
-      indicator = false;
-    };
-  };
+  services.nextcloud-client.enable = lib.mkForce false;
+  services.kdeconnect.enable = false;
 }
diff --git a/homes/x86_64-linux/root@allyx/default.nix b/homes/x86_64-linux/root@allyx/default.nix
index 281b2f1..34ac6b8 100644
--- a/homes/x86_64-linux/root@allyx/default.nix
+++ b/homes/x86_64-linux/root@allyx/default.nix
@@ -1,18 +1,6 @@
-{
-  lib,
-  namespace,
-  ...
-}:
-let
-  inherit (lib.${namespace}) disabled;
-in
+{ lib, ... }:
 {
   home.username = "root";
-  services = {
-    nextcloud-client = lib.mkForce disabled;
-    kdeconnect = {
-      enable = false;
-      indicator = false;
-    };
-  };
+  services.nextcloud-client.enable = lib.mkForce false;
+  services.kdeconnect.enable = false;
 }
diff --git a/homes/x86_64-linux/root@iso-minimal/default.nix b/homes/x86_64-linux/root@iso-minimal/default.nix
index 281b2f1..34ac6b8 100644
--- a/homes/x86_64-linux/root@iso-minimal/default.nix
+++ b/homes/x86_64-linux/root@iso-minimal/default.nix
@@ -1,18 +1,6 @@
-{
-  lib,
-  namespace,
-  ...
-}:
-let
-  inherit (lib.${namespace}) disabled;
-in
+{ lib, ... }:
 {
   home.username = "root";
-  services = {
-    nextcloud-client = lib.mkForce disabled;
-    kdeconnect = {
-      enable = false;
-      indicator = false;
-    };
-  };
+  services.nextcloud-client.enable = lib.mkForce false;
+  services.kdeconnect.enable = false;
 }
diff --git a/homes/x86_64-linux/root@jallen-nas/default.nix b/homes/x86_64-linux/root@jallen-nas/default.nix
index 281b2f1..34ac6b8 100644
--- a/homes/x86_64-linux/root@jallen-nas/default.nix
+++ b/homes/x86_64-linux/root@jallen-nas/default.nix
@@ -1,18 +1,6 @@
-{
-  lib,
-  namespace,
-  ...
-}:
-let
-  inherit (lib.${namespace}) disabled;
-in
+{ lib, ... }:
 {
   home.username = "root";
-  services = {
-    nextcloud-client = lib.mkForce disabled;
-    kdeconnect = {
-      enable = false;
-      indicator = false;
-    };
-  };
+  services.nextcloud-client.enable = lib.mkForce false;
+  services.kdeconnect.enable = false;
 }
diff --git a/homes/x86_64-linux/root@matt-nixos/default.nix b/homes/x86_64-linux/root@matt-nixos/default.nix
index 281b2f1..34ac6b8 100644
--- a/homes/x86_64-linux/root@matt-nixos/default.nix
+++ b/homes/x86_64-linux/root@matt-nixos/default.nix
@@ -1,18 +1,6 @@
-{
-  lib,
-  namespace,
-  ...
-}:
-let
-  inherit (lib.${namespace}) disabled;
-in
+{ lib, ... }:
 {
   home.username = "root";
-  services = {
-    nextcloud-client = lib.mkForce disabled;
-    kdeconnect = {
-      enable = false;
-      indicator = false;
-    };
-  };
+  services.nextcloud-client.enable = lib.mkForce false;
+  services.kdeconnect.enable = false;
 }
diff --git a/homes/x86_64-linux/root@nuc-nixos/default.nix b/homes/x86_64-linux/root@nuc-nixos/default.nix
index 281b2f1..34ac6b8 100644
--- a/homes/x86_64-linux/root@nuc-nixos/default.nix
+++ b/homes/x86_64-linux/root@nuc-nixos/default.nix
@@ -1,18 +1,6 @@
-{
-  lib,
-  namespace,
-  ...
-}:
-let
-  inherit (lib.${namespace}) disabled;
-in
+{ lib, ... }:
 {
   home.username = "root";
-  services = {
-    nextcloud-client = lib.mkForce disabled;
-    kdeconnect = {
-      enable = false;
-      indicator = false;
-    };
-  };
+  services.nextcloud-client.enable = lib.mkForce false;
+  services.kdeconnect.enable = false;
 }