From b249204bfd558ed4bd7a6d23a34d0eab53674760 Mon Sep 17 00:00:00 2001 From: eeleater Date: Sat, 29 May 2021 18:51:15 +0200 Subject: [PATCH 1/7] deleted sshconfig, as it is not needed any longer --- copy/sshconfig | 7 ------- install | 22 ++-------------------- 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 copy/sshconfig 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 From f2a0bc7af43015370ff40861642cd25ac384e62d Mon Sep 17 00:00:00 2001 From: eeleater Date: Sat, 29 May 2021 21:38:38 +0200 Subject: [PATCH 2/7] removed some unneeded plugins --- zsh/rc.zsh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/zsh/rc.zsh b/zsh/rc.zsh index 025dd7d..8dd2ad7 100644 --- a/zsh/rc.zsh +++ b/zsh/rc.zsh @@ -28,13 +28,8 @@ source $HOME/.config/zinit/bin/zinit.zsh 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"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" @@ -73,7 +68,6 @@ zstyle ':completion:*:*:*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|:: 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" @@ -82,7 +76,6 @@ 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" From 2979ab9db629ce59c0f4453f3fff37dd1a7e5bb7 Mon Sep 17 00:00:00 2001 From: eeleater Date: Sat, 29 May 2021 21:42:29 +0200 Subject: [PATCH 3/7] removed some unneeded plugins --- zsh/files/direnv.zsh | 3 +++ 1 file changed, 3 insertions(+) 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 From d5a9b2900f585e3051de1e2fcd50989f112a03dc Mon Sep 17 00:00:00 2001 From: eeleater Date: Sun, 30 May 2021 09:28:50 +0200 Subject: [PATCH 4/7] removed some unneeded plugins --- zsh/.p10k.zsh | 23 +++++++++++------------ zsh/files/sshagent.zsh | 2 +- zsh/rc.zsh | 7 +------ 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/zsh/.p10k.zsh b/zsh/.p10k.zsh index 49e4930..fb514d3 100644 --- a/zsh/.p10k.zsh +++ b/zsh/.p10k.zsh @@ -1,7 +1,7 @@ -# Generated by Powerlevel10k configuration wizard on 2020-12-18 at 10:40 CET. +# Generated by Powerlevel10k configuration wizard on 2021-05-30 at 09:28 CEST. # Based on romkatv/powerlevel10k/config/p10k-pure.zsh, checksum 13301. -# Wizard options: nerdfont-complete + powerline, small icons, pure, 24h time, 2 lines, -# compact, transient_prompt, instant_prompt=verbose. +# Wizard options: nerdfont-complete + powerline, small icons, pure, snazzy, 24h time, +# 2 lines, compact, transient_prompt, instant_prompt=verbose. # Type `p10k configure` to generate another config. # # Config file for Powerlevel10k with the style of Pure (https://github.com/sindresorhus/pure). @@ -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=( @@ -53,7 +53,6 @@ dir # current directory vcs # git status command_execution_time # previous command duration - time # =========================[ Line #2 ]========================= newline # \n virtualenv # python virtual environment @@ -66,7 +65,7 @@ # command_execution_time # previous command duration # virtualenv # python virtual environment # context # user@host - #time # current time + time # current time # =========================[ Line #2 ]========================= newline # \n ) @@ -153,7 +152,7 @@ typeset -g POWERLEVEL9K_VCS_CONTENT_EXPANSION='${${${P9K_CONTENT/⇣* :⇡/⇣⇡}// }//:/ }' # Grey current time. - typeset -g POWERLEVEL9K_TIME_FOREGROUND=$yellow + typeset -g POWERLEVEL9K_TIME_FOREGROUND=$grey # Format for the current time: 09:51:02. See `man 3 strftime`. typeset -g POWERLEVEL9K_TIME_FORMAT='%D{%H:%M:%S}' # If set to true, time will update when you hit enter. This way prompts for the past 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 8dd2ad7..a762c13 100644 --- a/zsh/rc.zsh +++ b/zsh/rc.zsh @@ -7,12 +7,7 @@ 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 From c90dd19c23e26aa96c14429c916847cd58fb2e72 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Mon, 31 May 2021 10:08:58 +0200 Subject: [PATCH 5/7] added some more plugins from pc at home --- zsh/rc.zsh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/zsh/rc.zsh b/zsh/rc.zsh index a762c13..c56b14b 100644 --- a/zsh/rc.zsh +++ b/zsh/rc.zsh @@ -2,6 +2,7 @@ [[ -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" @@ -20,11 +21,13 @@ 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"ripgrep* -> ripgrep" pick"ripgrep/rg"; zinit light BurntSushi/ripgrep +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" from"gh-r"; zinit light "boyter/scc" +zinit ice as"program" pick"ansi"; zinit light "fidian/ansi" # Completions and Autosuggestions zinit ice lucid blockf atpull'zinit creinstall -q .'; zinit light "zsh-users/zsh-completions" From 6a508847539da69488df0698bb9f7c0bcdd2fe42 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Fri, 18 Jun 2021 10:57:51 +0200 Subject: [PATCH 6/7] stuff --- zsh/files/aliases.zsh | 3 +++ zsh/rc.zsh | 9 --------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/zsh/files/aliases.zsh b/zsh/files/aliases.zsh index 27af668..03a174c 100644 --- a/zsh/files/aliases.zsh +++ b/zsh/files/aliases.zsh @@ -4,6 +4,9 @@ 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 sc-status="sudo systemctl status" alias sc-start="sudo systemctl start" alias sc-stop="sudo systemctl stop" diff --git a/zsh/rc.zsh b/zsh/rc.zsh index c56b14b..2bb0fc5 100644 --- a/zsh/rc.zsh +++ b/zsh/rc.zsh @@ -21,13 +21,8 @@ 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"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" from"gh-r"; zinit light "boyter/scc" -zinit ice as"program" pick"ansi"; zinit light "fidian/ansi" # Completions and Autosuggestions zinit ice lucid blockf atpull'zinit creinstall -q .'; zinit light "zsh-users/zsh-completions" @@ -65,15 +60,11 @@ 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::fzf zinit ice lucid; zinit light "b4b4r07/enhancd" zinit ice lucid; zinit light "jreese/zsh-titles" 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" # syntax highlighting zinit ice lucid atinit"ZINIT[COMPINIT_OPTS]=-C; zpcompinit; zpcdreplay"; zinit light "zdharma/fast-syntax-highlighting" From 4e1f46ab72e509ac16191f1ddfdcbad36f2cd33c Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Fri, 18 Jun 2021 12:01:38 +0200 Subject: [PATCH 7/7] stuff --- zsh/files/aliases.zsh | 1 + zsh/rc.zsh | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/zsh/files/aliases.zsh b/zsh/files/aliases.zsh index 03a174c..cdc31f1 100644 --- a/zsh/files/aliases.zsh +++ b/zsh/files/aliases.zsh @@ -6,6 +6,7 @@ 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" diff --git a/zsh/rc.zsh b/zsh/rc.zsh index 2bb0fc5..4590a90 100644 --- a/zsh/rc.zsh +++ b/zsh/rc.zsh @@ -21,8 +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"ripgrep* -> ripgrep" pick"ripgrep/rg"; zinit light "BurntSushi/ripgrep" +zinit ice as"program" from"gh-r" mv"jq-* -> jq"; zinit light "stedolan/jq" # Completions and Autosuggestions zinit ice lucid blockf atpull'zinit creinstall -q .'; zinit light "zsh-users/zsh-completions" @@ -65,15 +68,15 @@ zinit ice lucid; zinit light "b4b4r07/enhancd" zinit ice lucid; zinit light "jreese/zsh-titles" 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" # 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"