fix(AI): remove claude desktop, fixes for ollama

This commit is contained in:
2025-12-07 15:02:21 +01:00
parent 1a43dcdad4
commit 5497d6df51
4 changed files with 16 additions and 12 deletions

View File

@@ -36,11 +36,6 @@
srvos.url = "github:nix-community/srvos"; srvos.url = "github:nix-community/srvos";
claude-desktop = {
url = "github:k3d3/claude-desktop-linux-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
zen-browser = { zen-browser = {
url = "github:youwen5/zen-browser-flake"; url = "github:youwen5/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View File

@@ -2,15 +2,20 @@
config, config,
lib, lib,
inputs, inputs,
system, pkgs,
... ...
}: }:
with lib; let with lib; let
cfg = config.home.dev.ai.claude; cfg = config.home.dev.ai.claude;
system = pkgs.stdenv.hostPlatform.system;
in { in {
options.home.dev.ai.claude.enable = mkEnableOption "Enables Claude-related packages"; options.home.dev.ai.claude.enable = mkEnableOption "Enables Claude-related packages";
config = mkIf cfg.enable { 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 = { programs.claude-code = {
inherit (cfg) enable; inherit (cfg) enable;
}; };

View File

@@ -1,6 +1,7 @@
{ {
config, config,
lib, lib,
pkgs,
... ...
}: }:
with lib; let with lib; let
@@ -12,8 +13,11 @@ in {
]; ];
options.home.dev.ai.enable = mkEnableOption "Enables AI features"; options.home.dev.ai.enable = mkEnableOption "Enables AI features";
config.home.dev.ai = mkIf cfg.enable { config.home = mkIf cfg.enable {
dev.ai = {
ollama.enable = mkDefault cfg.enable; ollama.enable = mkDefault cfg.enable;
claude.enable = mkDefault cfg.enable; claude.enable = mkDefault cfg.enable;
}; };
packages = [pkgs.opencode];
};
} }

View File

@@ -2,9 +2,9 @@
imports = [../home.nix]; imports = [../home.nix];
home = { home = {
cli.nh.flake = "${config.home.homeDirectory}/.dotfiles"; cli.nh.flake = "${config.home.homeDirectory}/.dotfiles";
dev.ai.ollama = { dev.ai = {
enable = true; enable = true;
gpu = "rocm"; ollama.gpu = "rocm";
}; };
desktop.hyprland.host = "marpa"; desktop.hyprland.host = "marpa";
phundrak.sshKey = { phundrak.sshKey = {