From 2cb1e9d21026add46d4261ef4c3a9e4511a82c9b Mon Sep 17 00:00:00 2001
From: Johannes Merz <johannes.merz@mercedes-benz.com>
Date: Fri, 21 Nov 2025 12:03:07 +0100
Subject: [PATCH] resolve conflict

---
 fish/.config/fish/config.fish | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 59807c8..897a24a 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -19,17 +19,44 @@ else
 end
     
 alias docker-compose-update 'docker compose down && docker compose pull && docker compose up -d'
+<<<<<<< Updated upstream
 #alias vim='nvim'
+=======
+alias vim='nvim'
+alias dendron='code --user-data-dir=/Users/MERZJO/.config/dendron/user-data --extensions-dir=/Users/MERZJO/.config/dendron/extensions'
+alias sgpt='/Users/MERZJO/playground/shell-gpt/venv/bin/sgpt'
+>>>>>>> Stashed changes
 #alias clear='command clear; task limit:5 next; echo ""; echo ""'
 alias sudoe='sudo -E -s'
 
 function seconds
-    bash -c 'while true; do echo $(date +%S) | toilet -f smmono12; done'
+    bash /Users/MERZJO/playground/seconds-timer/seconds-timer.sh
     #bash -c 'while true; do printf \'   %s\r\' "$(date +%S)" | toilet -f smmono12 ; done'
 end
 
+<<<<<<< Updated upstream
 function open-tcp-ports
     sudo lsof -i -P -n | grep LISTEN
 end
 
 clear
+=======
+# Added by LM Studio CLI (lms)
+set -gx PATH $PATH /Users/MERZJO/.lmstudio/bin
+# End of LM Studio CLI section
+
+function open-webui-server-for-real
+    DATA_DIR=~/.open-webui uvx --python 3.11 open-webui@latest serve
+end
+
+# uv
+fish_add_path "/Users/MERZJO/.local/bin"
+fish_add_path "$HOME/.cargo/bin"
+
+alias claude="/Users/MERZJO/.claude/local/claude"
+
+# claude code via litellm/nexus
+set -gx ANTHROPIC_BASE_URL "https://litellm.civai.offsec.corpintra.net"
+set -gx ANTHROPIC_AUTH_TOKEN "sk-s4E92tkaWNPl_I2dM_lxuw"
+set -gx ANTHROPIC_MODEL "anthropic/claude-sonnet-4-testing"
+>>>>>>> Stashed changes