From 40b4b2abd4cc279d5b6f2286855d370e03eb8c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sun, 7 Jun 2020 16:09:57 +0200 Subject: [PATCH 01/32] My initial config --- .zshrc | 7 ++++++- README.md | 23 +++++++++++++++-------- aliasrc | 9 ++------- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.zshrc b/.zshrc index 8a87b84..c073088 100644 --- a/.zshrc +++ b/.zshrc @@ -13,12 +13,14 @@ autoload -U colors && colors PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b " # Custom Variables -EDITOR=vim +EDITOR=nano # Pure Prompt fpath+=$HOME/zsh/pure autoload -U promptinit; promptinit prompt pure +PURE_PROMPT_SYMBOL=\$ +PURE_PROMPT_VICMD_SYMBOL=\< # History in cache directory: HISTSIZE=10000 @@ -34,6 +36,9 @@ _comp_options+=(globdots) # Include hidden files. # Custom ZSH Binds bindkey '^ ' autosuggest-accept +bindkey "^[[H" beginning-of-line +bindkey "^[[F" end-of-line +bindkey "^[[3~" delete-char # Load aliases and shortcuts if existent. [ -f "$HOME/zsh/aliasrc" ] && source "$HOME/zsh/aliasrc" diff --git a/README.md b/README.md index 56350bb..9d530a2 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,21 @@ -# zsh -My ZSH Config +# ZSH +My ZSH config ## Setup ``` -git clone --recursive https://github.com/ChrisTitusTech/zsh +git clone --recursive https://github.com/jiriks74/zsh ln -s -f ~/zsh/.zshrc ~/.zshrc ``` -## Get Dependancies - - 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 + +## Get Dependancies + - zsh-syntax-highlighting - syntax highlighting for ZSH + - autojump - jump to directories with j or jc for child or jo to open in file manager (ARCH - install via AUR) - zsh-autosuggestions - Suggestions based on your history - -Finish the conversion by changing your user in /etc/passwd to /bin/zsh instead of /bin/bash + - zsh - the shell itself + - pure - Should download with my setup (Just in case - `git clone https://github.com/sindresorhus/pure.git "$HOME/.zsh/pure"`) + +## Set as default +To set zsh as default shell for your user, edit `/etc/passwd` (from `/bin/bash` to `/bin/zsh`) + +## What I used +My config is based on Chris Titus's config and pure shell. diff --git a/aliasrc b/aliasrc index c8176ab..0ecfc5a 100644 --- a/aliasrc +++ b/aliasrc @@ -23,9 +23,9 @@ ex () fi } -export EDITOR=vim +export EDITOR=nano -alias pacman-update='sudo pacman-mirrors --geoip' +alias pacman-update='sudo reflector -c "CZ" -f 12 -l 10 -n 12 --save /etc/pacman.d/mirrorlist' alias ls='ls --color=auto' alias ll='ls -l' @@ -74,8 +74,3 @@ alias unexport='unset' alias rm='rm -i' alias cp='cp -i' alias mv='mv -i' -alias vim='vim' -alias vi='vim' -alias gds-start='sudo systemctl start openvpn-client@gds' -alias gds-stop='sudo systemctl stop openvpn-client@gds' - -- 2.45.2 From f0d3261336a7d6b0d549dfa1bd5a69dfb7289542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sun, 7 Jun 2020 21:08:06 +0200 Subject: [PATCH 02/32] Added `.tar.xz` to `ex` alias --- aliasrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aliasrc b/aliasrc index 0ecfc5a..acde730 100644 --- a/aliasrc +++ b/aliasrc @@ -7,8 +7,9 @@ ex () case $1 in *.tar.bz2) tar xjf $1 ;; *.tar.gz) tar xzf $1 ;; + *.tar.xz) tar -xf ;; *.bz2) bunzip2 $1 ;; - *.rar) unrar x $1 ;; + *.rar) unrar x $1 ;; *.gz) gunzip $1 ;; *.tar) tar xf $1 ;; *.tbz2) tar xjf $1 ;; -- 2.45.2 From 75186d842f965d02f90720cc77a59457cbd7e9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sun, 7 Jun 2020 21:36:14 +0200 Subject: [PATCH 03/32] Added pacmanupdate and modified pacman-update Added pacmanupdate script, which uses reflector to update mirrors using country from user input and modified pacman-update to use variable at begining of the file so you won't have to type your country all the time --- aliasrc | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/aliasrc b/aliasrc index acde730..6de9a3e 100644 --- a/aliasrc +++ b/aliasrc @@ -1,3 +1,6 @@ +##pacman-update country +country=CZ + # # # ex - archive extractor # # usage: ex @@ -24,9 +27,21 @@ ex () fi } +test () +{ +echo test; +} + +pacmanupdate () +{ + echo "Enter your country (like 'US' or 'CZ')" + read update + sudo reflector -c $update -f 12 -l 10 -n 12 --save /etc/pacman.d/mirrorlist; +} + export EDITOR=nano -alias pacman-update='sudo reflector -c "CZ" -f 12 -l 10 -n 12 --save /etc/pacman.d/mirrorlist' +alias pacman-update='sudo reflector -c $country -f 12 -l 10 -n 12 --save /etc/pacman.d/mirrorlist' alias ls='ls --color=auto' alias ll='ls -l' -- 2.45.2 From 08257dbbc45cdf39c349c3076c5011c0acf2eb0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Mon, 8 Jun 2020 18:40:50 +0200 Subject: [PATCH 04/32] Added zsh-autosuggestions as git submodule I wasn't able to install zsh-autosuggestions on my ubuntu arm based server, so I added this directlu to my config --- .gitmodules | 3 +++ .zshrc | 2 +- zsh-autosuggestions | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 zsh-autosuggestions diff --git a/.gitmodules b/.gitmodules index 77971d9..58e0738 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "pure"] path = pure url = https://github.com/sindresorhus/pure.git +[submodule "zsh-autosuggestions"] + path = zsh-autosuggestions + url = https://github.com/zsh-users/zsh-autosuggestions diff --git a/.zshrc b/.zshrc index c073088..bd483ec 100644 --- a/.zshrc +++ b/.zshrc @@ -44,6 +44,6 @@ bindkey "^[[3~" delete-char [ -f "$HOME/zsh/aliasrc" ] && source "$HOME/zsh/aliasrc" # Load ; should be last. -source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh 2>/dev/null +source $HOME/zsh/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 diff --git a/zsh-autosuggestions b/zsh-autosuggestions new file mode 160000 index 0000000..ae315de --- /dev/null +++ b/zsh-autosuggestions @@ -0,0 +1 @@ +Subproject commit ae315ded4dba10685dbbafbfa2ff3c1aefeb490d -- 2.45.2 From 74d51606205fb5b69d734b3365183de703e7b5e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Mon, 8 Jun 2020 18:50:03 +0200 Subject: [PATCH 05/32] Added zsh-syntax-highlighting Added zsh-syntax-highlighting directly to my config from github --- .gitmodules | 3 +++ .zshrc | 2 +- zsh-syntax-highlighting | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 zsh-syntax-highlighting diff --git a/.gitmodules b/.gitmodules index 58e0738..fefad53 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "zsh-autosuggestions"] path = zsh-autosuggestions url = https://github.com/zsh-users/zsh-autosuggestions +[submodule "zsh-syntax-highlighting"] + path = zsh-syntax-highlighting + url = https://github.com/zsh-users/zsh-syntax-highlighting.git diff --git a/.zshrc b/.zshrc index bd483ec..6397135 100644 --- a/.zshrc +++ b/.zshrc @@ -45,5 +45,5 @@ bindkey "^[[3~" delete-char # Load ; should be last. source $HOME/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh 2>/dev/null -source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null +source $HOME/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null source /usr/share/autojump/autojump.zsh 2>/dev/null diff --git a/zsh-syntax-highlighting b/zsh-syntax-highlighting new file mode 160000 index 0000000..6fd92e1 --- /dev/null +++ b/zsh-syntax-highlighting @@ -0,0 +1 @@ +Subproject commit 6fd92e1bbd927119e8fbb2d8f50d4cd9a6bcb6d9 -- 2.45.2 From b0c011bb395d90e51cff081055e0626dfb981d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Mon, 8 Jun 2020 18:57:47 +0200 Subject: [PATCH 06/32] Update README.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9d530a2..f080c29 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,13 @@ ln -s -f ~/zsh/.zshrc ~/.zshrc ``` ## Get Dependancies +### Should download with config - zsh-syntax-highlighting - syntax highlighting for ZSH - - autojump - jump to directories with j or jc for child or jo to open in file manager (ARCH - install via AUR) - zsh-autosuggestions - Suggestions based on your history + - pure - Pure shell look for zsh +### Get this from your distribution repository + - autojump - Jump to directories with j or jc for child or jo to open in file manager - zsh - the shell itself - - pure - Should download with my setup (Just in case - `git clone https://github.com/sindresorhus/pure.git "$HOME/.zsh/pure"`) ## Set as default To set zsh as default shell for your user, edit `/etc/passwd` (from `/bin/bash` to `/bin/zsh`) -- 2.45.2 From b622391111265f8b780a9ca99dd61b9708b89b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Mon, 8 Jun 2020 18:58:46 +0200 Subject: [PATCH 07/32] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f080c29..7ddb6ea 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ ln -s -f ~/zsh/.zshrc ~/.zshrc - zsh-syntax-highlighting - syntax highlighting for ZSH - zsh-autosuggestions - Suggestions based on your history - pure - Pure shell look for zsh -### Get this from your distribution repository +### Get this from your distribution's repository - autojump - Jump to directories with j or jc for child or jo to open in file manager - zsh - the shell itself -- 2.45.2 From 5ddc35d51b16571ea2aa3edc6df21d3a28fad0e5 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Thu, 11 Jun 2020 13:20:14 -0500 Subject: [PATCH 08/32] 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 -- 2.45.2 From 7b54c413aa654da8ae643f9234537e01e77c0ed1 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Thu, 11 Jun 2020 13:22:11 -0500 Subject: [PATCH 09/32] 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 ;; -- 2.45.2 From 2c5bedaacf78fcd699113e2bf38ec5fdc640719a Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Thu, 11 Jun 2020 13:23:55 -0500 Subject: [PATCH 10/32] 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 -- 2.45.2 From 20678ed3d6399726b4d9576db9d6cefae762b7d7 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Wed, 17 Jun 2020 13:30:50 -0500 Subject: [PATCH 11/32] 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 -- 2.45.2 From 6fc5c7df446315c7c3c303d34264ea812db5ecda Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Wed, 8 Jul 2020 13:56:39 -0500 Subject: [PATCH 12/32] 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 -- 2.45.2 From 27673fd6cb6772e31a2eaff237add82983bf61e0 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Wed, 8 Jul 2020 22:48:39 -0500 Subject: [PATCH 13/32] 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 -- 2.45.2 From 420dfb15868f6ce97d4474d284bda18b3c5e04b7 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Wed, 8 Jul 2020 22:50:07 -0500 Subject: [PATCH 14/32] 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 -- 2.45.2 From 22b3de86194e8f7990fdad887681301f818d7bcb Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Tue, 21 Jul 2020 16:05:09 -0500 Subject: [PATCH 15/32] 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' -- 2.45.2 From 780bb1e4999a5fe36ea8d659e96e18f31e39cf22 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Wed, 19 Aug 2020 12:34:12 -0500 Subject: [PATCH 16/32] 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 -- 2.45.2 From b4f80ba29ed771b4b22bae2583cdcabb00b78f31 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Mon, 31 Aug 2020 08:44:29 -0500 Subject: [PATCH 17/32] 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 -- 2.45.2 From 517b8fcbffbe7af35698e1a3823bddee2858ada8 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Tue, 8 Sep 2020 12:00:53 -0500 Subject: [PATCH 18/32] 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' -- 2.45.2 From 4b4941923522f59ef38001a9dbbbb2a64126fdf5 Mon Sep 17 00:00:00 2001 From: ChrisTitusTech Date: Wed, 16 Sep 2020 19:54:02 -0500 Subject: [PATCH 19/32] 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' -- 2.45.2 From b965944584c22e61aa6685155fef9ee5a4325a11 Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Fri, 9 Oct 2020 20:30:40 +0200 Subject: [PATCH 20/32] Moving from `pure zsh` to `powerlevel10k` --- .gitmodules | 3 +++ aliasrc | 2 ++ powerlevel10k | 1 + 3 files changed, 6 insertions(+) create mode 160000 powerlevel10k diff --git a/.gitmodules b/.gitmodules index fefad53..199a376 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "zsh-syntax-highlighting"] path = zsh-syntax-highlighting url = https://github.com/zsh-users/zsh-syntax-highlighting.git +[submodule "powerlevel10k"] + path = powerlevel10k + url = https://github.com/romkatv/powerlevel10k.git diff --git a/aliasrc b/aliasrc index 6de9a3e..334d2ea 100644 --- a/aliasrc +++ b/aliasrc @@ -90,3 +90,5 @@ alias unexport='unset' alias rm='rm -i' alias cp='cp -i' alias mv='mv -i' + +alias wallpaper=/home/jirka/.local/bin/wallpaper diff --git a/powerlevel10k b/powerlevel10k new file mode 160000 index 0000000..f2bf019 --- /dev/null +++ b/powerlevel10k @@ -0,0 +1 @@ +Subproject commit f2bf0197581abb8bde529e6b492710948549ba7f -- 2.45.2 From bf67ef3b6b3add131f2771a302990220764db099 Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Fri, 9 Oct 2020 20:44:19 +0200 Subject: [PATCH 21/32] Changet the old config file to zshrc. pure, made the README better and added configuration for pure --- README.md | 15 ++++++++++++--- zshrc | 37 +++++++++++++++++++++++++++++++++++++ .zshrc => zshrc.pure | 0 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 zshrc rename .zshrc => zshrc.pure (100%) diff --git a/README.md b/README.md index 7ddb6ea..80d5620 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,17 @@ My ZSH config ## Setup + - Clone the repository to your home folder ``` git clone --recursive https://github.com/jiriks74/zsh -ln -s -f ~/zsh/.zshrc ~/.zshrc ``` + - Link the zshrc file to your home foled (`powerlevel10k` theme) +`ln -s ~/zsh/zshrc ~/.zshrc` + - Or link the zshrc file configured for pure +`ln -s ~/zsh/zshrc.pure ~/.zsh` ## Get Dependancies -### Should download with config +### Included in this repository - zsh-syntax-highlighting - syntax highlighting for ZSH - zsh-autosuggestions - Suggestions based on your history - pure - Pure shell look for zsh @@ -19,5 +23,10 @@ ln -s -f ~/zsh/.zshrc ~/.zshrc ## Set as default To set zsh as default shell for your user, edit `/etc/passwd` (from `/bin/bash` to `/bin/zsh`) +### Exampe: + - Put your username instead of `user` +From: `user:x:1000:1000::/home/user:/bin/bash` +To: `user:x:1000:1000::/home/user:/bin/zsh` + ## What I used -My config is based on Chris Titus's config and pure shell. +My config is based on Chris Titus's config, `powerlevel10k` theme - old config `pure shell` diff --git a/zshrc b/zshrc new file mode 100644 index 0000000..6e96b22 --- /dev/null +++ b/zshrc @@ -0,0 +1,37 @@ +# 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 + +source ~/zsh/powerlevel10k/powerlevel10k.zsh-theme + +# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. +[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh + +# History in cache directory: +HISTSIZE=10000 +SAVEHIST=10000 +HISTFILE=~/.cache/zshhistory + +# Basic auto/tab complete: +autoload -U compinit +zstyle ':completion:*' menu select +zmodload zsh/complist +compinit +_comp_options+=(globdots) # Include hidden files. + +# Custom ZSH Binds +bindkey '^ ' autosuggest-accept +bindkey "^[[H" beginning-of-line +bindkey "^[[F" end-of-line +bindkey "^[[3~" delete-char + +# Load aliases and shortcuts if existent. +[ -f "$HOME/zsh/aliasrc" ] && source "$HOME/zsh/aliasrc" + +# Load ; should be last. +source $HOME/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh 2>/dev/null +source $HOME/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null +source /usr/share/autojump/autojump.zsh 2>/dev/null diff --git a/.zshrc b/zshrc.pure similarity index 100% rename from .zshrc rename to zshrc.pure -- 2.45.2 From 757a599763e504468fca93683e012d4e99999235 Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Fri, 9 Oct 2020 21:04:56 +0200 Subject: [PATCH 22/32] Added better and easier instructions, fixed some bad typing and gramar --- README.md | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 80d5620..a44a289 100644 --- a/README.md +++ b/README.md @@ -3,30 +3,38 @@ My ZSH config ## Setup - Clone the repository to your home folder -``` -git clone --recursive https://github.com/jiriks74/zsh -``` - - Link the zshrc file to your home foled (`powerlevel10k` theme) -`ln -s ~/zsh/zshrc ~/.zshrc` - - Or link the zshrc file configured for pure -`ln -s ~/zsh/zshrc.pure ~/.zsh` +```git clone --recursive https://github.com/jiriks74/zsh``` +### `powerlevel10k` theme + - Link the `zsh` file to your home folder as `.zshrc` +```ln -s ~/zsh/zshrc ~/.zshrc``` + - Set the `powerlevel10k` theme the way you like it +```p10k config``` +### `pure` shell theme + - Link the `zsh.pure` file to your home folder as `.zshrc` +```ln -s ~/zsh/zshrc.pure ~/.zsh``` ## Get Dependancies ### Included in this repository - - zsh-syntax-highlighting - syntax highlighting for ZSH - - zsh-autosuggestions - Suggestions based on your history - - pure - Pure shell look for zsh + - `zsh-syntax-highlighting` - syntax highlighting for ZSH + - `zsh-autosuggestions` - Suggestions based on your history + - `powerlevel10k` theme - The the actual theme + - `pure` - Pure shell look for zsh ### Get this from your distribution's repository - - autojump - Jump to directories with j or jc for child or jo to open in file manager - - zsh - the shell itself + - `autojump` - Jump to directories with j or jc for child or jo to open in file manager + - `zsh` - the shell itself +### Recomended for `powerlevel10k` + - `[nerd-fonts](https://github.com/ryanoasis/nerd-fonts "nerd-fonts github page") - I recomend `MesloLGS NF Regular` ## Set as default To set zsh as default shell for your user, edit `/etc/passwd` (from `/bin/bash` to `/bin/zsh`) - -### Exampe: - - Put your username instead of `user` +### There are two ways: + - Running this command: +```chsch $USER``` + - Modifying `/etc/passwd` + ..* Find line containing your username + ..* Put your username instead of `user` From: `user:x:1000:1000::/home/user:/bin/bash` To: `user:x:1000:1000::/home/user:/bin/zsh` ## What I used -My config is based on Chris Titus's config, `powerlevel10k` theme - old config `pure shell` +My config is based on Chris Titus's config, `powerlevel10k` theme - old config `pure` -- 2.45.2 From fc2c76ee9a27cb2d4c3dd57ddaee3d6a73eae934 Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Fri, 9 Oct 2020 21:07:25 +0200 Subject: [PATCH 23/32] Fixed some not working markdown --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a44a289..8db46d2 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,8 @@ To set zsh as default shell for your user, edit `/etc/passwd` (from `/bin/bash` - Running this command: ```chsch $USER``` - Modifying `/etc/passwd` - ..* Find line containing your username - ..* Put your username instead of `user` + * Find line containing your username + * Put your username instead of `user` From: `user:x:1000:1000::/home/user:/bin/bash` To: `user:x:1000:1000::/home/user:/bin/zsh` -- 2.45.2 From 6c1cf890da0e6f891cf48722f43de3ca999d4538 Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Fri, 9 Oct 2020 21:07:54 +0200 Subject: [PATCH 24/32] Fixed some not working markdown --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8db46d2..a650aab 100644 --- a/README.md +++ b/README.md @@ -28,9 +28,9 @@ My ZSH config ## Set as default To set zsh as default shell for your user, edit `/etc/passwd` (from `/bin/bash` to `/bin/zsh`) ### There are two ways: - - Running this command: +#### Running this command: ```chsch $USER``` - - Modifying `/etc/passwd` +#### Modifying `/etc/passwd` * Find line containing your username * Put your username instead of `user` From: `user:x:1000:1000::/home/user:/bin/bash` -- 2.45.2 From 44c8a0b73148bb7410e6ababf8aaa4dd992a8f1e Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Fri, 9 Oct 2020 21:12:41 +0200 Subject: [PATCH 25/32] Fixed some not working markdown and other stuff - everyone learns how to make proper README --- README.md | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a650aab..f677636 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,23 @@ My ZSH config ## Setup - Clone the repository to your home folder -```git clone --recursive https://github.com/jiriks74/zsh``` +``` +git clone --recursive https://github.com/jiriks74/zsh +``` ### `powerlevel10k` theme - Link the `zsh` file to your home folder as `.zshrc` -```ln -s ~/zsh/zshrc ~/.zshrc``` +``` +ln -s ~/zsh/zshrc ~/.zshrc +``` - Set the `powerlevel10k` theme the way you like it -```p10k config``` +``` +p10k config +``` ### `pure` shell theme - Link the `zsh.pure` file to your home folder as `.zshrc` -```ln -s ~/zsh/zshrc.pure ~/.zsh``` +``` +ln -s ~/zsh/zshrc.pure ~/.zsh +``` ## Get Dependancies ### Included in this repository @@ -33,8 +41,9 @@ To set zsh as default shell for your user, edit `/etc/passwd` (from `/bin/bash` #### Modifying `/etc/passwd` * Find line containing your username * Put your username instead of `user` + From: `user:x:1000:1000::/home/user:/bin/bash` To: `user:x:1000:1000::/home/user:/bin/zsh` ## What I used -My config is based on Chris Titus's config, `powerlevel10k` theme - old config `pure` +My config is based on Chris Titus's config, `powerlevel10k` theme and `pure` -- 2.45.2 From 6be9689a6c46e2714fddc3548d371e7fa147a403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= <54378412+jiriks74@users.noreply.github.com> Date: Fri, 9 Oct 2020 21:15:17 +0200 Subject: [PATCH 26/32] Fixed lings new lines and some other stuff --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f677636..a83c511 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ ln -s ~/zsh/zshrc.pure ~/.zsh - `autojump` - Jump to directories with j or jc for child or jo to open in file manager - `zsh` - the shell itself ### Recomended for `powerlevel10k` - - `[nerd-fonts](https://github.com/ryanoasis/nerd-fonts "nerd-fonts github page") - I recomend `MesloLGS NF Regular` + - [`nerd-fonts`](https://github.com/ryanoasis/nerd-fonts "nerd-fonts github page") - I recomend `MesloLGS NF Regular` ## Set as default To set zsh as default shell for your user, edit `/etc/passwd` (from `/bin/bash` to `/bin/zsh`) @@ -43,6 +43,7 @@ To set zsh as default shell for your user, edit `/etc/passwd` (from `/bin/bash` * Put your username instead of `user` From: `user:x:1000:1000::/home/user:/bin/bash` + To: `user:x:1000:1000::/home/user:/bin/zsh` ## What I used -- 2.45.2 From 88065e4f45649c97d216ed850306d5f6036c7b62 Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Fri, 9 Oct 2020 21:50:55 +0200 Subject: [PATCH 27/32] Completing the instalation steps --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a83c511..7b194e6 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ ln -s ~/zsh/zshrc ~/.zshrc ``` - Set the `powerlevel10k` theme the way you like it ``` +zsh p10k config ``` ### `pure` shell theme -- 2.45.2 From 4ee7ae08aa3433c16e8ee181c9400eb4ecca534f Mon Sep 17 00:00:00 2001 From: Jirka Date: Fri, 9 Oct 2020 23:18:43 +0200 Subject: [PATCH 28/32] Added more acurate description for first setup of `powerlevel10k` --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 7b194e6..4c794f4 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,9 @@ ln -s ~/zsh/zshrc ~/.zshrc - Set the `powerlevel10k` theme the way you like it ``` zsh +``` + - If configuration won't start automatically, just run +``` p10k config ``` ### `pure` shell theme -- 2.45.2 From ee9334708ef572ac4eace3b4d2213c7cbb3e0d0f Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Fri, 19 Mar 2021 20:08:16 +0100 Subject: [PATCH 29/32] Update 2021 --- aliasrc | 2 +- zshrc | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/aliasrc b/aliasrc index 334d2ea..8d3e883 100644 --- a/aliasrc +++ b/aliasrc @@ -1,5 +1,5 @@ ##pacman-update country -country=CZ +country=CS # # # ex - archive extractor diff --git a/zshrc b/zshrc index 6e96b22..af8573c 100644 --- a/zshrc +++ b/zshrc @@ -28,6 +28,9 @@ bindkey "^[[H" beginning-of-line bindkey "^[[F" end-of-line bindkey "^[[3~" delete-char +export PATH=$PATH:/home/jirka/.local/bin +export DOTNET_CLI_TELEMETRY_OPTOUT=1 + # Load aliases and shortcuts if existent. [ -f "$HOME/zsh/aliasrc" ] && source "$HOME/zsh/aliasrc" @@ -35,3 +38,4 @@ bindkey "^[[3~" delete-char source $HOME/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh 2>/dev/null source $HOME/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null source /usr/share/autojump/autojump.zsh 2>/dev/null +alias mon2cam="deno run --unstable -A -r -q https://raw.githubusercontent.com/ShayBox/Mon2Cam/master/src/mod.ts" -- 2.45.2 From 1db61ed5559c15854e6be937c5bcf1f522ce54ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Wed, 10 Nov 2021 23:18:46 +0100 Subject: [PATCH 30/32] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4c794f4..979bd08 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,8 @@ ln -s ~/zsh/zshrc.pure ~/.zsh - `powerlevel10k` theme - The the actual theme - `pure` - Pure shell look for zsh ### Get this from your distribution's repository - - `autojump` - Jump to directories with j or jc for child or jo to open in file manager + - Consider security here - autojump is ok on local machine, but I wouldn't recommend deploying it on server due to some security concerns + `autojump` - Jump to directories with j or jc for child or jo to open in file manager - `zsh` - the shell itself ### Recomended for `powerlevel10k` - [`nerd-fonts`](https://github.com/ryanoasis/nerd-fonts "nerd-fonts github page") - I recomend `MesloLGS NF Regular` -- 2.45.2 From f0b02fe1e7961ea9d64740634c0692e66ab6c3e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Wed, 10 Nov 2021 23:19:21 +0100 Subject: [PATCH 31/32] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 979bd08..ab1086c 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ ln -s ~/zsh/zshrc.pure ~/.zsh - `powerlevel10k` theme - The the actual theme - `pure` - Pure shell look for zsh ### Get this from your distribution's repository - - Consider security here - autojump is ok on local machine, but I wouldn't recommend deploying it on server due to some security concerns + - Consider security here - autojump is ok on local machine, but I wouldn't recommend deploying it on public server due to some security concerns `autojump` - Jump to directories with j or jc for child or jo to open in file manager - `zsh` - the shell itself ### Recomended for `powerlevel10k` -- 2.45.2 From f646bdaf2220475ca07419be54ac8ed6ed1a3293 Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Sun, 14 Nov 2021 18:37:36 +0100 Subject: [PATCH 32/32] Add stuff to aliasrc --- aliasrc | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/aliasrc b/aliasrc index 8d3e883..6035ea4 100644 --- a/aliasrc +++ b/aliasrc @@ -1,5 +1,5 @@ ##pacman-update country -country=CS +update=CZ # # # ex - archive extractor @@ -34,8 +34,8 @@ echo test; pacmanupdate () { - echo "Enter your country (like 'US' or 'CZ')" - read update + echo "Enter your country (like 'US' or 'CZ')"; + read update; sudo reflector -c $update -f 12 -l 10 -n 12 --save /etc/pacman.d/mirrorlist; } @@ -92,3 +92,20 @@ alias cp='cp -i' alias mv='mv -i' alias wallpaper=/home/jirka/.local/bin/wallpaper + +gitpush() { + git add . + git commit -m "$*" + git pull + git push +} +gitupdate() { + eval "$(ssh-agent -s)" + ssh-add ~/.ssh/github + ssh -T git@github.com +} +alias gp=gitpush +alias gu=gitupdate +alias update-grub='sudo grub-mkconfig -o /boot/grub/grub.cfg' +#alias firefox='GTK_USE_PORTAL=1 firefox' +alias cls="clear" -- 2.45.2