From 9408fbb3a1d475984d9b821a76fb1f1cea102ab6 Mon Sep 17 00:00:00 2001 From: Mikael Johansson Date: Mon, 1 Jun 2026 09:59:28 +0200 Subject: [PATCH] Updating configuration adding ssh etc. --- ghostty/.config/ghostty/config | 7 +- opencode/.config/opencode/agents/reviewer.md | 26 +- opencode/.config/opencode/opencode.json | 8 +- setup.sh | 13 +- ssh/.ssh/config | 27 ++ starship/.config/starship.toml | 245 +++++++++++-------- zsh/.zshrc | 3 + 7 files changed, 206 insertions(+), 123 deletions(-) create mode 100644 ssh/.ssh/config diff --git a/ghostty/.config/ghostty/config b/ghostty/.config/ghostty/config index 580a722..11de93b 100644 --- a/ghostty/.config/ghostty/config +++ b/ghostty/.config/ghostty/config @@ -1,8 +1,9 @@ -theme = GruvboxDarkHard -font-family = JetBrainsMono Nerd Font -font-size = 10 +theme = "Gruvbox Dark Hard" +font-family = "JetBrainsMono Nerd Font" +font-size = 11 window-padding-x = 8 window-padding-y = 8 scrollback-limit = 10000 shell-integration = zsh +background-opacity = 0.95 diff --git a/opencode/.config/opencode/agents/reviewer.md b/opencode/.config/opencode/agents/reviewer.md index fde3e24..d6e1b8b 100644 --- a/opencode/.config/opencode/agents/reviewer.md +++ b/opencode/.config/opencode/agents/reviewer.md @@ -1,25 +1,19 @@ --- description: Reviews code for quality and best practices mode: subagent -model: ollama-local/qwen3.5:9b #openai/gpt-5.3-codex +kmodel: openai/gpt-5.3-codex temperature: 0.1 tools: - write: false - edit: false - bash: true -permission: - bash: - "git diff": allow - "grep *": allow - "*": deny + write: false + edit: false + bash: false --- -# Code Reviewer Instructions -You are a meticulous code reviewer agent that provides constructive feedback on code changes. + +You are in code review mode. Focus on: - Code quality and best practices - Potential bugs and edge cases -- Performance issues -- Security considerations and vunerabilities -- Logic errors and code readability -- Do NOT make direct edits to files. -- Provide feedback in a structured bulleted list. +- Performance implications +- Security considerations + +Provide constructive feedback without making direct changes. diff --git a/opencode/.config/opencode/opencode.json b/opencode/.config/opencode/opencode.json index 92cbd04..8c7f10b 100644 --- a/opencode/.config/opencode/opencode.json +++ b/opencode/.config/opencode/opencode.json @@ -1,6 +1,8 @@ { "$schema": "https://opencode.ai/config.json", - "plugin": [], + "plugin": [ + "opencode-copilot-auth@0.0.9" + ], "provider": { "ollama-local": { "npm": "@ai-sdk/openai-compatible", @@ -9,8 +11,8 @@ "baseURL": "http://localhost:11434/v1" }, "models": { - "qwen3.5:9b": { - "name": "qwen3.5:9b" + "gemma4:e2b": { + "name": "gemma4:e2b" } } } diff --git a/setup.sh b/setup.sh index 1f81e77..54ff44b 100755 --- a/setup.sh +++ b/setup.sh @@ -8,7 +8,7 @@ set -e # Configuration SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" BACKUP_DIR="$HOME/.dotfiles-backup-$(date +%Y%m%d-%H%M%S)" -AVAILABLE_PACKAGES=(bash zsh git ghostty starship tmux lazygit zed opencode) +AVAILABLE_PACKAGES=(bash zsh git ghostty ssh starship tmux lazygit zed opencode) # Colors for output RED='\033[0;31m' @@ -203,6 +203,17 @@ install_toolchain() { fi fi + # Install starship (cross-shell prompt) if missing + if ! command -v starship &> /dev/null; then + if [[ "$DRY_RUN" == "true" ]]; then + log_info "[DRY RUN] Would install starship" + else + log_info "Installing starship..." + curl -sS https://starship.rs/install.sh | sh -s -- --force --bin-dir "$bin_dir" + log_success "starship installed" + fi + fi + # Install ripgrep (fast grep alternative) if missing if ! command -v rg &> /dev/null; then if [[ "$DRY_RUN" == "true" ]]; then diff --git a/ssh/.ssh/config b/ssh/.ssh/config new file mode 100644 index 0000000..8c273c8 --- /dev/null +++ b/ssh/.ssh/config @@ -0,0 +1,27 @@ +# Defaults for all hosts +Host * + SetEnv TERM=xterm-256color + ControlMaster auto + ControlPath ~/.ssh/control-%r@%h:%p + ControlPersist 10m + AddKeysToAgent yes + ServerAliveInterval 60 + ServerAliveCountMax 3 + +# Three +Host morpheus + HostName 10.0.10.8 + User mikjoh +Host unifi-os-server + HostName 10.0.10.9 + User mikjoh +Host ns2 + HostName 10.0.10.16 + User mikjoh +Host three + HostName 10.0.40.11 + User mikjoh +Host hassio + HostName 10.0.20.41 + User hassio + diff --git a/starship/.config/starship.toml b/starship/.config/starship.toml index 63dbced..3afa718 100644 --- a/starship/.config/starship.toml +++ b/starship/.config/starship.toml @@ -1,48 +1,91 @@ "$schema" = 'https://starship.rs/config-schema.json' format = """ -[](#d3869b)\ +[](color_orange)\ +$os\ $username\ -[](bg:#fb4934 fg:#d3869b)\ +$hostname\ +[](bg:color_yellow fg:color_orange)\ $directory\ -[](fg:#fb4934 bg:#fe8019)\ +[](fg:color_yellow bg:color_aqua)\ $git_branch\ $git_status\ -[](fg:#fe8019 bg:#8ec07c)\ +[](fg:color_aqua bg:color_blue)\ $c\ -$elixir\ -$elm\ +$cpp\ +$rust\ $golang\ -$haskell\ -$java\ -$julia\ -$maven\ $nodejs\ $bun\ -$nim\ -$rust\ -$scala\ -[](fg:#8ec07c bg:#b8bb26)\ +$php\ +$java\ +$kotlin\ +$haskell\ +$python\ +[](fg:color_blue bg:color_bg3)\ $docker_context\ -[](fg:#b8bb26 bg:#665c54)\ +$conda\ +$pixi\ +[](fg:color_bg3 bg:color_bg1)\ $time\ -[ ](fg:#665c54)\ -$cmd_duration\ -""" +[ ](fg:color_bg1)\ +$line_break$character""" + +palette = 'gruvbox_dark' + +[palettes.gruvbox_dark] +color_fg0 = '#fbf1c7' +color_bg1 = '#3c3836' +color_bg3 = '#665c54' +color_blue = '#458588' +color_aqua = '#689d6a' +color_green = '#98971a' +color_orange = '#d65d0e' +color_purple = '#b16286' +color_red = '#cc241d' +color_yellow = '#d79921' + +[os] +disabled = false +style = "bg:color_orange fg:color_fg0" + +[os.symbols] +Windows = "󰍲" +Ubuntu = "󰕈" +SUSE = "" +Raspbian = "󰐿" +Mint = "󰣭" +Macos = "󰀵" +Manjaro = "" +Linux = "󰌽" +Gentoo = "󰣨" +Fedora = "󰣛" +Alpine = "" +Amazon = "" +Android = "" +AOSC = "" +Arch = "󰣇" +Artix = "󰣇" +EndeavourOS = "" +CentOS = "" +Debian = "󰣚" +Redhat = "󱄛" +RedHatEnterprise = "󱄛" +Pop = "" [username] show_always = true -style_user = "fg:#1d2021 bg:#d3869b" -style_root = "fg:#1d2021 bg:#d3869b" -format = '[$user ]($style)' -disabled = false +style_user = "bg:color_orange fg:color_fg0" +style_root = "bg:color_orange fg:color_fg0" +format = '[ $user ]($style)' -[os] -style = "fg:#1d2021 bg:#d3869b" -disabled = true +[hostname] +ssh_only = true +style = "bg:color_orange fg:color_fg0" +format = '[@$hostname ]($style)' [directory] -style = "fg:#1d2021 bg:#fb4934" +style = "fg:color_fg0 bg:color_yellow" format = "[ $path ]($style)" truncation_length = 3 truncation_symbol = "…/" @@ -50,99 +93,101 @@ truncation_symbol = "…/" [directory.substitutions] "Documents" = "󰈙 " "Downloads" = " " -"Music" = " " +"Music" = "󰝚 " "Pictures" = " " - -[c] -symbol = " " -style = "fg:#1d2021 bg:#8ec07c" -format = '[ $symbol ($version) ]($style)' - -[cpp] -symbol = " " -style = "fg:#1d2021 bg:#8ec07c" -format = '[ $symbol ($version) ]($style)' - -[docker_context] -symbol = " " -style = "fg:#1d2021 bg:#b8bb26" -format = '[ $symbol $context ]($style)' - -[elixir] -symbol = " " -style = "fg:#1d2021 bg:#8ec07c" -format = '[ $symbol ($version) ]($style)' - -[elm] -symbol = " " -style = "fg:#1d2021 bg:#8ec07c" -format = '[ $symbol ($version) ]($style)' +"Developer" = "󰲋 " [git_branch] symbol = "" -style = "fg:#1d2021 bg:#fe8019" -format = '[ $symbol $branch ]($style)' +style = "bg:color_aqua" +format = '[[ $symbol $branch ](fg:color_fg0 bg:color_aqua)]($style)' [git_status] -style = "fg:#1d2021 bg:#fe8019" -format = '[$all_status$ahead_behind ]($style)' - -[golang] -symbol = " " -style = "fg:#1d2021 bg:#8ec07c" -format = '[ $symbol ($version) ]($style)' - -[haskell] -symbol = " " -style = "fg:#1d2021 bg:#8ec07c" -format = '[ $symbol ($version) ]($style)' - -[java] -symbol = " " -style = "fg:#1d2021 bg:#8ec07c" -format = '[ $symbol ($version) ]($style)' - -[julia] -symbol = " " -style = "fg:#1d2021 bg:#8ec07c" -format = '[ $symbol ($version) ]($style)' - -[maven] -style = "fg:#1d2021 bg:#8ec07c" -format = '[ $symbol ($version) ]($style)' +style = "bg:color_aqua" +format = '[[($all_status$ahead_behind )](fg:color_fg0 bg:color_aqua)]($style)' [nodejs] symbol = "" -style = "fg:#1d2021 bg:#8ec07c" -format = '[ $symbol ($version) ]($style)' +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' [bun] symbol = "" -style = "fg:#1d2021 bg:#8ec07c" -format = '[ $symbol ($version) ]($style)' +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' -[nim] -symbol = "󰆥 " -style = "fg:#1d2021 bg:#8ec07c" -format = '[ $symbol ($version) ]($style)' +[c] +symbol = " " +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[cpp] +symbol = " " +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' [rust] symbol = "" -style = "fg:#1d2021 bg:#8ec07c" -format = '[ $symbol ($version) ]($style)' +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' -[scala] -symbol = " " -style = "fg:#1d2021 bg:#8ec07c" -format = '[ $symbol ($version) ]($style)' +[golang] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[php] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[java] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[kotlin] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[haskell] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[python] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[docker_context] +symbol = "" +style = "bg:color_bg3" +format = '[[ $symbol( $context) ](fg:#83a598 bg:color_bg3)]($style)' + +[conda] +style = "bg:color_bg3" +format = '[[ $symbol( $environment) ](fg:#83a598 bg:color_bg3)]($style)' + +[pixi] +style = "bg:color_bg3" +format = '[[ $symbol( $version)( $environment) ](fg:color_fg0 bg:color_bg3)]($style)' [time] disabled = false time_format = "%R" -style = "fg:#1d2021 bg:#665c54" -format = '[ ♥ $time ]($style)' +style = "bg:color_bg1" +format = '[[  $time ](fg:color_fg0 bg:color_bg1)]($style)' -[cmd_duration] -min_time = 2000 -style = "fg:#1d2021" -format = " took [$duration]($style) " +[line_break] +disabled = false + +[character] +disabled = false +success_symbol = '[](bold fg:color_green)' +error_symbol = '[](bold fg:color_red)' +vimcmd_symbol = '[](bold fg:color_green)' +vimcmd_replace_one_symbol = '[](bold fg:color_purple)' +vimcmd_replace_symbol = '[](bold fg:color_purple)' +vimcmd_visual_symbol = '[](bold fg:color_yellow)' diff --git a/zsh/.zshrc b/zsh/.zshrc index b0f8138..59958a8 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -85,6 +85,9 @@ if [ -f ~/.zsh_aliases ]; then . ~/.zsh_aliases fi +# opencode +export PATH=/home/mikjoh/.opencode/bin:$PATH + # ========================= # Atuin - shell history # =========================