From 5497d6df51b7ceb97ad1459821319814506afcc2 Mon Sep 17 00:00:00 2001
From: Lucien Cartier-Tilet <lucien@phundrak.com>
Date: Sun, 7 Dec 2025 15:02:21 +0100
Subject: [PATCH] fix(AI): remove claude desktop, fixes for ollama

---
 flake.nix                        |  5 -----
 users/modules/dev/ai/claude.nix  |  9 +++++++--
 users/modules/dev/ai/default.nix | 10 +++++++---
 users/phundrak/host/marpa.nix    |  4 ++--
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8dfbae6..9517f1d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,11 +36,6 @@
 
     srvos.url = "github:nix-community/srvos";
 
-    claude-desktop = {
-      url = "github:k3d3/claude-desktop-linux-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/users/modules/dev/ai/claude.nix b/users/modules/dev/ai/claude.nix
index 5d623da..77e9e15 100644
--- a/users/modules/dev/ai/claude.nix
+++ b/users/modules/dev/ai/claude.nix
@@ -2,15 +2,20 @@
   config,
   lib,
   inputs,
-  system,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.home.dev.ai.claude;
+  system = pkgs.stdenv.hostPlatform.system;
 in {
   options.home.dev.ai.claude.enable = mkEnableOption "Enables Claude-related packages";
   config = mkIf cfg.enable {
-    home.packages = [inputs.claude-desktop.packages.${system}.claude-desktop-with-fhs];
+    home.packages = let
+      claude-jj = pkgs.writeShellScriptBin "claude-jj" ''
+        ${pkgs.claude-code}/bin/claude --append-system-prompt 'CRITICAL: This repository uses Jujutsu (jj), NOT git. Never use git commands. Use jj equivalents. See CLAUDE.md.' "$@"
+      '';
+    in [claude-jj];
     programs.claude-code = {
       inherit (cfg) enable;
     };
diff --git a/users/modules/dev/ai/default.nix b/users/modules/dev/ai/default.nix
index 0bbeed0..fbdcbcd 100644
--- a/users/modules/dev/ai/default.nix
+++ b/users/modules/dev/ai/default.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
 with lib; let
@@ -12,8 +13,11 @@ in {
   ];
 
   options.home.dev.ai.enable = mkEnableOption "Enables AI features";
-  config.home.dev.ai = mkIf cfg.enable {
-    ollama.enable = mkDefault cfg.enable;
-    claude.enable = mkDefault cfg.enable;
+  config.home = mkIf cfg.enable {
+    dev.ai = {
+      ollama.enable = mkDefault cfg.enable;
+      claude.enable = mkDefault cfg.enable;
+    };
+    packages = [pkgs.opencode];
   };
 }
diff --git a/users/phundrak/host/marpa.nix b/users/phundrak/host/marpa.nix
index b48434a..4d11e36 100644
--- a/users/phundrak/host/marpa.nix
+++ b/users/phundrak/host/marpa.nix
@@ -2,9 +2,9 @@
   imports = [../home.nix];
   home = {
     cli.nh.flake = "${config.home.homeDirectory}/.dotfiles";
-    dev.ai.ollama = {
+    dev.ai = {
       enable = true;
-      gpu = "rocm";
+      ollama.gpu = "rocm";
     };
     desktop.hyprland.host = "marpa";
     phundrak.sshKey = {