diff --git a/.config/neofetch/ascii/qa.txt b/.config/fastfetch/ascii/qa.txt similarity index 100% rename from .config/neofetch/ascii/qa.txt rename to .config/fastfetch/ascii/qa.txt diff --git a/.config/fastfetch/config.jsonc b/.config/fastfetch/config.jsonc new file mode 100644 index 0000000..3bb5499 --- /dev/null +++ b/.config/fastfetch/config.jsonc @@ -0,0 +1,71 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "type": "file", + "source": "~/.config/fastfetch/ascii/qa.txt", + "color": { + "1": "cyan", + "2": "blue" + }, + "padding": { + "right": 2 + } + }, + "modules": [ + "title", + "separator", + { + "type": "os", + "format": "{3} {12}" + }, + { + "type": "kernel", + "format": "{2}" + }, + { + "type": "uptime" + }, + { + "type": "shell" + }, + { + "type": "cpu", + "format": "{1}" + }, + { + "type": "memory", + "format": "{1} / {2} ({3})" + }, + { + "type": "disk", + "folders": "/" + }, + { + "type": "command", + "key": "Docker", + "text": "docker --version 2>/dev/null | cut -d' ' -f3 | tr -d ','" + }, + { + "type": "command", + "key": "Kubectl", + "text": "kubectl version --client --output=yaml 2>/dev/null | grep gitVersion | cut -d' ' -f4" + }, + { + "type": "command", + "key": "Go", + "text": "go version 2>/dev/null | cut -d' ' -f3" + }, + { + "type": "command", + "key": "Python", + "text": "python3 --version 2>/dev/null | cut -d' ' -f2" + }, + { + "type": "command", + "key": "Node", + "text": "node --version 2>/dev/null" + }, + "break", + "colors" + ] +} diff --git a/.config/fish/conf.d/aliases.fish b/.config/fish/conf.d/aliases.fish index d89b7fc..b420fd2 100644 --- a/.config/fish/conf.d/aliases.fish +++ b/.config/fish/conf.d/aliases.fish @@ -4,6 +4,7 @@ alias g="goto" alias vim="nvim" alias code="open -a 'Visual Studio Code'" alias kubi="open -a 'Lens'" +alias update-system="brew update && brew upgrade && npm update -g" alias do-st="docker compose" alias do-re="docker compose down && docker compose up -d" diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 4fb3139..e6293d4 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,7 +1,7 @@ # ~/.config/fish/config.fish # Startup commands only if status is-interactive - neofetch + fastfetch end if type -q mise @@ -25,6 +25,7 @@ set -g fish_key_bindings fish_default_key_bindings # See also the release notes for fish 4.3.0 (run `help relnotes`). fish_add_path /opt/homebrew/bin +fish_add_path /opt/homebrew/sbin fish_add_path /Users/r.kallinich/go/bin fish_add_path /Users/r.kallinich/.cargo/bin fish_add_path /Applications/Ghostty.app/Contents/MacOS @@ -62,17 +63,8 @@ set --global fish_pager_color_selected_background -r set -gx GEMINI_API_KEY "AIzaSyBu-u9JIHoPR_wIsjwjelo1lGUzzxKKofQ" set -gx JULES_API_KEY "AQ.Ab8RN6LXe33UjfpBGpityANYBO-pHUwZEG7wKoM4V7yWTAezoQ" set -gx GCP_PROJECT_ID "gen-lang-client-0990109275" -# 1Password SSH Agent -if test -e "$HOME/.1password/agent.sock" - set -gx SSH_AUTH_SOCK "$HOME/.1password/agent.sock" -else if test -e "$HOME/Library/Group Containers/2BU85C4SUE.com.1password/t/agent.sock" - set -gx SSH_AUTH_SOCK "$HOME/Library/Group Containers/2BU85C4SUE.com.1password/t/agent.sock" -end +# set -gx SSH_AUTH_SOCK "$HOME/Library/Group Containers/2BU85C4SUE.com.1password/t/agent.sock" # Added by Antigravity CLI installer set -gx PATH "/Users/r.kallinich/.local/bin" $PATH - - -# Added by Antigravity CLI installer -set -gx PATH "/home/baerspektivo/.local/bin" $PATH diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf deleted file mode 100644 index 4099174..0000000 --- a/.config/neofetch/config.conf +++ /dev/null @@ -1,72 +0,0 @@ -# DevOps-focused neofetch config -# ~/.config/neofetch/config.conf - -print_info() { - info title - info underline - - info "OS" distro - info "Kernel" kernel - info "Uptime" uptime - info "Shell" shell - info "CPU" cpu - info "Memory" memory - info "Disk" disk - - # DevOps tools (if available) - command -v docker >/dev/null && prin "Docker" "$(docker --version | cut -d' ' -f3 | tr -d ',')" - command -v kubectl >/dev/null && prin "Kubectl" "$(kubectl version --client --output=yaml 2>/dev/null | grep gitVersion | cut -d' ' -f4)" - command -v go >/dev/null && prin "Go" "$(go version | cut -d' ' -f3)" - command -v python3 >/dev/null && prin "Python" "$(python3 --version | cut -d' ' -f2)" - command -v node >/dev/null && prin "Node" "$(node --version)" - - info cols -} - -# Performance optimizations -kernel_shorthand="on" -distro_shorthand="off" -os_arch="on" -uptime_shorthand="on" -memory_percent="on" -memory_unit="gib" -shell_path="off" -shell_version="on" -cpu_speed="on" -cpu_cores="logical" -cpu_temp="off" # Often not needed for DevOps -speed_shorthand="on" - -# Disable unnecessary for DevOps -# GPU info - not needed for servers/DevOps -gpu_type="off" - -# Disk info - useful for DevOps -disk_show=('/') -disk_percent="on" - -# Clean appearance -colors=(distro) -bold="on" -underline_enabled="on" -underline_char="-" -separator=":" - -# ASCII settings -image_backend="ascii" -image_source="$HOME/.config/neofetch/ascii/qa.txt" -ascii_distro="off" -# ascii_colors=(distro) -ascii_colors=(4 6 4 6) -ascii_bold="on" - - -# Disable image features for speed -image_loop="off" -color_blocks="on" -block_range=(0 7) # Smaller range for speed -block_width=2 -block_height=1 - -# Fast execution -stdout="off" diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index a3f9a23..6f4329f 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -14,21 +14,21 @@ "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "67029ccdac1ef8941e13b826417bc0ffac24cc86" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "40276c4df7e6bdce6801d6c035c6227f9115a855" }, "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" }, "neo-tree.nvim": { "branch": "main", "commit": "83e7a2982fd12b9c3d35bc39dd5877cd91a02a61" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, - "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" }, + "nui.nvim": { "branch": "main", "commit": "10fc361835c856ba4233ef5ea135b919bf3dce97" }, + "nvim-autopairs": { "branch": "master", "commit": "430522f95fe4fb7c511ec64f8c1a90cc6a66c05c" }, "nvim-cmp": { "branch": "main", "commit": "2ffe79f1f021def8dd1fcd81deb16f1bb0d989f3" }, - "nvim-lspconfig": { "branch": "master", "commit": "d2011e1dd0c27569c551f16b688d86029ae015c9" }, + "nvim-lspconfig": { "branch": "master", "commit": "16286347bdba1333c7d124d9de9fe6630731b2b2" }, "nvim-surround": { "branch": "main", "commit": "2e93e154de9ff326def6480a4358bfc149d5da2c" }, - "nvim-treesitter": { "branch": "main", "commit": "c9f9ed6c1892f629ea399f4ee7905f2686fa13f2" }, - "nvim-treesitter-textobjects": { "branch": "main", "commit": "898ee307df58f854d11cd7edd06472574d48014e" }, - "nvim-web-devicons": { "branch": "master", "commit": "2ae6958df7ced50baac5035cec0c15799eedfbf7" }, + "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, + "nvim-web-devicons": { "branch": "master", "commit": "5f032a85be210cd1c6ac98861eb3b187ff3bd5eb" }, "oil.nvim": { "branch": "master", "commit": "b73018b75affd13fa38e2fc94ef753b465f770d7" }, "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, - "schemastore.nvim": { "branch": "main", "commit": "c8170f9628265f5a01510182703bab9125ef15d8" }, + "schemastore.nvim": { "branch": "main", "commit": "2940d5e12f8797620cd47dca984d46119e1fa4b8" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "b25b749b9db64d375d782094e2b9dce53ad53a40" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, diff --git a/README.md b/README.md index 33dc7e6..744903f 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Meine persönliche Development-Umgebung optimiert für: ### System Monitoring & Window Managers - **btop** - Ressourcen-Monitor (Primary) - **htop** - Fallback Monitor (wenn btop abstürzt) -- **neofetch** - System Info +- **fastfetch** - System Info - **yabai** - Tiling Window Manager (macOS) - **Hyprland** - Dynamic tiling Wayland compositor (Linux) @@ -59,7 +59,7 @@ nvim brew tap koekeishiya/formulae # Core & Development tools installieren -brew install git neovim fish starship fzf ripgrep fd bat btop neofetch direnv lazygit mise yabai tmux +brew install git neovim fish starship fzf ripgrep fd bat btop fastfetch direnv lazygit mise yabai tmux brew install --cask ghostty 1password-cli # Symlinks erstellen @@ -67,7 +67,7 @@ ln -sf ~/gits/dotfiles/.config/fish ~/.config/fish ln -sf ~/gits/dotfiles/.config/nvim ~/.config/nvim ln -sf ~/gits/dotfiles/.config/ghostty ~/.config/ghostty ln -sf ~/gits/dotfiles/.config/starship.toml ~/.config/starship.toml -ln -sf ~/gits/dotfiles/.config/neofetch ~/.config/neofetch +ln -sf ~/gits/dotfiles/.config/fastfetch ~/.config/fastfetch ln -sf ~/gits/dotfiles/.config/yabai ~/.config/yabai ln -sf ~/gits/dotfiles/.config/hypr ~/.config/hypr @@ -104,7 +104,7 @@ dotfiles/ │ │ └── init.lua # Entry point │ ├── btop/ # System monitor config (primary) │ ├── htop/ # System monitor fallback -│ ├── neofetch/ # System info config +│ ├── fastfetch/ # System info config (with custom Bug Hunter Whale ASCII art) │ ├── yabai/ # Window manager (macOS) │ ├── hypr/ # Window manager (Linux/Wayland) │ └── starship.toml # Prompt config diff --git a/install.sh b/install.sh index 54422e8..0f263cf 100755 --- a/install.sh +++ b/install.sh @@ -159,7 +159,7 @@ backup_configs() { [ -d ~/.config/fish ] && cp -r ~/.config/fish "$BACKUP_DIR/" [ -d ~/.config/ghostty ] && cp -r ~/.config/ghostty "$BACKUP_DIR/" [ -d ~/.config/nvim ] && cp -r ~/.config/nvim "$BACKUP_DIR/" - [ -d ~/.config/neofetch ] && cp -r ~/.config/neofetch "$BACKUP_DIR/" + [ -d ~/.config/fastfetch ] && cp -r ~/.config/fastfetch "$BACKUP_DIR/" [ -d ~/.config/btop ] && cp -r ~/.config/btop "$BACKUP_DIR/" [ -d ~/.config/htop ] && cp -r ~/.config/htop "$BACKUP_DIR/" [ -d ~/.config/yabai ] && cp -r ~/.config/yabai "$BACKUP_DIR/" @@ -220,7 +220,7 @@ install_core_tools() { install_package fd install_package bat install_package btop - install_package neofetch + install_package fastfetch install_package tmux # Development @@ -252,7 +252,7 @@ install_core_tools() { # Install via yay yay -S --noconfirm \ - git neovim fish starship fzf ripgrep fd bat btop neofetch tmux \ + git neovim fish starship fzf ripgrep fd bat btop fastfetch tmux \ go python mise \ ghostty direnv lazygit ;; @@ -264,7 +264,7 @@ install_core_tools() { install_package ripgrep install_package fd-find install_package bat - install_package neofetch + install_package fastfetch install_package tmux # Neovim (from source if needed) @@ -387,10 +387,10 @@ setup_other_configs() { # Starship ln -sf "$DOTFILES_DIR/.config/starship.toml" ~/.config/starship.toml - # Neofetch - if [ -d "$DOTFILES_DIR/.config/neofetch" ]; then - rm -rf ~/.config/neofetch - ln -sf "$DOTFILES_DIR/.config/neofetch" ~/.config/neofetch + # Fastfetch + if [ -d "$DOTFILES_DIR/.config/fastfetch" ]; then + rm -rf ~/.config/fastfetch + ln -sf "$DOTFILES_DIR/.config/fastfetch" ~/.config/fastfetch fi # Btop