adding files from laptop and tower computer
This commit is contained in:
parent
f56989c768
commit
93af88ec8a
18
laptop/.nanorc
Normal file
18
laptop/.nanorc
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Syntax highlighting (many languages supported)
|
||||||
|
include /usr/share/nano/*.nanorc
|
||||||
|
|
||||||
|
# Custom colors
|
||||||
|
set titlecolor brightwhite,blue
|
||||||
|
set statuscolor black,green
|
||||||
|
set errorcolor brightwhite,red
|
||||||
|
set selectedcolor brightwhite,magenta
|
||||||
|
set numbercolor cyan
|
||||||
|
set keycolor cyan
|
||||||
|
set functioncolor green
|
||||||
|
|
||||||
|
# Quality of life
|
||||||
|
set linenumbers
|
||||||
|
set mouse
|
||||||
|
# set smooth
|
||||||
|
set tabsize 4
|
||||||
|
set tabstospaces
|
||||||
5
laptop/.zsh_aliases
Normal file
5
laptop/.zsh_aliases
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
alias xc='xclip -selection clipboard'
|
||||||
|
alias ll='ls -alF'
|
||||||
|
alias la='ls -la'
|
||||||
|
alias lc='linode-cli'
|
||||||
|
alias lcl='linode-cli linodes'
|
||||||
121
laptop/.zshrc
Normal file
121
laptop/.zshrc
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
HISTFILE=~/.histfile
|
||||||
|
HISTSIZE=10000
|
||||||
|
SAVEHIST=10000
|
||||||
|
setopt appendhistory sharehistory incappendhistory histignorealldups autocd extendedglob nomatch notify
|
||||||
|
bindkey -e
|
||||||
|
|
||||||
|
export COLORTERM=truecolor
|
||||||
|
fastfetch
|
||||||
|
|
||||||
|
eval "$(direnv hook zsh)"
|
||||||
|
if [[ -z "$ZELLIJ" && "$TERM" == "xterm-ghostty" ]]; then
|
||||||
|
zellij attach --create default
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# History search with up/down arrows (like Fish!)
|
||||||
|
autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
|
||||||
|
zle -N up-line-or-beginning-search
|
||||||
|
zle -N down-line-or-beginning-search
|
||||||
|
bindkey "^[[A" up-line-or-beginning-search
|
||||||
|
bindkey "^[[B" down-line-or-beginning-search
|
||||||
|
|
||||||
|
zstyle :compinstall filename '/home/travis/.zshrc'
|
||||||
|
autoload -Uz compinit
|
||||||
|
compinit
|
||||||
|
|
||||||
|
# Completion styling
|
||||||
|
zstyle ':completion:*' menu select
|
||||||
|
zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' # Case insensitive
|
||||||
|
zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}" # Color files like ls
|
||||||
|
zstyle ':completion:*:descriptions' format '%F{blue}-- %d --%f'
|
||||||
|
zstyle ':completion:*:warnings' format '%F{red}-- no matches found --%f'
|
||||||
|
zstyle ':completion:*:messages' format '%F{magenta}-- %d --%f'
|
||||||
|
zstyle ':completion:*:corrections' format '%F{yellow}-- %d (errors: %e) --%f'
|
||||||
|
zstyle ':completion:*' group-name '' # Group results by category
|
||||||
|
|
||||||
|
PROMPT_THEME="${PROMPT_THEME:-starship}"
|
||||||
|
|
||||||
|
if [[ "$PROMPT_THEME" == "p10k" ]]; then
|
||||||
|
|
||||||
|
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
|
||||||
|
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Use powerline
|
||||||
|
USE_POWERLINE="true"
|
||||||
|
# Has weird character width
|
||||||
|
# Example:
|
||||||
|
# is not a diamond
|
||||||
|
HAS_WIDECHARS="false"
|
||||||
|
# Source manjaro-zsh-configuration
|
||||||
|
if [[ -e /usr/share/zsh/manjaro-zsh-config ]]; then
|
||||||
|
source /usr/share/zsh/manjaro-zsh-config
|
||||||
|
fi
|
||||||
|
# Use manjaro zsh prompt
|
||||||
|
if [[ -e /usr/share/zsh/manjaro-zsh-prompt ]]; then
|
||||||
|
source /usr/share/zsh/manjaro-zsh-prompt
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
source ~/.p10k.zsh
|
||||||
|
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||||
|
else
|
||||||
|
TRANSIENT_PROMPT_TRANSIENT_PROMPT='%F{blue}λ:%f '
|
||||||
|
TRANSIENT_PROMPT_TRANSIENT_RPROMPT=''
|
||||||
|
eval "$(starship init zsh)"
|
||||||
|
SPACESHIP_EXEC_TIME_ELAPSED=.01
|
||||||
|
source ~/.zsh/zsh-transient-prompt/transient-prompt.zsh-theme
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Other init
|
||||||
|
eval "$(zoxide init zsh)"
|
||||||
|
|
||||||
|
|
||||||
|
source ~/.zsh/zsh-transient-prompt/transient-prompt.zsh-theme
|
||||||
|
source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||||
|
source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
||||||
|
fpath=(~/.zsh/zsh-completions/src $fpath)
|
||||||
|
|
||||||
|
source /usr/share/fzf/key-bindings.zsh
|
||||||
|
source /usr/share/fzf/completion.zsh
|
||||||
|
|
||||||
|
if [ -f ~/.zsh_aliases ]; then
|
||||||
|
source ~/.zsh_aliases
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Quick alias management
|
||||||
|
addalias() {
|
||||||
|
echo "alias $1='$2'" >> ~/.zsh_aliases
|
||||||
|
source ~/.zsh_aliases
|
||||||
|
echo "✅ Added: $1"
|
||||||
|
}
|
||||||
|
|
||||||
|
listalias() {
|
||||||
|
cat ~/.zsh_aliases
|
||||||
|
}
|
||||||
|
|
||||||
|
alias xc='xclip -selection clipboard'
|
||||||
|
alias ls='eza --icons'
|
||||||
|
alias ll='eza -lah --icons'
|
||||||
|
alias cat='bat'
|
||||||
|
alias cd='z'
|
||||||
|
alias nano='micro'
|
||||||
|
alias onano='nano'
|
||||||
|
|
||||||
|
alias dps='docker ps --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}"'
|
||||||
|
alias dlog='docker logs -f'
|
||||||
|
alias dcup='docker compose up -d'
|
||||||
|
alias dcdown='docker compose down'
|
||||||
|
|
||||||
|
alias ap='ansible-playbook'
|
||||||
|
alias av='ansible-vault'
|
||||||
|
|
||||||
|
alias pysync='uv sync'
|
||||||
|
alias pyrun='uv run'
|
||||||
|
alias pyshell='uv run ipython'
|
||||||
|
eval "$(fnm env --use-on-cd)"
|
||||||
|
|
||||||
|
bindkey "^[[1;5C" forward-word
|
||||||
|
bindkey "^[[1;5D" backward-word
|
||||||
|
bindkey "^H" backward-delete-word
|
||||||
51
laptop/fastfetch/config.jsonc
Normal file
51
laptop/fastfetch/config.jsonc
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
|
||||||
|
"logo": {
|
||||||
|
"type": "auto",
|
||||||
|
"color": {
|
||||||
|
"1": "magenta",
|
||||||
|
"2": "blue"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"display": {
|
||||||
|
"separator": " ➜ ",
|
||||||
|
"color": {
|
||||||
|
"separator": "green",
|
||||||
|
"keys": "blue",
|
||||||
|
"title": "magenta"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"modules": [
|
||||||
|
{
|
||||||
|
"type": "title",
|
||||||
|
"color": {
|
||||||
|
"user": "magenta",
|
||||||
|
"at": "white",
|
||||||
|
"host": "blue"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"separator",
|
||||||
|
"os",
|
||||||
|
"host",
|
||||||
|
"kernel",
|
||||||
|
"uptime",
|
||||||
|
"packages",
|
||||||
|
"shell",
|
||||||
|
"terminal",
|
||||||
|
"de",
|
||||||
|
"wm",
|
||||||
|
"theme",
|
||||||
|
"icons",
|
||||||
|
"font",
|
||||||
|
"cursor",
|
||||||
|
"cpu",
|
||||||
|
"gpu",
|
||||||
|
"memory",
|
||||||
|
"disk",
|
||||||
|
"localip",
|
||||||
|
"battery",
|
||||||
|
"locale",
|
||||||
|
"break",
|
||||||
|
"colors"
|
||||||
|
]
|
||||||
|
}
|
||||||
1
laptop/ghostty/auto/theme.ghostty
Normal file
1
laptop/ghostty/auto/theme.ghostty
Normal file
@ -0,0 +1 @@
|
|||||||
|
theme = TokyoNight
|
||||||
8
laptop/ghostty/config
Normal file
8
laptop/ghostty/config
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
font-family = JetBrains Mono
|
||||||
|
font-size = 13
|
||||||
|
theme = TokyoNight
|
||||||
|
window-padding-x = 8
|
||||||
|
window-padding-y = 8
|
||||||
|
copy-on-select = clipboard
|
||||||
|
clipboard-read = allow
|
||||||
|
clipboard-write = allow
|
||||||
188
laptop/starship.toml
Normal file
188
laptop/starship.toml
Normal file
@ -0,0 +1,188 @@
|
|||||||
|
# ~/.config/starship.toml
|
||||||
|
|
||||||
|
# --- 1. THE ASSEMBLY LINE ---
|
||||||
|
format = """
|
||||||
|
[╭─](white)[ ](bg:#9A348E)\
|
||||||
|
$os\
|
||||||
|
[](fg:#9A348E bg:#0087FF)\
|
||||||
|
$directory\
|
||||||
|
[](fg:#0087FF bg:#00D700)\
|
||||||
|
$git_branch\
|
||||||
|
$git_commit\
|
||||||
|
$git_state\
|
||||||
|
$git_status\
|
||||||
|
[](fg:#00D700)\
|
||||||
|
$fill\
|
||||||
|
[](fg:#86BBD8)\
|
||||||
|
$python\
|
||||||
|
$nodejs\
|
||||||
|
$rust\
|
||||||
|
$golang\
|
||||||
|
$java\
|
||||||
|
$scala\
|
||||||
|
[](fg:#06969A bg:#86BBD8)\
|
||||||
|
$docker_context\
|
||||||
|
[](fg:#33658A bg:#06969A)\
|
||||||
|
$time\
|
||||||
|
[ ](bg:#33658A)\
|
||||||
|
$status\
|
||||||
|
$line_break\
|
||||||
|
$character\
|
||||||
|
"""
|
||||||
|
|
||||||
|
# --- 2. PART DEFINITIONS ---
|
||||||
|
[fill]
|
||||||
|
symbol = " "
|
||||||
|
|
||||||
|
# OS Module (Purple Block)
|
||||||
|
[os]
|
||||||
|
disabled = false
|
||||||
|
style = "fg:#ffffff bg:#9A348E"
|
||||||
|
format = '[$symbol]($style)'
|
||||||
|
|
||||||
|
[os.symbols]
|
||||||
|
Windows = " "
|
||||||
|
Macos = " "
|
||||||
|
Linux = " "
|
||||||
|
Arch = " "
|
||||||
|
Ubuntu = " "
|
||||||
|
Fedora = " "
|
||||||
|
Debian = " "
|
||||||
|
Mint = " "
|
||||||
|
# UPDATED: Correct Manjaro logo
|
||||||
|
Manjaro = " "
|
||||||
|
|
||||||
|
# Directory Module (Blue Block)
|
||||||
|
[directory]
|
||||||
|
style = "fg:#ffffff bg:#0087FF"
|
||||||
|
format = '[ $path ]($style)'
|
||||||
|
truncation_length = 3
|
||||||
|
truncation_symbol = "…/"
|
||||||
|
|
||||||
|
# Git Branch Module (Green Block)
|
||||||
|
[git_branch]
|
||||||
|
symbol = " "
|
||||||
|
style = "fg:#000000 bg:#00D700"
|
||||||
|
format = '[ $symbol$branch(:$remote_branch) ]($style)'
|
||||||
|
truncation_length = 20
|
||||||
|
truncation_symbol = "…"
|
||||||
|
|
||||||
|
# Git Status Module (detailed status)
|
||||||
|
[git_status]
|
||||||
|
style = "fg:#000000 bg:#00D700"
|
||||||
|
format = '[$all_status$ahead_behind ]($style)'
|
||||||
|
conflicted = "⚔️ "
|
||||||
|
ahead = "⇡${count} "
|
||||||
|
behind = "⇣${count} "
|
||||||
|
diverged = "⇕⇡${ahead_count}⇣${behind_count} "
|
||||||
|
untracked = "?${count} "
|
||||||
|
stashed = "📦${count} "
|
||||||
|
modified = "!${count} "
|
||||||
|
staged = "+${count} "
|
||||||
|
renamed = "»${count} "
|
||||||
|
deleted = "✘${count} "
|
||||||
|
|
||||||
|
# Git Commit (shows current commit)
|
||||||
|
[git_commit]
|
||||||
|
style = "fg:#000000 bg:#00D700"
|
||||||
|
format = '[ #$hash$tag ]($style)'
|
||||||
|
commit_hash_length = 7
|
||||||
|
only_detached = true
|
||||||
|
|
||||||
|
# Git State (rebase, merge, etc)
|
||||||
|
[git_state]
|
||||||
|
style = "fg:#ffffff bg:#FF0000"
|
||||||
|
format = '[\($state( $progress_current/$progress_total)\)]($style)'
|
||||||
|
rebase = "REBASING"
|
||||||
|
merge = "MERGING"
|
||||||
|
revert = "REVERTING"
|
||||||
|
cherry_pick = "CHERRY-PICKING"
|
||||||
|
bisect = "BISECTING"
|
||||||
|
am = "AM"
|
||||||
|
am_or_rebase = "AM/REBASE"
|
||||||
|
|
||||||
|
[python]
|
||||||
|
# UPDATED: Switched from emoji to Nerd Font
|
||||||
|
symbol = " "
|
||||||
|
style = "fg:#000000 bg:#86BBD8"
|
||||||
|
format = '[ $symbol($virtualenv )($version) ](fg:#000000 bg:#86BBD8)'
|
||||||
|
|
||||||
|
[golang]
|
||||||
|
symbol = " "
|
||||||
|
style = "fg:#000000 bg:#86BBD8"
|
||||||
|
format = '[ $symbol($version) ](fg:#000000 bg:#86BBD8)'
|
||||||
|
|
||||||
|
[gradle]
|
||||||
|
style = "bg:#86BBD8"
|
||||||
|
format = '[ $symbol ($version) ]($style)'
|
||||||
|
|
||||||
|
[haskell]
|
||||||
|
symbol = " "
|
||||||
|
style = "bg:#86BBD8"
|
||||||
|
format = '[ $symbol ($version) ]($style)'
|
||||||
|
|
||||||
|
[java]
|
||||||
|
symbol = " "
|
||||||
|
style = "fg:#000000 bg:#86BBD8"
|
||||||
|
format = '[ $symbol($version) ](fg:#000000 bg:#86BBD8)'
|
||||||
|
|
||||||
|
[julia]
|
||||||
|
symbol = " "
|
||||||
|
style = "bg:#86BBD8"
|
||||||
|
format = '[ $symbol ($version) ]($style)'
|
||||||
|
|
||||||
|
[nodejs]
|
||||||
|
symbol = " "
|
||||||
|
style = "fg:#000000 bg:#86BBD8"
|
||||||
|
format = '[ $symbol($version) ](fg:#000000 bg:#86BBD8)'
|
||||||
|
|
||||||
|
[nim]
|
||||||
|
symbol = " "
|
||||||
|
style = "bg:#86BBD8"
|
||||||
|
format = '[ $symbol ($version) ]($style)'
|
||||||
|
|
||||||
|
[rust]
|
||||||
|
symbol = " "
|
||||||
|
style = "fg:#000000 bg:#86BBD8"
|
||||||
|
format = '[ $symbol($version) ](fg:#000000 bg:#86BBD8)'
|
||||||
|
|
||||||
|
[scala]
|
||||||
|
symbol = " "
|
||||||
|
style = "fg:#000000 bg:#86BBD8"
|
||||||
|
format = '[ $symbol($version) ](fg:#000000 bg:#86BBD8)'
|
||||||
|
|
||||||
|
[docker_context]
|
||||||
|
# UPDATED: Added standard Docker icon
|
||||||
|
symbol = " "
|
||||||
|
style = "fg:#ffffff bg:#06969A"
|
||||||
|
#format = 'via [🐋 $context](blue bold)'
|
||||||
|
format = '[ $symbol$context ](fg:#ffffff bg:#06969A)'
|
||||||
|
#format = "via [⬢ $context](bold blue) "
|
||||||
|
#detect_files = ["Dockerfile", "docker-compose.yml", ".dockerenv"]
|
||||||
|
#disabled = false
|
||||||
|
|
||||||
|
#[docker_context]
|
||||||
|
#format = 'via [🐋 $context](blue bold)'
|
||||||
|
|
||||||
|
|
||||||
|
[time]
|
||||||
|
disabled = false
|
||||||
|
time_format = "%R"
|
||||||
|
style = "fg:#FFFFFF bg:#33658A"
|
||||||
|
format = '[ $time ]($style)'
|
||||||
|
|
||||||
|
[status]
|
||||||
|
disabled = false
|
||||||
|
style = "(fg:#ffffff bg:#FF0000)"
|
||||||
|
format = '[](fg:#FF0000 bg:#33658A)[ ✘ $status ](fg:#ffffff bg:#FF0000)'
|
||||||
|
|
||||||
|
|
||||||
|
# The Prompt Arrow
|
||||||
|
[character]
|
||||||
|
success_symbol = '[╰─](white) '
|
||||||
|
error_symbol = '[╰─](white) '
|
||||||
|
|
||||||
|
#[status]
|
||||||
|
#disabled = false
|
||||||
|
#style = "(fg:#ffffff bg:#FF0000)"
|
||||||
|
#format = '[](fg:#FF0000 bg:#33658A)[ ✘ $status ]($style)'
|
||||||
63
laptop/zellij/config.kdl
Normal file
63
laptop/zellij/config.kdl
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
//theme "catppuccin-mocha"
|
||||||
|
//theme "tokyo-night"
|
||||||
|
themes {
|
||||||
|
tokyo-night-custom {
|
||||||
|
fg "#a9b1d6"
|
||||||
|
bg "#1a1b26"
|
||||||
|
black "#32344a"
|
||||||
|
red "#f7768e"
|
||||||
|
green "#ad8ee6"
|
||||||
|
yellow "#e0af68"
|
||||||
|
blue "#7aa2f7"
|
||||||
|
magenta "#ad8ee6"
|
||||||
|
cyan "#449dab"
|
||||||
|
white "#787c99"
|
||||||
|
orange "#ff9e64"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
theme "tokyo-night-custom"
|
||||||
|
|
||||||
|
default_shell "zsh"
|
||||||
|
// Copy behavior
|
||||||
|
copy_on_select true
|
||||||
|
|
||||||
|
// Scrollback buffer (lines per pane)
|
||||||
|
scroll_buffer_size 50000
|
||||||
|
|
||||||
|
// Mouse support
|
||||||
|
mouse_mode true
|
||||||
|
|
||||||
|
simplified_ui false
|
||||||
|
|
||||||
|
// Mirror session (all connected clients see the same view)
|
||||||
|
mirror_session true
|
||||||
|
|
||||||
|
// Pane frames (borders around panes)
|
||||||
|
pane_frames true
|
||||||
|
|
||||||
|
// Auto-create layouts directory
|
||||||
|
auto_layout true
|
||||||
|
|
||||||
|
// Session serialization (persist layout on exit)
|
||||||
|
session_serialization true
|
||||||
|
|
||||||
|
// Idle timeout for status bar hints (milliseconds)
|
||||||
|
scrollback_lines_to_serialize 10000
|
||||||
|
|
||||||
|
keybinds {
|
||||||
|
shared {
|
||||||
|
unbind "Ctrl p" "Ctrl t" "Ctrl n" "Ctrl h" "Ctrl s" "Ctrl o" "Ctrl q" "Ctrl g"
|
||||||
|
bind "Alt p" { SwitchToMode "pane"; }
|
||||||
|
bind "Alt t" { SwitchToMode "tab"; }
|
||||||
|
bind "Alt n" { SwitchToMode "resize"; }
|
||||||
|
bind "Alt h" { SwitchToMode "move"; }
|
||||||
|
bind "Alt s" { SwitchToMode "scroll"; }
|
||||||
|
bind "Alt o" { SwitchToMode "session"; }
|
||||||
|
bind "Alt q" { Quit; }
|
||||||
|
bind "Alt g" { SwitchToMode "locked"; }
|
||||||
|
}
|
||||||
|
locked {
|
||||||
|
unbind "Ctrl g"
|
||||||
|
bind "Alt g" { SwitchToMode "normal"; }
|
||||||
|
}
|
||||||
|
}
|
||||||
143
manjaro/.zshrc
Normal file
143
manjaro/.zshrc
Normal file
@ -0,0 +1,143 @@
|
|||||||
|
HISTFILE=~/.histfile
|
||||||
|
HISTSIZE=10000
|
||||||
|
SAVEHIST=10000
|
||||||
|
# setopt appendhistory sharehistory incappendhistory histignorealldups autocd extendedglob nomatch notify
|
||||||
|
# History settings
|
||||||
|
setopt SHARE_HISTORY # Share history between all sessions
|
||||||
|
setopt INC_APPEND_HISTORY # Write to history file immediately
|
||||||
|
setopt HIST_IGNORE_ALL_DUPS # Don't save duplicates
|
||||||
|
|
||||||
|
# Other settings
|
||||||
|
setopt AUTO_CD # cd by typing directory name
|
||||||
|
setopt EXTENDED_GLOB # Extended globbing
|
||||||
|
setopt NOMATCH # Error on no glob match
|
||||||
|
setopt NOTIFY # Immediate job notifications
|
||||||
|
|
||||||
|
bindkey -e
|
||||||
|
|
||||||
|
export COLORTERM=truecolor
|
||||||
|
fastfetch
|
||||||
|
|
||||||
|
|
||||||
|
eval "$(direnv hook zsh)"
|
||||||
|
#pbs manager shell integration
|
||||||
|
eval "$(uv run pbs_manager shell shell-init)"
|
||||||
|
|
||||||
|
|
||||||
|
# History search with up/down arrows (like Fish!)
|
||||||
|
autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
|
||||||
|
zle -N up-line-or-beginning-search
|
||||||
|
zle -N down-line-or-beginning-search
|
||||||
|
bindkey "^[[A" up-line-or-beginning-search
|
||||||
|
bindkey "^[[B" down-line-or-beginning-search
|
||||||
|
# Ctrl+Arrow word navigation
|
||||||
|
bindkey "^[[1;5C" forward-word # Ctrl+Right
|
||||||
|
bindkey "^[[1;5D" backward-word # Ctrl+Left
|
||||||
|
bindkey "^[[1;5A" history-search-backward # Ctrl+Up (optional)
|
||||||
|
bindkey "^[[1;5B" history-search-forward # Ctrl+Down (optional)
|
||||||
|
|
||||||
|
# Ctrl+Backspace - delete word backward
|
||||||
|
bindkey "^H" backward-delete-word
|
||||||
|
|
||||||
|
zstyle :compinstall filename '/home/travis/.zshrc'
|
||||||
|
autoload -Uz compinit
|
||||||
|
compinit
|
||||||
|
|
||||||
|
# Completion styling
|
||||||
|
zstyle ':completion:*' menu select
|
||||||
|
zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' # Case insensitive
|
||||||
|
zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}" # Color files like ls
|
||||||
|
zstyle ':completion:*:descriptions' format '%F{blue}-- %d --%f'
|
||||||
|
zstyle ':completion:*:warnings' format '%F{red}-- no matches found --%f'
|
||||||
|
zstyle ':completion:*:messages' format '%F{magenta}-- %d --%f'
|
||||||
|
zstyle ':completion:*:corrections' format '%F{yellow}-- %d (errors: %e) --%f'
|
||||||
|
zstyle ':completion:*' group-name '' # Group results by category
|
||||||
|
|
||||||
|
PROMPT_THEME="${PROMPT_THEME:-starship}"
|
||||||
|
|
||||||
|
if [[ "$PROMPT_THEME" == "p10k" ]]; then
|
||||||
|
|
||||||
|
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
|
||||||
|
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Use powerline
|
||||||
|
USE_POWERLINE="true"
|
||||||
|
# Has weird character width
|
||||||
|
# Example:
|
||||||
|
# is not a diamond
|
||||||
|
HAS_WIDECHARS="false"
|
||||||
|
# Source manjaro-zsh-configuration
|
||||||
|
if [[ -e /usr/share/zsh/manjaro-zsh-config ]]; then
|
||||||
|
source /usr/share/zsh/manjaro-zsh-config
|
||||||
|
fi
|
||||||
|
# Use manjaro zsh prompt
|
||||||
|
if [[ -e /usr/share/zsh/manjaro-zsh-prompt ]]; then
|
||||||
|
source /usr/share/zsh/manjaro-zsh-prompt
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
source ~/.p10k.zsh
|
||||||
|
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||||
|
else
|
||||||
|
TRANSIENT_PROMPT_TRANSIENT_PROMPT='%F{blue}λ:%f '
|
||||||
|
TRANSIENT_PROMPT_TRANSIENT_RPROMPT=''
|
||||||
|
eval "$(starship init zsh)"
|
||||||
|
SPACESHIP_EXEC_TIME_ELAPSED=.01
|
||||||
|
source ~/.zsh/zsh-transient-prompt/transient-prompt.zsh-theme
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Other init
|
||||||
|
eval "$(zoxide init zsh)"
|
||||||
|
|
||||||
|
|
||||||
|
source ~/.zsh/zsh-transient-prompt/transient-prompt.zsh-theme
|
||||||
|
source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||||
|
source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
||||||
|
fpath=(~/.zsh/zsh-completions/src $fpath)
|
||||||
|
|
||||||
|
source /usr/share/fzf/key-bindings.zsh
|
||||||
|
source /usr/share/fzf/completion.zsh
|
||||||
|
|
||||||
|
if [ -f ~/.zsh_aliases ]; then
|
||||||
|
source ~/.zsh_aliases
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Quick alias management
|
||||||
|
addalias() {
|
||||||
|
echo "alias $1='$2'" >> ~/.zsh_aliases
|
||||||
|
source ~/.zsh_aliases
|
||||||
|
echo "✅ Added: $1"
|
||||||
|
}
|
||||||
|
|
||||||
|
listalias() {
|
||||||
|
cat ~/.zsh_aliases
|
||||||
|
}
|
||||||
|
|
||||||
|
alias xc='xclip -selection clipboard'
|
||||||
|
alias ls='eza --icons'
|
||||||
|
alias ll='eza -lah --icons'
|
||||||
|
alias cat='bat'
|
||||||
|
alias cd='z'
|
||||||
|
|
||||||
|
alias dps='docker ps --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}"'
|
||||||
|
alias dlog='docker logs -f'
|
||||||
|
alias dcup='docker compose up -d'
|
||||||
|
alias dcdown='docker compose down'
|
||||||
|
|
||||||
|
alias ap='ansible-playbook'
|
||||||
|
alias av='ansible-vault'
|
||||||
|
|
||||||
|
alias pysync='uv sync'
|
||||||
|
alias pyrun='uv run'
|
||||||
|
alias pyshell='uv run ipython'
|
||||||
|
# Aliases for fastfetch
|
||||||
|
alias fetch='fastfetch'
|
||||||
|
alias neofetch='fastfetch'
|
||||||
|
|
||||||
|
#google cloud
|
||||||
|
export GOOGLE_CLOUD_PROJECT="pbs-site-486819"
|
||||||
|
|
||||||
|
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
|
||||||
1
manjaro/arch_custom
Submodule
1
manjaro/arch_custom
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 6c9df464ed8aea84a40817723da38ebcb9917605
|
||||||
51
manjaro/fastfetch/config.jsonc
Normal file
51
manjaro/fastfetch/config.jsonc
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
|
||||||
|
"logo": {
|
||||||
|
"type": "auto",
|
||||||
|
"color": {
|
||||||
|
"1": "magenta",
|
||||||
|
"2": "blue"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"display": {
|
||||||
|
"separator": " ➜ ",
|
||||||
|
"color": {
|
||||||
|
"separator": "green",
|
||||||
|
"keys": "blue",
|
||||||
|
"title": "magenta"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"modules": [
|
||||||
|
{
|
||||||
|
"type": "title",
|
||||||
|
"color": {
|
||||||
|
"user": "magenta",
|
||||||
|
"at": "white",
|
||||||
|
"host": "blue"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"separator",
|
||||||
|
"os",
|
||||||
|
"host",
|
||||||
|
"kernel",
|
||||||
|
"uptime",
|
||||||
|
"packages",
|
||||||
|
"shell",
|
||||||
|
"terminal",
|
||||||
|
"de",
|
||||||
|
"wm",
|
||||||
|
"theme",
|
||||||
|
"icons",
|
||||||
|
"font",
|
||||||
|
"cursor",
|
||||||
|
"cpu",
|
||||||
|
"gpu",
|
||||||
|
"memory",
|
||||||
|
"disk",
|
||||||
|
"localip",
|
||||||
|
"battery",
|
||||||
|
"locale",
|
||||||
|
"break",
|
||||||
|
"colors"
|
||||||
|
]
|
||||||
|
}
|
||||||
1
manjaro/manjaro-laptop
Submodule
1
manjaro/manjaro-laptop
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 81afa59a5ac7aea580db01186dc8f3de9cf997d6
|
||||||
188
manjaro/starship.toml
Normal file
188
manjaro/starship.toml
Normal file
@ -0,0 +1,188 @@
|
|||||||
|
# ~/.config/starship.toml
|
||||||
|
|
||||||
|
# --- 1. THE ASSEMBLY LINE ---
|
||||||
|
format = """
|
||||||
|
[╭─](white)[ ](bg:#9A348E)\
|
||||||
|
$os\
|
||||||
|
[](fg:#9A348E bg:#0087FF)\
|
||||||
|
$directory\
|
||||||
|
[](fg:#0087FF bg:#00D700)\
|
||||||
|
$git_branch\
|
||||||
|
$git_commit\
|
||||||
|
$git_state\
|
||||||
|
$git_status\
|
||||||
|
[](fg:#00D700)\
|
||||||
|
$fill\
|
||||||
|
[](fg:#86BBD8)\
|
||||||
|
$python\
|
||||||
|
$nodejs\
|
||||||
|
$rust\
|
||||||
|
$golang\
|
||||||
|
$java\
|
||||||
|
$scala\
|
||||||
|
[](fg:#06969A bg:#86BBD8)\
|
||||||
|
$docker_context\
|
||||||
|
[](fg:#33658A bg:#06969A)\
|
||||||
|
$time\
|
||||||
|
[ ](bg:#33658A)\
|
||||||
|
$status\
|
||||||
|
$line_break\
|
||||||
|
$character\
|
||||||
|
"""
|
||||||
|
|
||||||
|
# --- 2. PART DEFINITIONS ---
|
||||||
|
[fill]
|
||||||
|
symbol = " "
|
||||||
|
|
||||||
|
# OS Module (Purple Block)
|
||||||
|
[os]
|
||||||
|
disabled = false
|
||||||
|
style = "fg:#ffffff bg:#9A348E"
|
||||||
|
format = '[$symbol]($style)'
|
||||||
|
|
||||||
|
[os.symbols]
|
||||||
|
Windows = " "
|
||||||
|
Macos = " "
|
||||||
|
Linux = " "
|
||||||
|
Arch = " "
|
||||||
|
Ubuntu = " "
|
||||||
|
Fedora = " "
|
||||||
|
Debian = " "
|
||||||
|
Mint = " "
|
||||||
|
# UPDATED: Correct Manjaro logo
|
||||||
|
Manjaro = " "
|
||||||
|
|
||||||
|
# Directory Module (Blue Block)
|
||||||
|
[directory]
|
||||||
|
style = "fg:#ffffff bg:#0087FF"
|
||||||
|
format = '[ $path ]($style)'
|
||||||
|
truncation_length = 3
|
||||||
|
truncation_symbol = "…/"
|
||||||
|
|
||||||
|
# Git Branch Module (Green Block)
|
||||||
|
[git_branch]
|
||||||
|
symbol = " "
|
||||||
|
style = "fg:#000000 bg:#00D700"
|
||||||
|
format = '[ $symbol$branch(:$remote_branch) ]($style)'
|
||||||
|
truncation_length = 20
|
||||||
|
truncation_symbol = "…"
|
||||||
|
|
||||||
|
# Git Status Module (detailed status)
|
||||||
|
[git_status]
|
||||||
|
style = "fg:#000000 bg:#00D700"
|
||||||
|
format = '[$all_status$ahead_behind ]($style)'
|
||||||
|
conflicted = "⚔️ "
|
||||||
|
ahead = "⇡${count} "
|
||||||
|
behind = "⇣${count} "
|
||||||
|
diverged = "⇕⇡${ahead_count}⇣${behind_count} "
|
||||||
|
untracked = "?${count} "
|
||||||
|
stashed = "📦${count} "
|
||||||
|
modified = "!${count} "
|
||||||
|
staged = "+${count} "
|
||||||
|
renamed = "»${count} "
|
||||||
|
deleted = "✘${count} "
|
||||||
|
|
||||||
|
# Git Commit (shows current commit)
|
||||||
|
[git_commit]
|
||||||
|
style = "fg:#000000 bg:#00D700"
|
||||||
|
format = '[ #$hash$tag ]($style)'
|
||||||
|
commit_hash_length = 7
|
||||||
|
only_detached = true
|
||||||
|
|
||||||
|
# Git State (rebase, merge, etc)
|
||||||
|
[git_state]
|
||||||
|
style = "fg:#ffffff bg:#FF0000"
|
||||||
|
format = '[\($state( $progress_current/$progress_total)\)]($style)'
|
||||||
|
rebase = "REBASING"
|
||||||
|
merge = "MERGING"
|
||||||
|
revert = "REVERTING"
|
||||||
|
cherry_pick = "CHERRY-PICKING"
|
||||||
|
bisect = "BISECTING"
|
||||||
|
am = "AM"
|
||||||
|
am_or_rebase = "AM/REBASE"
|
||||||
|
|
||||||
|
[python]
|
||||||
|
# UPDATED: Switched from emoji to Nerd Font
|
||||||
|
symbol = " "
|
||||||
|
style = "fg:#000000 bg:#86BBD8"
|
||||||
|
format = '[ $symbol($virtualenv )($version) ](fg:#000000 bg:#86BBD8)'
|
||||||
|
|
||||||
|
[golang]
|
||||||
|
symbol = " "
|
||||||
|
style = "fg:#000000 bg:#86BBD8"
|
||||||
|
format = '[ $symbol($version) ](fg:#000000 bg:#86BBD8)'
|
||||||
|
|
||||||
|
[gradle]
|
||||||
|
style = "bg:#86BBD8"
|
||||||
|
format = '[ $symbol ($version) ]($style)'
|
||||||
|
|
||||||
|
[haskell]
|
||||||
|
symbol = " "
|
||||||
|
style = "bg:#86BBD8"
|
||||||
|
format = '[ $symbol ($version) ]($style)'
|
||||||
|
|
||||||
|
[java]
|
||||||
|
symbol = " "
|
||||||
|
style = "fg:#000000 bg:#86BBD8"
|
||||||
|
format = '[ $symbol($version) ](fg:#000000 bg:#86BBD8)'
|
||||||
|
|
||||||
|
[julia]
|
||||||
|
symbol = " "
|
||||||
|
style = "bg:#86BBD8"
|
||||||
|
format = '[ $symbol ($version) ]($style)'
|
||||||
|
|
||||||
|
[nodejs]
|
||||||
|
symbol = " "
|
||||||
|
style = "fg:#000000 bg:#86BBD8"
|
||||||
|
format = '[ $symbol($version) ](fg:#000000 bg:#86BBD8)'
|
||||||
|
|
||||||
|
[nim]
|
||||||
|
symbol = " "
|
||||||
|
style = "bg:#86BBD8"
|
||||||
|
format = '[ $symbol ($version) ]($style)'
|
||||||
|
|
||||||
|
[rust]
|
||||||
|
symbol = " "
|
||||||
|
style = "fg:#000000 bg:#86BBD8"
|
||||||
|
format = '[ $symbol($version) ](fg:#000000 bg:#86BBD8)'
|
||||||
|
|
||||||
|
[scala]
|
||||||
|
symbol = " "
|
||||||
|
style = "fg:#000000 bg:#86BBD8"
|
||||||
|
format = '[ $symbol($version) ](fg:#000000 bg:#86BBD8)'
|
||||||
|
|
||||||
|
[docker_context]
|
||||||
|
# UPDATED: Added standard Docker icon
|
||||||
|
symbol = " "
|
||||||
|
style = "fg:#ffffff bg:#06969A"
|
||||||
|
#format = 'via [🐋 $context](blue bold)'
|
||||||
|
format = '[ $symbol$context ](fg:#ffffff bg:#06969A)'
|
||||||
|
#format = "via [⬢ $context](bold blue) "
|
||||||
|
#detect_files = ["Dockerfile", "docker-compose.yml", ".dockerenv"]
|
||||||
|
#disabled = false
|
||||||
|
|
||||||
|
#[docker_context]
|
||||||
|
#format = 'via [🐋 $context](blue bold)'
|
||||||
|
|
||||||
|
|
||||||
|
[time]
|
||||||
|
disabled = false
|
||||||
|
time_format = "%R"
|
||||||
|
style = "fg:#FFFFFF bg:#33658A"
|
||||||
|
format = '[ $time ]($style)'
|
||||||
|
|
||||||
|
[status]
|
||||||
|
disabled = false
|
||||||
|
style = "(fg:#ffffff bg:#FF0000)"
|
||||||
|
format = '[](fg:#FF0000 bg:#33658A)[ ✘ $status ](fg:#ffffff bg:#FF0000)'
|
||||||
|
|
||||||
|
|
||||||
|
# The Prompt Arrow
|
||||||
|
[character]
|
||||||
|
success_symbol = '[╰─](white) '
|
||||||
|
error_symbol = '[╰─](white) '
|
||||||
|
|
||||||
|
#[status]
|
||||||
|
#disabled = false
|
||||||
|
#style = "(fg:#ffffff bg:#FF0000)"
|
||||||
|
#format = '[](fg:#FF0000 bg:#33658A)[ ✘ $status ]($style)'
|
||||||
Loading…
Reference in New Issue
Block a user