diff --git a/nixos/code.nix b/nixos/code.nix index e6868eed..56b4b6af 100644 --- a/nixos/code.nix +++ b/nixos/code.nix @@ -6,10 +6,6 @@ makeEnable, ... }: -let - codexDesktop = - inputs.codex-desktop-linux.packages.${pkgs.stdenv.hostPlatform.system}."codex-desktop-computer-use-ui-remote-mobile-control"; -in makeEnable config "myModules.code" true { programs.direnv = { enable = true; @@ -24,6 +20,7 @@ makeEnable config "myModules.code" true { }; home-manager.sharedModules = lib.mkIf config.myModules.desktop.enable [ + inputs.codex-desktop-linux.homeManagerModules.default { home.sessionVariables.YDOTOOL_SOCKET = "/run/ydotoold/socket"; systemd.user.sessionVariables.YDOTOOL_SOCKET = "/run/ydotoold/socket"; @@ -40,6 +37,12 @@ makeEnable config "myModules.code" true { programs.codex = { enable = true; package = pkgs.codex; + }; + + programs.codexDesktopLinux = { + enable = true; + computerUseUi.enable = true; + remoteMobileControl.enable = true; remoteControl = { enable = true; package = pkgs.codex; @@ -65,7 +68,6 @@ makeEnable config "myModules.code" true { antigravity claude-code codex - codexDesktop gemini-cli happy-coder opencode diff --git a/nixos/flake.lock b/nixos/flake.lock index c53950b7..ab657a53 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -137,16 +137,16 @@ ] }, "locked": { - "lastModified": 1779264129, - "narHash": "sha256-EaIYDtBeBz6CZBx0PG9VN/duaayuhh1tedAtcZofHgg=", - "ref": "codex/fix-bundled-backend-plugin-links", - "rev": "7ab590bc96cde82f98ee631d7e4cc0ecdddd035e", - "revCount": 591, + "lastModified": 1779310149, + "narHash": "sha256-5c8tAIOXwzhWWbceyMnA5xt/7kW+6vIs+uXtrxxv6ZI=", + "ref": "codex/pr260-nixos-service-module", + "rev": "fbb5222089f58539da8c3c94f0c42fbc820d18af", + "revCount": 606, "type": "git", "url": "ssh://git@github.com/colonelpanic8/codex-desktop-linux.git" }, "original": { - "ref": "codex/fix-bundled-backend-plugin-links", + "ref": "codex/pr260-nixos-service-module", "type": "git", "url": "ssh://git@github.com/colonelpanic8/codex-desktop-linux.git" } diff --git a/nixos/flake.nix b/nixos/flake.nix index c0963841..82f4ce1a 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -237,7 +237,7 @@ }; codex-desktop-linux = { - url = "git+ssh://git@github.com/colonelpanic8/codex-desktop-linux.git?ref=codex/fix-bundled-backend-plugin-links"; + url = "git+ssh://git@github.com/colonelpanic8/codex-desktop-linux.git?ref=codex/pr260-nixos-service-module"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; @@ -289,22 +289,6 @@ url = "https://github.com/colonelpanic8/home-manager/commit/92f4b7aa5254f8bcddc9ef86e04ea5314410d10b.patch"; hash = "sha256-RQl5daVpCqQi05l9QfTEz2PpQxmsv/HYnXrgXbqbwWk="; } - { - url = "https://github.com/colonelpanic8/home-manager/commit/1e7a11991ae0149c0e3ba24c692200b2e7f94cbd.patch"; - hash = "sha256-3Oni+4z11DbCvVZiJaKUv1UcnXRowCljvgU0QobWKkQ="; - } - { - url = "https://github.com/colonelpanic8/home-manager/commit/504ccee0f03033e2c762f6ee8f5a84b002e01ec7.patch"; - hash = "sha256-3z7lWp8K54eiRnXPgGDeFwQ7/w6M38B3iKhL9UCrj9w="; - } - { - url = "https://github.com/colonelpanic8/home-manager/commit/a82a664a30f2f07cd300d8a2191d8046b7b5dfdd.patch"; - hash = "sha256-qFdJB5AbQXJCl9xaapxgAOaPcU9V1rmnJXrI7Pjw1jE="; - } - { - url = "https://github.com/colonelpanic8/home-manager/commit/13cdadc023e4dfd7b42ef2362cfd0ba9f129fd21.patch"; - hash = "sha256-HnSvZtQjI3eAhyENmQvBvKwlWPmDPcvHs2MyYg3u08s="; - } ]; # Convert PR patches to full patch format for nixpkgs