From b3b10313644526bc3a622b2df53e99758556b690 Mon Sep 17 00:00:00 2001
From: moons <moons@moons14.com>
Date: Thu, 20 Aug 2026 06:18:23 +0900
Subject: [PATCH] fix

---
 modules/applications/codex-desktop/nixos.nix | 22 +++++++++++++++---
 modules/applications/codex/config.toml       |  5 +++-
 modules/systems/audio/nixos.nix              | 24 --------------------
 3 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/modules/applications/codex-desktop/nixos.nix b/modules/applications/codex-desktop/nixos.nix
index 7b519b7..7bdf9bd 100644
--- a/modules/applications/codex-desktop/nixos.nix
+++ b/modules/applications/codex-desktop/nixos.nix
@@ -4,15 +4,31 @@
   ...
 }:
 let
-  codexPackage = inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.codex;
+  system = pkgs.stdenv.hostPlatform.system;
+  desktopPackage = inputs.codex-desktop-linux.packages.${system}.codex-desktop.override {
+    enableComputerUseUi = false;
+    linuxFeatureIds = [
+      "appshots"
+      "open-target-discovery"
+      "remote-mobile-control"
+    ];
+  };
+  bundledCodex = pkgs.writeShellScriptBin "codex" ''
+    exec ${desktopPackage}/opt/codex-desktop/resources/codex "$@"
+  '';
 in
 {
+  environment.systemPackages = [
+    pkgs.bubblewrap
+  ];
+
   programs.codexDesktopLinux = {
     enable = true;
-    cliPackage = codexPackage;
+    package = desktopPackage;
+    cliPackage = bundledCodex;
     remoteControl = {
       enable = true;
-      package = codexPackage;
+      package = bundledCodex;
     };
     remoteMobileControl.enable = true;
     computerUseUi.enable = false;
diff --git a/modules/applications/codex/config.toml b/modules/applications/codex/config.toml
index bee707a..837d902 100644
--- a/modules/applications/codex/config.toml
+++ b/modules/applications/codex/config.toml
@@ -1,4 +1,4 @@
-model = "gpt-5.6-terra"
+model = "gpt-5.6-sol"
 model_reasoning_effort = "medium"
 
 approval_policy = "on-request"
@@ -11,3 +11,6 @@ network_access = false
 
 [projects."/home/moons/dotfiles"]
 trust_level = "trusted"
+
+[projects."/home/moons/projects/calendar"]
+trust_level = "trusted"
diff --git a/modules/systems/audio/nixos.nix b/modules/systems/audio/nixos.nix
index 3613dca..5ee28dc 100644
--- a/modules/systems/audio/nixos.nix
+++ b/modules/systems/audio/nixos.nix
@@ -21,29 +21,5 @@ in
     pulse.enable = true;
     jack.enable = true;
     wireplumber.enable = true;
-
-    extraConfig.pipewire."90-echo-cancel.conf" = {
-      "context.modules" = [
-        {
-          name = "libpipewire-module-echo-cancel";
-
-          args = {
-            "library.name" = "aec/libspa-aec-webrtc";
-
-            "monitor.mode" = true;
-
-            "capture.props" = {
-              "node.name" = "echo_cancel_capture";
-              "node.description" = "Echo Cancel Capture";
-            };
-
-            "source.props" = {
-              "node.name" = "echo_cancel_source";
-              "node.description" = "Echo Cancelled Microphone";
-            };
-          };
-        }
-      ];
-    };
   };
 }