Compare commits

..

2 Commits

Author SHA1 Message Date
Nicole Dresselhaus
d0d43838bf small fixes 2025-11-12 18:35:24 +01:00
Nicole Dresselhaus
f1f698b2c2 fix snippets 2025-11-11 15:00:06 +01:00
5 changed files with 64 additions and 22 deletions

View File

@@ -1,20 +1,61 @@
SESSION_TYPE=local
if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
SESSION_TYPE=remote/ssh
# many other tests omitted
else
case $(ps -o comm= -p "$PPID") in
sshd | */sshd) SESSION_TYPE=remote/ssh ;;
esac
fi
if [ "$SESSION_TYPE" != "remote/ssh" ]; then
alias vim=nvim
export EDITOR=nvim
fi
export PATH=$PATH:$HOME/.local/bin
[ -f "$HOME/.fzf.bash" ] && source "$HOME/.fzf.bash"
[ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env" # ghcup-env
# direnv
_direnv_hook() { _direnv_hook() {
local previous_exit_status=$?; local previous_exit_status=$?
trap -- '' SIGINT; trap -- '' SIGINT
eval "$("/usr/bin/direnv" export bash)"; eval "$("/usr/bin/direnv" export bash)"
trap - SIGINT; trap - SIGINT
return $previous_exit_status; return $previous_exit_status
}; }
if ! [[ "${PROMPT_COMMAND:-}" =~ _direnv_hook ]]; then if ! [[ "${PROMPT_COMMAND:-}" =~ _direnv_hook ]] && [ -f "/usr/bin/direnv" ]; then
PROMPT_COMMAND="_direnv_hook${PROMPT_COMMAND:+;$PROMPT_COMMAND}" PROMPT_COMMAND="_direnv_hook${PROMPT_COMMAND:+;$PROMPT_COMMAND}"
fi fi
# starship function set_win_title() {
function set_win_title(){ echo -ne "\033]0; $(basename "$PWD") \007"
echo -ne "\033]0; $(basename "$PWD") \007"
} }
starship_precmd_user_func="set_win_title" export starship_precmd_user_func="set_win_title"
eval "$(starship init bash)" [ -s "$(which starship)" ] && eval "$(starship init bash)"
export ERG_PATH="$HOME/.nix-profile/lib/erg/"
export PYENV_ROOT="$HOME/.pyenv"
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
[ -s "$(which pyenv)" ] && eval "$(pyenv init -)"
[ -s "$(which pyenv)" ] && eval "$(pyenv virtualenv-init -)"
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
# Added by LM Studio CLI (lms)
export PATH="$PATH:$HOME/.lmstudio/bin"
# pnpm
export PNPM_HOME="$HOME/.pnpm"
case ":$PATH:" in
*":$PNPM_HOME:"*) ;;
*) export PATH="$PNPM_HOME:$PATH" ;;
esac
# pnpm end

View File

@@ -101,11 +101,11 @@ msg "- prompt: ${prompt}"
msg "- arguments: ${args[*]-}" msg "- arguments: ${args[*]-}"
if [[ -z "${image-}" ]]; then if [[ -z "${image-}" ]]; then
echo '{ "model": "gemma3:12b", "prompt": "'"${prompt}"'" }' >"$payload" echo '{ "model": "gemma3:27b", "prompt": "'"${prompt}"'" }' >"$payload"
else else
abspath=$(get_abs_filename "${image}") abspath=$(get_abs_filename "${image}")
imgbase64=$(base64 -w 0 "${abspath}") imgbase64=$(base64 -w 0 "${abspath}")
echo '{ "model": "gemma3:12b", "prompt": "'"${prompt}"'", "images": ["'"${imgbase64}"'"] }' >"$payload" echo '{ "model": "gemma3:27b", "prompt": "'"${prompt}"'", "images": ["'"${imgbase64}"'"] }' >"$payload"
fi fi
while IFS= read -r line; do while IFS= read -r line; do

View File

@@ -1,9 +1,8 @@
return { return {
"saghen/blink.cmp", "saghen/blink.cmp",
dependencies = { event = "InsertEnter",
"Kaiser-Yang/blink-cmp-avante", -- LuaSnip kommt aus lua/plugins/snippets.lua früh rein; hier reicht avante
{ "L3MON4D3/LuaSnip", version = "v2.*" }, dependencies = { "Kaiser-Yang/blink-cmp-avante" },
},
opts = { opts = {
signature = { enabled = true }, signature = { enabled = true },
fuzzy = { implementation = "prefer_rust" }, fuzzy = { implementation = "prefer_rust" },

View File

@@ -12,6 +12,7 @@ return {
opts = opts or {} opts = opts or {}
opts.ensure_installed = vim.tbl_extend("force", opts.ensure_installed or {}, { opts.ensure_installed = vim.tbl_extend("force", opts.ensure_installed or {}, {
"haskell", "haskell",
"c",
"lua", "lua",
"vim", "vim",
"bash", "bash",

View File

@@ -4,6 +4,7 @@ return {
version = "v2.*", version = "v2.*",
lazy = false, -- früh laden lazy = false, -- früh laden
priority = 1000, -- vor anderem Zeug priority = 1000, -- vor anderem Zeug
enabled = true,
dependencies = { "rafamadriz/friendly-snippets" }, dependencies = { "rafamadriz/friendly-snippets" },
build = (function() build = (function()
return (vim.fn.executable("make") == 1) and "make install_jsregexp" or nil return (vim.fn.executable("make") == 1) and "make install_jsregexp" or nil
@@ -15,9 +16,9 @@ return {
enable_autosnippets = true, enable_autosnippets = true,
}) })
require("luasnip.loaders.from_vscode").lazy_load() require("luasnip.loaders.from_vscode").lazy_load()
require("luasnip.loaders.from_lua").lazy_load({ -- require("luasnip.loaders.from_lua").lazy_load({
paths = vim.fn.stdpath("config") .. "/lua/snippets", -- paths = vim.fn.stdpath("config") .. "/lua/snippets",
}) -- })
end, end,
}, },
} }