From 5aeb968c0b9e242f15f24b4a53e2e9efa5a75dad Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Fri, 10 Jul 2026 22:25:34 +0000
Subject: [PATCH 1/2] nixos/oo7: install oo7-cli

---
 nixos/modules/services/desktops/oo7.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/desktops/oo7.nix b/nixos/modules/services/desktops/oo7.nix
index 29c95ccf91a3..739f2cc69ac0 100644
--- a/nixos/modules/services/desktops/oo7.nix
+++ b/nixos/modules/services/desktops/oo7.nix
@@ -15,6 +15,8 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.oo7 ];
+
     services.dbus.packages = [ pkgs.oo7-server ];
 
     systemd.packages = [ pkgs.oo7-server ];

From 29e5cc271e88d423cdee4f365666ed213cb9e403 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Fri, 10 Jul 2026 22:36:13 +0000
Subject: [PATCH 2/2] nixos/oo7: refactor module layout

---
 nixos/modules/services/desktops/oo7.nix | 32 ++++++++++++-------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/desktops/oo7.nix b/nixos/modules/services/desktops/oo7.nix
index 739f2cc69ac0..42534656b81f 100644
--- a/nixos/modules/services/desktops/oo7.nix
+++ b/nixos/modules/services/desktops/oo7.nix
@@ -16,28 +16,26 @@ in
 
   config = lib.mkIf cfg.enable {
     environment.systemPackages = [ pkgs.oo7 ];
-
     services.dbus.packages = [ pkgs.oo7-server ];
 
-    systemd.packages = [ pkgs.oo7-server ];
+    systemd = {
+      packages = [ pkgs.oo7-server ];
+      user.services.oo7-daemon.wantedBy = [ "default.target" ];
+    };
 
-    systemd.user.services.oo7-daemon.wantedBy = [ "default.target" ];
+    security = {
+      pam.services.login.oo7.enable = true;
+
+      wrappers.oo7-daemon = {
+        owner = "root";
+        group = "root";
+        capabilities = "cap_ipc_lock=ep";
+        source = "${pkgs.oo7-server}/libexec/oo7-daemon";
+      };
+    };
 
     xdg.portal.extraPortals = [ pkgs.oo7-portal ];
-
-    security.pam.services.login.oo7.enable = true;
-
-    security.wrappers.oo7-daemon = {
-      owner = "root";
-      group = "root";
-      capabilities = "cap_ipc_lock=ep";
-      source = "${pkgs.oo7-server}/libexec/oo7-daemon";
-    };
   };
 
-  meta = {
-    inherit (pkgs.oo7.meta)
-      maintainers
-      ;
-  };
+  meta = { inherit (pkgs.oo7.meta) maintainers; };
 }