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/33] 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/33] 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/33] 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/33] 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/33] 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/33] 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/33] 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 b965944584c22e61aa6685155fef9ee5a4325a11 Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Fri, 9 Oct 2020 20:30:40 +0200 Subject: [PATCH 08/33] 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 09/33] 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 10/33] 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 11/33] 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 12/33] 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 13/33] 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 14/33] 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 15/33] 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 16/33] 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 17/33] 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 18/33] 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 19/33] 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 20/33] 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 From fc339c7bcda8a174d2c41d025b76ed01318a89df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sun, 14 Nov 2021 18:45:55 +0100 Subject: [PATCH 21/33] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ab1086c..9b11bc8 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ ln -s ~/zsh/zshrc.pure ~/.zsh - `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 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 20b7749295fa72d6b550659d6e203d1fddf35cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sun, 14 Nov 2021 18:47:07 +0100 Subject: [PATCH 22/33] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9b11bc8..b15745b 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,9 @@ ln -s ~/zsh/zshrc.pure ~/.zsh 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: -```chsch $USER``` +- ```chsch $USER``` +- Input your password +- Input `/bin/zsh` #### Modifying `/etc/passwd` * Find line containing your username * Put your username instead of `user` -- 2.45.2 From 2962bd7accbbae6770282b532c84016c80cce385 Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Sun, 14 Nov 2021 19:19:33 +0100 Subject: [PATCH 23/33] Changes in README.md --- README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6260c3b..e58a933 100644 --- a/README.md +++ b/README.md @@ -35,12 +35,12 @@ ln -s ~/zsh/zshrc.pure ~/.zsh ### Get this from your distribution's repository ### Debian Dependencies - ```bash + ``` sudo apt install autojump zsh ``` ### Arch Dependencies - ```bash + ``` yay -S autojump zsh ``` @@ -55,15 +55,14 @@ To set zsh as default shell for your user, edit `/etc/passwd` (from `/bin/bash` ```chsch $USER``` #### Modifying `/etc/passwd` - * Change your user in /etc/passwd to /bin/zsh instead of /bin/bash + * Change your user in `/etc/passwd` to `/bin/zsh` instead of `/bin/bash`
* Find line containing your username - * Put your username instead of `user` -From: `user:x:1000:1000::/home/user:/bin/bash` +From: ...`:/bin/bash` -To: `user:x:1000:1000::/home/user:/bin/zsh` +To: ...`:/bin/zsh`
## What I used -- 2.45.2 From 14f87314bef1780338969f0b0ccb72628e454d8f Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Sun, 14 Nov 2021 19:21:50 +0100 Subject: [PATCH 24/33] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e58a933..14e79d9 100644 --- a/README.md +++ b/README.md @@ -59,10 +59,10 @@ To set zsh as default shell for your user, edit `/etc/passwd` (from `/bin/bash`
* Find line containing your username + * Change the end of the line + From: ...`:/bin/bash` -From: ...`:/bin/bash` - -To: ...`:/bin/zsh` + To: ...`:/bin/zsh`
## What I used -- 2.45.2 From 23cb2aebc9749f0865429246675ee3a17167a680 Mon Sep 17 00:00:00 2001 From: TheAwesomeGuy47 <77284265+TheAwesomeGuy47@users.noreply.github.com> Date: Sat, 4 Dec 2021 13:32:48 +0000 Subject: [PATCH 25/33] Fix minor spelling error --- .zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index cd0ce4d..6a731aa 100644 --- a/.zshrc +++ b/.zshrc @@ -5,7 +5,7 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]] source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" fi -# Dependancies You Need for this Config +# Dependencies 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 # zsh-autosuggestions - Suggestions based on your history -- 2.45.2 From e1244d4850d0334f087051c2c655d153d9022869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sun, 9 Jan 2022 04:42:33 +0100 Subject: [PATCH 26/33] Add plugins to my config TODO: Update README.md --- .gitmodules | 12 ++ aliasrc | 30 +-- git | 1 + oh-my-zsh-dirhistory/dirhistory.plugin.zsh | 221 +++++++++++++++++++++ ssh-connect | 1 + web-search | 1 + zsh-you-should-use | 1 + zshrc | 12 +- 8 files changed, 264 insertions(+), 15 deletions(-) create mode 160000 git create mode 100644 oh-my-zsh-dirhistory/dirhistory.plugin.zsh create mode 160000 ssh-connect create mode 160000 web-search create mode 160000 zsh-you-should-use diff --git a/.gitmodules b/.gitmodules index 651b0d9..bdf33ec 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,15 @@ [submodule "powerlevel10k"] path = powerlevel10k url = https://github.com/romkatv/powerlevel10k.git +[submodule "zsh-you-should-use"] + path = zsh-you-should-use + url = git@github.com:MichaelAquilina/zsh-you-should-use.git +[submodule "ssh-connect"] + path = ssh-connect + url = git@github.com:gko/ssh-connect.git +[submodule "web-search"] + path = web-search + url = git@github.com:sineto/web-search.git +[submodule "git"] + path = git + url = git@github.com:davidde/git.git diff --git a/aliasrc b/aliasrc index d6ba85f..0336feb 100644 --- a/aliasrc +++ b/aliasrc @@ -43,7 +43,7 @@ export EDITOR=nano alias pacman-update='sudo reflector -c $country -f 12 -l 10 -n 12 --save /etc/pacman.d/mirrorlist' -alias ls='ls' +alias ls='ls --color' alias ll='ls -l' # ls, the common ones I use a lot shortened for rapid fire usage alias l='ls -lFh' #size,show type,human readable @@ -95,20 +95,22 @@ alias wallpaper=/home/$USER/.local/bin/wallpaper #alias vim='vim' #alias vi='vim' -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 +#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" + +alias sshc='ssh-connect' diff --git a/git b/git new file mode 160000 index 0000000..b60e5e3 --- /dev/null +++ b/git @@ -0,0 +1 @@ +Subproject commit b60e5e36c65f76a29eeacbfb7f5de1cd00c86115 diff --git a/oh-my-zsh-dirhistory/dirhistory.plugin.zsh b/oh-my-zsh-dirhistory/dirhistory.plugin.zsh new file mode 100644 index 0000000..7021fc0 --- /dev/null +++ b/oh-my-zsh-dirhistory/dirhistory.plugin.zsh @@ -0,0 +1,221 @@ +## +# Navigate directory history using ALT-LEFT and ALT-RIGHT. ALT-LEFT moves back to directories +# that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT. +# +# Navigate directory hierarchy using ALT-UP and ALT-DOWN. +# ALT-UP moves to higher hierarchy (cd ..) +# ALT-DOWN moves into the first directory found in alphabetical order +# + +dirhistory_past=($PWD) +dirhistory_future=() +export dirhistory_past +export dirhistory_future + +export DIRHISTORY_SIZE=30 + +# Pop the last element of dirhistory_past. +# Pass the name of the variable to return the result in. +# Returns the element if the array was not empty, +# otherwise returns empty string. +function pop_past() { + typeset -g $1="${dirhistory_past[$#dirhistory_past]}" + if [[ $#dirhistory_past -gt 0 ]]; then + dirhistory_past[$#dirhistory_past]=() + fi +} + +function pop_future() { + typeset -g $1="${dirhistory_future[$#dirhistory_future]}" + if [[ $#dirhistory_future -gt 0 ]]; then + dirhistory_future[$#dirhistory_future]=() + fi +} + +# Push a new element onto the end of dirhistory_past. If the size of the array +# is >= DIRHISTORY_SIZE, the array is shifted +function push_past() { + if [[ $#dirhistory_past -ge $DIRHISTORY_SIZE ]]; then + shift dirhistory_past + fi + if [[ $#dirhistory_past -eq 0 || $dirhistory_past[$#dirhistory_past] != "$1" ]]; then + dirhistory_past+=($1) + fi +} + +function push_future() { + if [[ $#dirhistory_future -ge $DIRHISTORY_SIZE ]]; then + shift dirhistory_future + fi + if [[ $#dirhistory_future -eq 0 || $dirhistory_futuret[$#dirhistory_future] != "$1" ]]; then + dirhistory_future+=($1) + fi +} + +# Called by zsh when directory changes +autoload -U add-zsh-hook +add-zsh-hook chpwd chpwd_dirhistory +function chpwd_dirhistory() { + push_past $PWD + # If DIRHISTORY_CD is not set... + if [[ -z "${DIRHISTORY_CD+x}" ]]; then + # ... clear future. + dirhistory_future=() + fi +} + +function dirhistory_cd(){ + DIRHISTORY_CD="1" + cd $1 + unset DIRHISTORY_CD +} + +# Move backward in directory history +function dirhistory_back() { + local cw="" + local d="" + # Last element in dirhistory_past is the cwd. + + pop_past cw + if [[ "" == "$cw" ]]; then + # Someone overwrote our variable. Recover it. + dirhistory_past=($PWD) + return + fi + + pop_past d + if [[ "" != "$d" ]]; then + dirhistory_cd $d + push_future $cw + else + push_past $cw + fi +} + + +# Move forward in directory history +function dirhistory_forward() { + local d="" + + pop_future d + if [[ "" != "$d" ]]; then + dirhistory_cd $d + push_past $d + fi +} + + +# Bind keys to history navigation +function dirhistory_zle_dirhistory_back() { + # Erase current line in buffer + zle .kill-buffer + dirhistory_back + zle .accept-line +} + +function dirhistory_zle_dirhistory_future() { + # Erase current line in buffer + zle .kill-buffer + dirhistory_forward + zle .accept-line +} + +zle -N dirhistory_zle_dirhistory_back +zle -N dirhistory_zle_dirhistory_future + +for keymap in emacs vicmd viins; do + # dirhistory_back + bindkey -M $keymap "\e[3D" dirhistory_zle_dirhistory_back # xterm in normal mode + bindkey -M $keymap "\e[1;3D" dirhistory_zle_dirhistory_back # xterm in normal mode + bindkey -M $keymap "\e\e[D" dirhistory_zle_dirhistory_back # Putty + bindkey -M $keymap "\eO3D" dirhistory_zle_dirhistory_back # GNU screen + + case "$TERM_PROGRAM" in + Apple_Terminal) bindkey -M $keymap "^[b" dirhistory_zle_dirhistory_back ;; # Terminal.app + iTerm.app) bindkey -M $keymap "^[^[[D" dirhistory_zle_dirhistory_back ;; # iTerm2 + esac + + if (( ${+terminfo[kcub1]} )); then + bindkey -M $keymap "^[${terminfo[kcub1]}" dirhistory_zle_dirhistory_back # urxvt + fi + + # dirhistory_future + bindkey -M $keymap "\e[3C" dirhistory_zle_dirhistory_future # xterm in normal mode + bindkey -M $keymap "\e[1;3C" dirhistory_zle_dirhistory_future # xterm in normal mode + bindkey -M $keymap "\e\e[C" dirhistory_zle_dirhistory_future # Putty + bindkey -M $keymap "\eO3C" dirhistory_zle_dirhistory_future # GNU screen + + case "$TERM_PROGRAM" in + Apple_Terminal) bindkey -M $keymap "^[f" dirhistory_zle_dirhistory_future ;; # Terminal.app + iTerm.app) bindkey -M $keymap "^[^[[C" dirhistory_zle_dirhistory_future ;; # iTerm2 + esac + + if (( ${+terminfo[kcuf1]} )); then + bindkey -M $keymap "^[${terminfo[kcuf1]}" dirhistory_zle_dirhistory_future # urxvt + fi +done + +# +# HIERARCHY Implemented in this section, in case someone wants to split it to another plugin if it clashes bindings +# + +# Move up in hierarchy +function dirhistory_up() { + cd .. || return 1 +} + +# Move down in hierarchy +function dirhistory_down() { + cd "$(find . -mindepth 1 -maxdepth 1 -type d | sort -n | head -n 1)" || return 1 +} + + +# Bind keys to hierarchy navigation +function dirhistory_zle_dirhistory_up() { + zle .kill-buffer # Erase current line in buffer + dirhistory_up + zle .accept-line +} + +function dirhistory_zle_dirhistory_down() { + zle .kill-buffer # Erase current line in buffer + dirhistory_down + zle .accept-line +} + +zle -N dirhistory_zle_dirhistory_up +zle -N dirhistory_zle_dirhistory_down + +for keymap in emacs vicmd viins; do + # dirhistory_up + bindkey -M $keymap "\e[3A" dirhistory_zle_dirhistory_up # xterm in normal mode + bindkey -M $keymap "\e[1;3A" dirhistory_zle_dirhistory_up # xterm in normal mode + bindkey -M $keymap "\e\e[A" dirhistory_zle_dirhistory_up # Putty + bindkey -M $keymap "\eO3A" dirhistory_zle_dirhistory_up # GNU screen + + case "$TERM_PROGRAM" in + Apple_Terminal) bindkey -M $keymap "^[[A" dirhistory_zle_dirhistory_up ;; # Terminal.app + iTerm.app) bindkey -M $keymap "^[^[[A" dirhistory_zle_dirhistory_up ;; # iTerm2 + esac + + if (( ${+terminfo[kcuu1]} )); then + bindkey -M $keymap "^[${terminfo[kcuu1]}" dirhistory_zle_dirhistory_up # urxvt + fi + + # dirhistory_down + bindkey -M $keymap "\e[3B" dirhistory_zle_dirhistory_down # xterm in normal mode + bindkey -M $keymap "\e[1;3B" dirhistory_zle_dirhistory_down # xterm in normal mode + bindkey -M $keymap "\e\e[B" dirhistory_zle_dirhistory_down # Putty + bindkey -M $keymap "\eO3B" dirhistory_zle_dirhistory_down # GNU screen + + case "$TERM_PROGRAM" in + Apple_Terminal) bindkey -M $keymap "^[[B" dirhistory_zle_dirhistory_down ;; # Terminal.app + iTerm.app) bindkey -M $keymap "^[^[[B" dirhistory_zle_dirhistory_down ;; # iTerm2 + esac + + if (( ${+terminfo[kcud1]} )); then + bindkey -M $keymap "^[${terminfo[kcud1]}" dirhistory_zle_dirhistory_down # urxvt + fi +done + +unset keymap diff --git a/ssh-connect b/ssh-connect new file mode 160000 index 0000000..788d90f --- /dev/null +++ b/ssh-connect @@ -0,0 +1 @@ +Subproject commit 788d90f761bd3f2f24bad3780aceef7cf1efee94 diff --git a/web-search b/web-search new file mode 160000 index 0000000..e2c498d --- /dev/null +++ b/web-search @@ -0,0 +1 @@ +Subproject commit e2c498dc9d573c731be69fb0d6000822ebe49185 diff --git a/zsh-you-should-use b/zsh-you-should-use new file mode 160000 index 0000000..773ae5f --- /dev/null +++ b/zsh-you-should-use @@ -0,0 +1 @@ +Subproject commit 773ae5f414b296b4100f1ab6668ecffdab795128 diff --git a/zshrc b/zshrc index af8573c..5e06a63 100644 --- a/zshrc +++ b/zshrc @@ -28,14 +28,24 @@ bindkey "^[[H" beginning-of-line bindkey "^[[F" end-of-line bindkey "^[[3~" delete-char -export PATH=$PATH:/home/jirka/.local/bin +# Some basic env setup +export PATH=$PATH:/home/$USER/.local/bin export DOTNET_CLI_TELEMETRY_OPTOUT=1 +export YSU_MESSAGE_POSITION="after" # Load aliases and shortcuts if existent. [ -f "$HOME/zsh/aliasrc" ] && source "$HOME/zsh/aliasrc" +# Initialize `thefuck` +eval $(thefuck --alias) + # 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 $HOME/zsh/zsh-you-should-use/you-should-use.plugin.zsh 2>/dev/null +source $HOME/zsh/git/git.plugin.zsh 2>/dev/null +source $HOME/zsh/ssh-connect/ssh-connect.sh 2>/dev/null +source $HOME/zsh/web-search/web_search.plugin.zsh 2>/dev/null +source $HOME/zsh/oh-my-zsh-dirhistory/dirhistory.plugin.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 4e514ef63caad53d49039ff0fcf34a172ba26ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sun, 9 Jan 2022 04:52:26 +0100 Subject: [PATCH 27/33] Add `zsh-z` plugin instead of autojump --- .gitmodules | 3 +++ zsh-z | 1 + zshrc | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 160000 zsh-z diff --git a/.gitmodules b/.gitmodules index bdf33ec..99b29f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "git"] path = git url = git@github.com:davidde/git.git +[submodule "zsh-z"] + path = zsh-z + url = git@github.com:agkozak/zsh-z.git diff --git a/zsh-z b/zsh-z new file mode 160000 index 0000000..b5e61d0 --- /dev/null +++ b/zsh-z @@ -0,0 +1 @@ +Subproject commit b5e61d03a42a84e9690de12915a006b6745c2a5f diff --git a/zshrc b/zshrc index 5e06a63..87ea32e 100644 --- a/zshrc +++ b/zshrc @@ -47,5 +47,6 @@ source $HOME/zsh/git/git.plugin.zsh 2>/dev/null source $HOME/zsh/ssh-connect/ssh-connect.sh 2>/dev/null source $HOME/zsh/web-search/web_search.plugin.zsh 2>/dev/null source $HOME/zsh/oh-my-zsh-dirhistory/dirhistory.plugin.zsh 2>/dev/null -source /usr/share/autojump/autojump.zsh 2>/dev/null +source $HOME/zsh/zsh-z/zsh-z.plugin.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 f3f96c3aa49d3130f0ee47eb2fb21f2415c0ee4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sun, 9 Jan 2022 12:34:55 +0100 Subject: [PATCH 28/33] Convert submodules from `ssh` to `https` --- .gitmodules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 99b29f1..d932b65 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,16 +12,16 @@ url = https://github.com/romkatv/powerlevel10k.git [submodule "zsh-you-should-use"] path = zsh-you-should-use - url = git@github.com:MichaelAquilina/zsh-you-should-use.git + url = https://github.com/MichaelAquilina/zsh-you-should-use.git [submodule "ssh-connect"] path = ssh-connect - url = git@github.com:gko/ssh-connect.git + url = https://github.com/gko/ssh-connect.git [submodule "web-search"] path = web-search - url = git@github.com:sineto/web-search.git + url = https://github.com/sineto/web-search.git [submodule "git"] path = git - url = git@github.com:davidde/git.git + url = https://github.com/davidde/git.git [submodule "zsh-z"] path = zsh-z - url = git@github.com:agkozak/zsh-z.git + url = https://github.com/agkozak/zsh-z.git -- 2.45.2 From 46acef850df62c66cfd1964d0210561844cb10a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sun, 9 Jan 2022 13:02:19 +0100 Subject: [PATCH 29/33] Update README.md --- README.md | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index b7bb342..c5b8091 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ My ZSH config ## Setup - Clone the repository to your home folder ``` +cd ~ git clone --recursive https://github.com/jiriks74/zsh ``` ### `powerlevel10k` theme @@ -28,38 +29,30 @@ 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 - - `powerlevel10k` theme - The the actual theme - - `pure` - Pure shell look for zsh - -### Get this from your distribution's repository - ### Debian Dependencies - ``` - sudo apt install autojump zsh - ``` - - ### Arch Dependencies - ``` - yay -S autojump zsh - ``` + - [`zsh-z`](https://github.com/agkozak/zsh-z) - ZSH plugin that is alternative to `autojump`. Use `z dirname`to go to a specific directory on your system without having to type the whole path (eg `z et` will get you to `/etc`) + - [`dirhistory`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/dirhistory) - Plugin from oh my zsh that allows you to easily go through history of directories (due to this not being a repository I have to update this plugin manually. If it's out of date, please create an issue) + - [`ssh-connect`](https://github.com/gko/ssh-connect) - Plugin that logs your `ssh` commands and provides a nice menu with your recent connections (alias: `sshc`) + - [`web-search`](https://github.com/sineto/web-search) - Allows you to DuckDuckGo, Google, etc. directly from your zsh. just run `ddg` or `google` + - [`zsh-you-should-use`](https://github.com/MichaelAquilina/zsh-you-should-use) - Usefull plugin that suggest existing aliases for a command you just ran (try it out with `ls -l`) + - [`zsh-autosuggestions`](https://github.com/zsh-users/zsh-autosuggestions) - Suggestions based on your history + - [`git`](https://github.com/davidde/git) - Usefull git aliases + - [`zsh-syntax-highlighting`](https://github.com/zsh-users/zsh-syntax-highlighting) - Syntax highlighting for ZSH + - [`powerlevel10k`](https://github.com/romkatv/powerlevel10k) theme - The the actual theme + - [`pure`](https://github.com/sindresorhus/pure) - Pure shell look for zsh ### Recomended for `powerlevel10k` - [`nerd-fonts`](https://github.com/ryanoasis/nerd-fonts "nerd-fonts github page") - I recomend `MesloLGS NF Regular` + - On Arch you can use `ttf-meslo-nerd-font-powerlevel10k` so you don't have to donwload the whole git repository ## 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: -<<<<<<< HEAD -```chsch $USER``` - -======= - ```chsch $USER``` - Input your password - Input `/bin/zsh` ->>>>>>> master + #### Modifying `/etc/passwd` * Change your user in `/etc/passwd` to `/bin/zsh` instead of `/bin/bash`
@@ -70,6 +63,3 @@ 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, `powerlevel10k` theme and `pure` -- 2.45.2 From fa4d1907e022906b8995ea8f267808a54ab6b422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sun, 9 Jan 2022 13:38:13 +0100 Subject: [PATCH 30/33] Get rid of error if `thefuck` is not installed --- zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zshrc b/zshrc index 87ea32e..c725632 100644 --- a/zshrc +++ b/zshrc @@ -37,7 +37,7 @@ export YSU_MESSAGE_POSITION="after" [ -f "$HOME/zsh/aliasrc" ] && source "$HOME/zsh/aliasrc" # Initialize `thefuck` -eval $(thefuck --alias) +eval $(thefuck --alias) 2>/dev/null # Load ; should be last. source $HOME/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh 2>/dev/null -- 2.45.2 From 2fc79eb99ad30858e4b585ea11ce5494a7c13296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sun, 9 Jan 2022 13:41:48 +0100 Subject: [PATCH 31/33] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index c5b8091..1a044ef 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,9 @@ ln -s ~/zsh/zshrc.pure ~/.zsh - [`powerlevel10k`](https://github.com/romkatv/powerlevel10k) theme - The the actual theme - [`pure`](https://github.com/sindresorhus/pure) - Pure shell look for zsh +### Install from your distribution's repository + - [`thefuck`](https://github.com/nvbn/thefuck) - Corrects errors in previous console commands (when you mess up a command, type `fuck`) + ### Recomended for `powerlevel10k` - [`nerd-fonts`](https://github.com/ryanoasis/nerd-fonts "nerd-fonts github page") - I recomend `MesloLGS NF Regular` - On Arch you can use `ttf-meslo-nerd-font-powerlevel10k` so you don't have to donwload the whole git repository -- 2.45.2 From 62b9457dea7527a178bf97164b49bd613168a80c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sun, 9 Jan 2022 14:05:25 +0100 Subject: [PATCH 32/33] Fix the error that appears when `thefuck` is not installed --- aliasrc | 5 ----- zshrc | 6 +++++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/aliasrc b/aliasrc index 0336feb..315b2e1 100644 --- a/aliasrc +++ b/aliasrc @@ -27,11 +27,6 @@ ex () fi } -test () -{ -echo test; -} - pacmanupdate () { echo "Enter your country (like 'US' or 'CZ')"; diff --git a/zshrc b/zshrc index 87ea32e..86a48d4 100644 --- a/zshrc +++ b/zshrc @@ -37,7 +37,11 @@ export YSU_MESSAGE_POSITION="after" [ -f "$HOME/zsh/aliasrc" ] && source "$HOME/zsh/aliasrc" # Initialize `thefuck` -eval $(thefuck --alias) +if command -v thefuck &> /dev/null +then + eval $(thefuck --alias) +fi + # Load ; should be last. source $HOME/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh 2>/dev/null -- 2.45.2 From 94d7fa374955afd6d570bd3a0e4992b5bfd5154f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sun, 9 Jan 2022 14:24:33 +0100 Subject: [PATCH 33/33] Update submodules --- powerlevel10k | 2 +- pure | 2 +- zsh-autosuggestions | 2 +- zsh-syntax-highlighting | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/powerlevel10k b/powerlevel10k index f2bf019..683a485 160000 --- a/powerlevel10k +++ b/powerlevel10k @@ -1 +1 @@ -Subproject commit f2bf0197581abb8bde529e6b492710948549ba7f +Subproject commit 683a485232d75978a79199a305c4fc4843772a77 diff --git a/pure b/pure index c42bd35..90dc9cf 160000 --- a/pure +++ b/pure @@ -1 +1 @@ -Subproject commit c42bd354943ba4cf2da3ecf493fca4fef0b2722c +Subproject commit 90dc9cf908481cc155e1ce5611f684916523fc30 diff --git a/zsh-autosuggestions b/zsh-autosuggestions index ae315de..a411ef3 160000 --- a/zsh-autosuggestions +++ b/zsh-autosuggestions @@ -1 +1 @@ -Subproject commit ae315ded4dba10685dbbafbfa2ff3c1aefeb490d +Subproject commit a411ef3e0992d4839f0732ebeb9823024afaaaa8 diff --git a/zsh-syntax-highlighting b/zsh-syntax-highlighting index 6fd92e1..c7caf57 160000 --- a/zsh-syntax-highlighting +++ b/zsh-syntax-highlighting @@ -1 +1 @@ -Subproject commit 6fd92e1bbd927119e8fbb2d8f50d4cd9a6bcb6d9 +Subproject commit c7caf57ca805abd54f11f756fda6395dd4187f8a -- 2.45.2