diff --git a/copy/sshconfig b/copy/sshconfig deleted file mode 100644 index e1b6a7f..0000000 --- a/copy/sshconfig +++ /dev/null @@ -1,7 +0,0 @@ -Host * - AddressFamily inet - ServerAliveInterval 300 - ServerAliveCountMax 2 - -Host pxm - HostName pxm.eeleater.org diff --git a/install b/install index 47997d2..b088731 100755 --- a/install +++ b/install @@ -1,21 +1,3 @@ #!/bin/bash -[[ $1 == "copy" ]] && { - echo ">>> Copying .zshenv - Please Wait! <<<" - cp ${HOME}/.config/dotfiles/copy/zshenv ${HOME}/.zshenv -} - -[[ $1 == "clone" ]] && { - echo ">>> Cloning needed Repos - Please Wait! <<<" - mkdir -p zsh/plugins - [ -d "$HOME/.config/dotfiles/zsh/plugins/fzfasd/.git" ] || git clone https://github.com/wookayin/fzf-fasd.git ~/.config/dotfiles/zsh/plugins/fzfasd - [ -d "$HOME/.config/dotfiles/zsh/plugins/syntax/.git" ] || git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.config/dotfiles/zsh/plugins/syntax - [ -d "$HOME/.config/dotfiles/zsh/plugins/suggestions/.git" ] || git clone https://github.com/zsh-users/zsh-autosuggestions.git ~/.config/dotfiles/zsh/plugins/suggestions - [ -d "$HOME/.config/dotfiles/zsh/plugins/completions/.git" ] || git clone https://github.com/zsh-users/zsh-completions.git ~/.config/dotfiles/zsh/plugins/completions - [ -d "$HOME/.config/dotfiles/zsh/plugins/fzfmarks/.git" ] || git clone https://github.com/urbainvaes/fzf-marks.git ~/.config/dotfiles/zsh/plugins/fzfmarks - [ -d "$HOME/.config/dotfiles/zsh/plugins/gitignore/.git" ] || git clone https://github.com/voronkovich/gitignore.plugin.zsh.git ~/.config/dotfiles/zsh/plugins/gitignore - [ -d "$HOME/.config/dotfiles/zsh/plugins/jq/.git" ] || git clone https://github.com/reegnz/jq-zsh-plugin.git ~/.config/dotfiles/zsh/plugins/jq - [ -d "$HOME/.config/dotfiles/zsh/plugins/asdf/.git" ] || git clone https://github.com/asdf-vm/asdf.git ~/.config/dotfiles/zsh/plugins/asdf - [ -d "$HOME/.config/dotfiles/zsh/plugins/fzftab/.git" ] || git clone https://github.com/Aloxaf/fzf-tab.git ~/.config/dotfiles/zsh/plugins/fzftab -} - -[[ $1 == "" ]] && echo ">>> Use either 'copy' to copy files or 'clone' to clone needed plugins <<<" +echo ">>> Copying .zshenv - Please Wait! <<<" +cp ${HOME}/.config/dotfiles/copy/zshenv ${HOME}/.zshenv diff --git a/zsh/.p10k.zsh b/zsh/.p10k.zsh index f0d8719..56c3bf9 100644 --- a/zsh/.p10k.zsh +++ b/zsh/.p10k.zsh @@ -39,12 +39,12 @@ # Prompt colors. local grey='242' - local red='1' - local yellow='3' - local blue='4' - local magenta='5' - local cyan='6' - local white='7' + local red='#FF5C57' + local yellow='#F3F99D' + local blue='#57C7FF' + local magenta='#FF6AC1' + local cyan='#9AEDFE' + local white='#F1F1F0' # Left prompt segments. typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=( @@ -52,7 +52,6 @@ # context # user@host dir # current directory vcs # git status - # command_execution_time # previous command duration # =========================[ Line #2 ]========================= newline # \n # virtualenv # python virtual environment diff --git a/zsh/files/aliases.zsh b/zsh/files/aliases.zsh index 27af668..cdc31f1 100644 --- a/zsh/files/aliases.zsh +++ b/zsh/files/aliases.zsh @@ -4,6 +4,10 @@ alias rm='rm -i' alias cp='cp -i' alias mv='mv -i' +alias psg='ps aux | grep -v grep | grep' +alias duplHostKeys='cat $HOME/.ssh/known_hosts | cut -d" " -f3 | sort | uniq -d' +alias has="curl -sL https://git.io/_has | bash -s" + alias sc-status="sudo systemctl status" alias sc-start="sudo systemctl start" alias sc-stop="sudo systemctl stop" diff --git a/zsh/files/direnv.zsh b/zsh/files/direnv.zsh index dd6f7ba..2d51151 100644 --- a/zsh/files/direnv.zsh +++ b/zsh/files/direnv.zsh @@ -36,6 +36,9 @@ _zsh_direnv_download_install() { i686 | i386) machine=386 ;; + aarch64) + machine=arm64 + ;; *) _zsh_direnv_log $BOLD "red" "Machine $(uname -m) not supported by this plugin" return 1 diff --git a/zsh/files/sshagent.zsh b/zsh/files/sshagent.zsh index e3f2e57..e6147d0 100644 --- a/zsh/files/sshagent.zsh +++ b/zsh/files/sshagent.zsh @@ -27,5 +27,5 @@ else if ! is_ssh_agent_pid_valid $SSH_AGENT_PID; then start_agent fi - add_identities + add_identities fi diff --git a/zsh/rc.zsh b/zsh/rc.zsh index 025dd7d..4590a90 100644 --- a/zsh/rc.zsh +++ b/zsh/rc.zsh @@ -2,17 +2,13 @@ [[ -r "$HOME/.cache/p10k-instant-prompt-${(%):-%n}.zsh" ]] && source "$HOME/.cache/p10k-instant-prompt-${(%):-%n}.zsh" export fpath=($fpath $ZDOTDIR/local/fpath) +export SPACEVIMDIR="$HOME/.config/spacevim/" export FZF_MARKS_FILE=$HOME/.config/fzfmarks export STARSHIP_CONFIG=$ZDOTDIR/starship.toml export ZSH_EVALCACHE_DIR="$HOME/.cache/evalcache" # Setopt Stuff -setopt multios -setopt prompt_subst -setopt auto_pushd -setopt pushd_ignore_dups -setopt pushdminus -setopt inc_append_history +setopt multios prompt_subst auto_pushd pushd_ignore_dups pushdminus inc_append_history # Zinit Clone if not exist [[ ! -f $HOME/.config/zinit/bin/zinit.zsh ]] && command git clone https://github.com/zdharma/zinit $HOME/.config/zinit/bin @@ -25,16 +21,11 @@ ZINIT[ZCOMPDUMP_PATH]="$HOME/.cache/zsh/compdump" source $HOME/.config/zinit/bin/zinit.zsh # Programs -zinit ice as"program" from"gh-r" mv"fd* -> fd" pick"fd/fd"; zinit light sharkdp/fd -zinit ice as"program" from"gh-r" mv"bat* -> bat" pick"bat/bat"; zinit light sharkdp/bat -zinit ice as"program" from"gh-r" mv"exa* -> exa"; zinit light ogham/exa -zinit ice as"program" from"gh-r" mv"pet* -> pet" pick"usr/local/bin/pet"; zinit light knqyf263/pet -zinit ice as"program" from"gh-r" mv"ripgrep* -> ripgrep" pick"ripgrep/rg"; zinit light BurntSushi/ripgrep -zinit ice as"program" from"gh-r" mv"gopass* -> gopass" pick"gopass/gopass"; zinit light gopasspw/gopass +zinit ice as"program" from"gh-r" mv"fd* -> fd" pick"fd/fd"; zinit light "sharkdp/fd" +zinit ice as"program" from"gh-r" mv"bat* -> bat" pick"bat/bat"; zinit light "sharkdp/bat" +zinit ice as"program" from"gh-r" mv"exa* -> exa"; zinit light "ogham/exa" +zinit ice as"program" from"gh-r" mv"ripgrep* -> ripgrep" pick"ripgrep/rg"; zinit light "BurntSushi/ripgrep" zinit ice as"program" from"gh-r" mv"jq-* -> jq"; zinit light "stedolan/jq" -zinit ice as"program" pick"emojify"; zinit light "mrowa44/emojify" -zinit ice as"program" pick"ansi"; zinit light "fidian/ansi" -zinit light "micha/resty" # Completions and Autosuggestions zinit ice lucid blockf atpull'zinit creinstall -q .'; zinit light "zsh-users/zsh-completions" @@ -72,8 +63,6 @@ zstyle ':completion:*:*:*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|:: # Plugins zinit ice lucid; zinit light "mroth/evalcache" zinit ice lucid; zinit snippet OMZP::command-not-found -zinit ice lucid; zinit snippet OMZP::lando -zinit ice lucid; zinit snippet OMZP::thefuck zinit ice lucid; zinit snippet OMZP::fzf zinit ice lucid; zinit light "b4b4r07/enhancd" zinit ice lucid; zinit light "jreese/zsh-titles" @@ -81,17 +70,13 @@ zinit ice lucid; zinit light "urbainvaes/fzf-marks" zinit ice lucid; zinit light "Aloxaf/fzf-tab" zinit ice lucid; zinit light "wfxr/forgit" zinit ice lucid; zinit light "reegnz/jq-zsh-plugin" -zinit ice lucid; zinit light "asdf-vm/asdf" -zinit ice lucid; zinit light "b4b4r07/emoji-cli" # syntax highlighting zinit ice lucid atinit"ZINIT[COMPINIT_OPTS]=-C; zpcompinit; zpcdreplay"; zinit light "zdharma/fast-syntax-highlighting" # Theme zinit ice depth=1; zinit light "romkatv/powerlevel10k" - -# To customize prompt, run `p10k configure` or edit ~/.config/dotfiles/zsh/.p10k.zsh. -[[ ! -f ~/.config/dotfiles/zsh/.p10k.zsh ]] || source ~/.config/dotfiles/zsh/.p10k.zsh +[[ ! -f "$ZDOTDIR/.p10k.zsh" ]] || source "$ZDOTDIR/.p10k.zsh" # p10k configure || nano ~/.config/dotfiles/zsh/.p10k.zsh # Local RC [[ -f "$ZDOTDIR/local/rc.zsh" ]] && source "$ZDOTDIR/local/rc.zsh"