From 032574e8795e9bc9f30055e32a5b468eed10d746 Mon Sep 17 00:00:00 2001
From: Johannes Merz <jay@vpsj.de>
Date: Fri, 21 Nov 2025 12:06:14 +0100
Subject: [PATCH] fixed merge for real

---
 fish/.config/fish/config.fish | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 897a24a..d9af23b 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -19,44 +19,16 @@ 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 /Users/MERZJO/playground/seconds-timer/seconds-timer.sh
+    bash -c 'while true; do echo $(date +%S) | toilet -f smmono12; done'
     #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