From 5ddc35d51b16571ea2aa3edc6df21d3a28fad0e5 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Thu, 11 Jun 2020 13:20:14 -0500 Subject: [PATCH 01/12] spelling fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 56350bb..51890d7 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ My ZSH Config git clone --recursive https://github.com/ChrisTitusTech/zsh ln -s -f ~/zsh/.zshrc ~/.zshrc ``` -## Get Dependancies +## Get Dependencies - zsh-syntax-highlighting - syntax highlighting for ZSH in standard repos - autojump - jump to directories with j or jc for child or jo to open in file manager - zsh-autosuggestions - Suggestions based on your history From 7b54c413aa654da8ae643f9234537e01e77c0ed1 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Thu, 11 Jun 2020 13:22:11 -0500 Subject: [PATCH 02/12] adding tar.xz to alias --- aliasrc | 1 + 1 file changed, 1 insertion(+) diff --git a/aliasrc b/aliasrc index c8176ab..a9d881f 100644 --- a/aliasrc +++ b/aliasrc @@ -7,6 +7,7 @@ ex () case $1 in *.tar.bz2) tar xjf $1 ;; *.tar.gz) tar xzf $1 ;; + *.tar.xz) tar xJf $1 ;; *.bz2) bunzip2 $1 ;; *.rar) unrar x $1 ;; *.gz) gunzip $1 ;; From 2c5bedaacf78fcd699113e2bf38ec5fdc640719a Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Thu, 11 Jun 2020 13:23:55 -0500 Subject: [PATCH 03/12] append history --- .zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.zshrc b/.zshrc index 8a87b84..d254d3a 100644 --- a/.zshrc +++ b/.zshrc @@ -24,6 +24,7 @@ prompt pure HISTSIZE=10000 SAVEHIST=10000 HISTFILE=~/.cache/zshhistory +setopt appendhistory # Basic auto/tab complete: autoload -U compinit From 20678ed3d6399726b4d9576db9d6cefae762b7d7 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Wed, 17 Jun 2020 13:30:50 -0500 Subject: [PATCH 04/12] switch from pure to powerlevel10k prompt --- .zshrc | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.zshrc b/.zshrc index d254d3a..173dbab 100644 --- a/.zshrc +++ b/.zshrc @@ -1,3 +1,10 @@ +# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. +# Initialization code that may require console input (password prompts, [y/n] +# confirmations, etc.) must go above this block; everything else may go below. +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 + # Dependancies You Need for this Config # zsh-syntax-highlighting - syntax highlighting for ZSH in standard repos # autojump - jump to directories with j or jc for child or jo to open in file manager @@ -5,8 +12,10 @@ # Initial Setup # mkdir -p "$HOME/zsh/.zsh" -# git submodule add https://github.com/sindresorhus/pure.git "$HOME/zsh/pure" +# touch "$HOME/.cache/zshhistory # Setup Alias in $HOME/zsh/aliasrc +# git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k +# echo 'source ~/powerlevel10k/powerlevel10k.zsh-theme' >>! ~/.zshrc # Enable colors and change prompt: autoload -U colors && colors @@ -15,11 +24,6 @@ PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magent # Custom Variables EDITOR=vim -# Pure Prompt -fpath+=$HOME/zsh/pure -autoload -U promptinit; promptinit -prompt pure - # History in cache directory: HISTSIZE=10000 SAVEHIST=10000 @@ -43,3 +47,7 @@ bindkey '^ ' autosuggest-accept source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh 2>/dev/null source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null source /usr/share/autojump/autojump.zsh 2>/dev/null +source ~/powerlevel10k/powerlevel10k.zsh-theme + +# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. +[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh From 6fc5c7df446315c7c3c303d34264ea812db5ecda Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Wed, 8 Jul 2020 13:56:39 -0500 Subject: [PATCH 05/12] updated alias --- aliasrc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/aliasrc b/aliasrc index a9d881f..542ae7b 100644 --- a/aliasrc +++ b/aliasrc @@ -79,4 +79,9 @@ alias vim='vim' alias vi='vim' alias gds-start='sudo systemctl start openvpn-client@gds' alias gds-stop='sudo systemctl stop openvpn-client@gds' - +gitpush() { + git add . + git commit -m "$*" + git push +} +alias gp=gitpush From 27673fd6cb6772e31a2eaff237add82983bf61e0 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Wed, 8 Jul 2020 22:48:39 -0500 Subject: [PATCH 06/12] macOS changes --- .zshrc | 1 - aliasrc | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.zshrc b/.zshrc index 173dbab..cd0ce4d 100644 --- a/.zshrc +++ b/.zshrc @@ -11,7 +11,6 @@ fi # zsh-autosuggestions - Suggestions based on your history # Initial Setup -# mkdir -p "$HOME/zsh/.zsh" # touch "$HOME/.cache/zshhistory # Setup Alias in $HOME/zsh/aliasrc # git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k diff --git a/aliasrc b/aliasrc index a9d881f..df018b1 100644 --- a/aliasrc +++ b/aliasrc @@ -28,18 +28,18 @@ export EDITOR=vim alias pacman-update='sudo pacman-mirrors --geoip' -alias ls='ls --color=auto' +alias ls='ls' alias ll='ls -l' # ls, the common ones I use a lot shortened for rapid fire usage -alias l='ls -lFh --color=auto' #size,show type,human readable -alias la='ls -lAFh --color=auto' #long list,show almost all,show type,human readable -alias lr='ls -tRFh --color=auto' #sorted by date,recursive,show type,human readable -alias lt='ls -ltFh --color=auto' #long list,sorted by date,show type,human readable -alias ll='ls -l --color=auto' #long list -alias ldot='ls -ld .* --color=auto' -alias lS='ls -1FSsh --color=auto' -alias lart='ls -1Fcart --color=auto' -alias lrt='ls -1Fcrt --color=auto' +alias l='ls -lFh' #size,show type,human readable +alias la='ls -lAFh' #long list,show almost all,show type,human readable +alias lr='ls -tRFh' #sorted by date,recursive,show type,human readable +alias lt='ls -ltFh' #long list,sorted by date,show type,human readable +alias ll='ls -l' #long list +alias ldot='ls -ld .*' +alias lS='ls -1FSsh' +alias lart='ls -1Fcart' +alias lrt='ls -1Fcrt' alias zshrc='${=EDITOR} ~/.zshrc' # Quick access to the ~/.zshrc file From 420dfb15868f6ce97d4474d284bda18b3c5e04b7 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Wed, 8 Jul 2020 22:50:07 -0500 Subject: [PATCH 07/12] removal of pure --- pure | 1 - 1 file changed, 1 deletion(-) delete mode 160000 pure diff --git a/pure b/pure deleted file mode 160000 index c42bd35..0000000 --- a/pure +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c42bd354943ba4cf2da3ecf493fca4fef0b2722c From 22b3de86194e8f7990fdad887681301f818d7bcb Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Tue, 21 Jul 2020 16:05:09 -0500 Subject: [PATCH 08/12] LBRY interface alias --- aliasrc | 1 + 1 file changed, 1 insertion(+) diff --git a/aliasrc b/aliasrc index e2d9c23..95da79e 100644 --- a/aliasrc +++ b/aliasrc @@ -85,3 +85,4 @@ gitpush() { git push } alias gp=gitpush +alias lbrynet='/opt/LBRY/resources/static/daemon/lbrynet' From 780bb1e4999a5fe36ea8d659e96e18f31e39cf22 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Wed, 19 Aug 2020 12:34:12 -0500 Subject: [PATCH 09/12] zsh fix --- README.md | 20 ++++++++++++++++++-- aliasrc | 1 + 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 51890d7..1d151f2 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,28 @@ My ZSH Config ## Setup ``` -git clone --recursive https://github.com/ChrisTitusTech/zsh -ln -s -f ~/zsh/.zshrc ~/.zshrc +touch "$HOME/.cache/zshhistory +#-- Setup Alias in $HOME/zsh/aliasrc +git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k +echo 'source ~/powerlevel10k/powerlevel10k.zsh-theme' >>! ~/.zshrc ``` ## Get Dependencies - zsh-syntax-highlighting - syntax highlighting for ZSH in standard repos - autojump - jump to directories with j or jc for child or jo to open in file manager - zsh-autosuggestions - Suggestions based on your history + +### Debian Dependencies + +```bash +sudo apt install zsh-syntax-highlighting autojump zsh-autosuggestions +``` + +### Arch Dependencies + +```bash +yay -S zsh-syntax-highlighting autojump zsh-autosuggestions +``` Finish the conversion by changing your user in /etc/passwd to /bin/zsh instead of /bin/bash + +or typing `chsh $USER` and entering `/bin/zsh` diff --git a/aliasrc b/aliasrc index 95da79e..4c6b8ab 100644 --- a/aliasrc +++ b/aliasrc @@ -82,6 +82,7 @@ alias gds-stop='sudo systemctl stop openvpn-client@gds' gitpush() { git add . git commit -m "$*" + git pull git push } alias gp=gitpush From b4f80ba29ed771b4b22bae2583cdcabb00b78f31 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Mon, 31 Aug 2020 08:44:29 -0500 Subject: [PATCH 10/12] readme fix --- README.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1d151f2..1e340d8 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,21 @@ # zsh + My ZSH Config ## Setup + ``` -touch "$HOME/.cache/zshhistory +touch "$HOME/.cache/zshhistory" #-- Setup Alias in $HOME/zsh/aliasrc git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k -echo 'source ~/powerlevel10k/powerlevel10k.zsh-theme' >>! ~/.zshrc +echo 'source ~/powerlevel10k/powerlevel10k.zsh-theme' >> ~/.zshrc ``` -## Get Dependencies - - zsh-syntax-highlighting - syntax highlighting for ZSH in standard repos - - autojump - jump to directories with j or jc for child or jo to open in file manager - - zsh-autosuggestions - Suggestions based on your history + +## Get Dependencies + +- zsh-syntax-highlighting - syntax highlighting for ZSH in standard repos +- autojump - jump to directories with j or jc for child or jo to open in file manager +- zsh-autosuggestions - Suggestions based on your history ### Debian Dependencies From 517b8fcbffbe7af35698e1a3823bddee2858ada8 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Tue, 8 Sep 2020 12:00:53 -0500 Subject: [PATCH 11/12] SSH Git Update Addition --- aliasrc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/aliasrc b/aliasrc index 95da79e..2ac2124 100644 --- a/aliasrc +++ b/aliasrc @@ -84,5 +84,11 @@ gitpush() { git commit -m "$*" git push } +gitupdate() { + eval "$(ssh-agent -s)" + ssh-add ~/.ssh/github + ssh -T git@github.com +} alias gp=gitpush +alias gu=gitupdate alias lbrynet='/opt/LBRY/resources/static/daemon/lbrynet' From 4b4941923522f59ef38001a9dbbbb2a64126fdf5 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Wed, 16 Sep 2020 19:54:02 -0500 Subject: [PATCH 12/12] update-grub for arch --- aliasrc | 1 + 1 file changed, 1 insertion(+) diff --git a/aliasrc b/aliasrc index 0f1800b..96c166c 100644 --- a/aliasrc +++ b/aliasrc @@ -93,3 +93,4 @@ gitupdate() { alias gp=gitpush alias gu=gitupdate alias lbrynet='/opt/LBRY/resources/static/daemon/lbrynet' +alias update-grub='sudo grub-mkconfig -o /boot/grub/grub.cfg'