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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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/50] 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 From efb8d6beb47e3ff77ad4b561516e7fabced020a9 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:35:29 +0100 Subject: [PATCH 34/50] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a044ef..c1f8c63 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ p10k config ln -s ~/zsh/zshrc.pure ~/.zsh ``` -## Get Dependancies +## Get Dependencies ### Included in this repository - [`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`) -- 2.45.2 From fc568d408e8861cf7013d26fe658c0432a98f67d 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:41:10 +0100 Subject: [PATCH 35/50] Update README.md --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index c1f8c63..33bcc27 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,13 @@ My ZSH config cd ~ git clone --recursive https://github.com/jiriks74/zsh ``` + +## Updating +``` +cd ~/zsh +git pull --recurse-submodules +``` + ### `powerlevel10k` theme - Link the `zsh` file to your home folder as `.zshrc` ``` -- 2.45.2 From 28e8d73ad68810c5a24c5907ecfc7b9a6582df91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sun, 9 Jan 2022 18:15:59 +0100 Subject: [PATCH 36/50] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 33bcc27..dd15ec0 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ git clone --recursive https://github.com/jiriks74/zsh ``` cd ~/zsh git pull --recurse-submodules +git submodule update --init --recursive ``` ### `powerlevel10k` theme -- 2.45.2 From 51756a6bbb3513a85826baf9e24e60399ac48d2f Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 9 Jan 2022 18:31:41 +0100 Subject: [PATCH 37/50] Update README.md --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index dd15ec0..8b7d65c 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,15 @@ git pull --recurse-submodules git submodule update --init --recursive ``` +### Problems with updating (this will delete any customizations you have made in `~/zsh` + - If you get `fatal: refusing to merge unrelated histories` you have changes in `~zsh` that are not in the repository + - If you have backed up your customizations (if you have any) this will delete all differences between `~/zsh` and the repository +``` +cd ~/zsh +git fetch +git reset --hard origin/master +``` + ### `powerlevel10k` theme - Link the `zsh` file to your home folder as `.zshrc` ``` -- 2.45.2 From 5f565d7c0453b52b95469e88474d115c3bea608c Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 9 Jan 2022 19:45:38 +0100 Subject: [PATCH 38/50] Deprecate pure theme You can configure pure theme in `powerlevel10k` --- .gitmodules | 3 --- README.md | 6 ------ pure | 1 - zshrc.pure | 62 ----------------------------------------------------- 4 files changed, 72 deletions(-) delete mode 160000 pure delete mode 100644 zshrc.pure diff --git a/.gitmodules b/.gitmodules index d932b65..051a88f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "pure"] - path = pure - url = https://github.com/sindresorhus/pure [submodule "zsh-autosuggestions"] path = zsh-autosuggestions url = https://github.com/zsh-users/zsh-autosuggestions diff --git a/README.md b/README.md index 8b7d65c..0a0f785 100644 --- a/README.md +++ b/README.md @@ -37,11 +37,6 @@ zsh ``` p10k config ``` -### `pure` shell theme - - Link the `zsh.pure` file to your home folder as `.zshrc` -``` -ln -s ~/zsh/zshrc.pure ~/.zsh -``` ## Get Dependencies @@ -55,7 +50,6 @@ ln -s ~/zsh/zshrc.pure ~/.zsh - [`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 ### 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`) diff --git a/pure b/pure deleted file mode 160000 index 90dc9cf..0000000 --- a/pure +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 90dc9cf908481cc155e1ce5611f684916523fc30 diff --git a/zshrc.pure b/zshrc.pure deleted file mode 100644 index b7bb882..0000000 --- a/zshrc.pure +++ /dev/null @@ -1,62 +0,0 @@ -# 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 - -# 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 - -# Initial Setup -# 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 -PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b " - -# Custom Variables -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 -SAVEHIST=10000 -HISTFILE=~/.cache/zshhistory -setopt appendhistory - -# 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 -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 9c442d2a8e93dc1a66859ffcb99cea3679999f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sun, 9 Jan 2022 19:52:03 +0100 Subject: [PATCH 39/50] Update README.md --- README.md | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 0a0f785..6aba390 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,18 @@ My ZSH config ``` cd ~ git clone --recursive https://github.com/jiriks74/zsh +``` + - Link the `zsh` file to your home folder as `.zshrc` +``` +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 ``` ## Updating @@ -24,20 +36,6 @@ git fetch git reset --hard origin/master ``` -### `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 -``` -zsh -``` - - If configuration won't start automatically, just run -``` -p10k config -``` - ## Get Dependencies ### Included in this repository -- 2.45.2 From 1981ef517ebb7a86d3e6be1727ed8cf871f63769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sun, 9 Jan 2022 19:53:39 +0100 Subject: [PATCH 40/50] Update README.md --- README.md | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 6aba390..19cde7d 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,23 @@ zsh ``` p10k config ``` + - Set `zsh` as your default shell +### There are two ways: +#### Running this command: +- ```chsch $USER``` +- Input your password +- Input `/bin/zsh` + +#### Modifying `/etc/passwd` + * Change your user in `/etc/passwd` to `/bin/zsh` instead of `/bin/bash` +
+ + * Find line containing your username + * Change the end of the line + From: ...`:/bin/bash` + + To: ...`:/bin/zsh` +
## Updating ``` @@ -55,23 +72,3 @@ git reset --hard origin/master ### 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: -- ```chsch $USER``` -- Input your password -- Input `/bin/zsh` - -#### Modifying `/etc/passwd` - * Change your user in `/etc/passwd` to `/bin/zsh` instead of `/bin/bash` -
- - * Find line containing your username - * Change the end of the line - From: ...`:/bin/bash` - - To: ...`:/bin/zsh` -
-- 2.45.2 From e61330da609b7be0576f8fac444e2db1e223ff41 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 16 Jan 2022 10:57:18 +0100 Subject: [PATCH 41/50] Add binds for CTRL + left/right arrow keys --- zshrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zshrc b/zshrc index b096726..a2d4100 100644 --- a/zshrc +++ b/zshrc @@ -26,6 +26,8 @@ _comp_options+=(globdots) # Include hidden files. bindkey '^ ' autosuggest-accept bindkey "^[[H" beginning-of-line bindkey "^[[F" end-of-line +bindkey "^[[1;5C" forward-word +bindkey "^[[1;5D" backward-word bindkey "^[[3~" delete-char # Some basic env setup -- 2.45.2 From ab5c45980130bf988422351713bc53b26c9461dc Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Wed, 19 Jan 2022 22:35:27 +0100 Subject: [PATCH 42/50] Add `custom-zsh` file option Add option to customize the config without having to resolve problems every time you need to pull on updates --- .gitignore | 1 + README.md | 6 ++++++ zshrc | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ac235e3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +custom-zshrc diff --git a/README.md b/README.md index 19cde7d..e5ae372 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,12 @@ # ZSH My ZSH config +## Your own customizations +If you want to make any customizations to your config without deleting them, or merging them, every time I update, here's the solution: + - Make a file called `custom-zshrc` in your `$HOME/zsh` directory + - Put your customizations in that file +The file is in `.gitignore`, so it won't interfere with the repository and you can pull updates without resolving differences between local files and the repository. It is also set to be sourced in the `zshrc` file, so you really don't have to set up anything, just add the customizations. + ## Setup - Clone the repository to your home folder ``` diff --git a/zshrc b/zshrc index a2d4100..38193f2 100644 --- a/zshrc +++ b/zshrc @@ -53,5 +53,5 @@ 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 $HOME/zsh/zsh-z/zsh-z.plugin.zsh 2>/dev/null -#source /usr/share/autojump/autojump.zsh 2>/dev/null +sourcd $HOME/zsh/custom-zshrc 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 3149ef0f8a22f0763a22696bbeb459600f1c3383 Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Thu, 20 Jan 2022 23:03:48 +0100 Subject: [PATCH 43/50] Fix spelling error --- zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zshrc b/zshrc index 38193f2..66507f1 100644 --- a/zshrc +++ b/zshrc @@ -53,5 +53,5 @@ 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 $HOME/zsh/zsh-z/zsh-z.plugin.zsh 2>/dev/null -sourcd $HOME/zsh/custom-zshrc 2>/dev/null +source $HOME/zsh/custom-zshrc 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 ff051bbbda7793c853904d3d2a3d4754562c8a94 Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Mon, 7 Feb 2022 18:27:24 +0100 Subject: [PATCH 44/50] I forgot to add a license lol --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. -- 2.45.2 From ccf482aba95bc34e5bb7d5ad9e09a891879980c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Mon, 21 Mar 2022 12:19:35 +0100 Subject: [PATCH 45/50] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e5ae372..3a95a5b 100644 --- a/README.md +++ b/README.md @@ -77,4 +77,7 @@ git reset --hard origin/master ### 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 + - On Arch you can use `ttf-meslo-nerd-font-powerlevel10k` so you don't have to donwload the whole git repository¨¨ + +## Stats +![Alt](https://repobeats.axiom.co/api/embed/0af45810ad05b4ddd92d30b2d1fa5a63be0d5bc0.svg "Repobeats analytics image") -- 2.45.2 From 39985da03662efb11234258bc58e055832e5e904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Tue, 17 Jan 2023 14:37:15 +0100 Subject: [PATCH 46/50] Add find-the-command plugin --- .gitmodules | 3 +++ find-the-command | 1 + zshrc | 1 + 3 files changed, 5 insertions(+) create mode 160000 find-the-command diff --git a/.gitmodules b/.gitmodules index 051a88f..81e2cb6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "zsh-z"] path = zsh-z url = https://github.com/agkozak/zsh-z.git +[submodule "find-the-command"] + path = find-the-command + url = https://github.com/pkasemir/find-the-command diff --git a/find-the-command b/find-the-command new file mode 160000 index 0000000..fecba1a --- /dev/null +++ b/find-the-command @@ -0,0 +1 @@ +Subproject commit fecba1a6e84a431baabe41cc23ea2068e85b46af diff --git a/zshrc b/zshrc index 66507f1..a3b57b7 100644 --- a/zshrc +++ b/zshrc @@ -54,4 +54,5 @@ 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 $HOME/zsh/zsh-z/zsh-z.plugin.zsh 2>/dev/null source $HOME/zsh/custom-zshrc 2>/dev/null +source $HOME/zsh/find-the-command/usr/share/doc/find-the-command/ftc.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 4d1b2abfc8da124054463b8cddf9882bccfdc92f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Mon, 27 Feb 2023 07:06:05 +0100 Subject: [PATCH 47/50] Delete obsolete function, fix newline in pacmanupdate, remove obsolete comments --- aliasrc | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/aliasrc b/aliasrc index 315b2e1..7611b1a 100644 --- a/aliasrc +++ b/aliasrc @@ -1,7 +1,3 @@ -##pacman-update country -update=CZ - -# # # ex - archive extractor # # usage: ex ex () @@ -29,15 +25,14 @@ ex () pacmanupdate () { - echo "Enter your country (like 'US' or 'CZ')"; - read update; + echo -n "Enter the country code for the mirrorlist you want to use (default: CZ): " + read -t 10 update; + if [ -z "$update" ]; then + update=CZ; + fi sudo reflector -c $update -f 12 -l 10 -n 12 --save /etc/pacman.d/mirrorlist; } -export EDITOR=nano - -alias pacman-update='sudo reflector -c $country -f 12 -l 10 -n 12 --save /etc/pacman.d/mirrorlist' - alias ls='ls --color' alias ll='ls -l' # ls, the common ones I use a lot shortened for rapid fire usage @@ -88,24 +83,8 @@ alias mv='mv -i' 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 - -alias update-grub='sudo grub-mkconfig -o /boot/grub/grub.cfg' -#alias firefox='GTK_USE_PORTAL=1 firefox' +# 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' -- 2.45.2 From 46d72b0a761f2e09f6e83e4729c1e80ca891d658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sat, 4 Mar 2023 06:40:56 +0100 Subject: [PATCH 48/50] Create FUNDING.yml --- .github/FUNDING.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..26c9799 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,13 @@ +# These are supported funding model platforms + +github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: # Replace with a single Patreon username +open_collective: # Replace with a single Open Collective username +ko_fi: jiriks74 # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username +issuehunt: # Replace with a single IssueHunt username +otechie: # Replace with a single Otechie username +lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry +custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] -- 2.45.2 From 648f2932fd8e0666532479a650ccdfded2ec9f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Fri, 8 Sep 2023 20:11:18 +0200 Subject: [PATCH 49/50] docs: Fix grammar and fix Markdown syntax MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jiří Štefka --- README.md | 119 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 83 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 3a95a5b..d387f4a 100644 --- a/README.md +++ b/README.md @@ -2,58 +2,86 @@ My ZSH config ## Your own customizations -If you want to make any customizations to your config without deleting them, or merging them, every time I update, here's the solution: + +If you want to make any customizations to your config without deleting them, +or merging them, every time I update, here's the solution: - Make a file called `custom-zshrc` in your `$HOME/zsh` directory - Put your customizations in that file -The file is in `.gitignore`, so it won't interfere with the repository and you can pull updates without resolving differences between local files and the repository. It is also set to be sourced in the `zshrc` file, so you really don't have to set up anything, just add the customizations. +The file is in `.gitignore`, so it won't interfere with the repository and you +can pull updates without resolving differences between local files and the repository. +It is also set to be sourced in the `zshrc` file, so you really don't have to +set up anything, just add the customizations. ## Setup - - Clone the repository to your home folder -``` + +- Clone the repository to your home folder + +```bash cd ~ git clone --recursive https://github.com/jiriks74/zsh ``` - - Link the `zsh` file to your home folder as `.zshrc` -``` + +- Link the `zsh` file to your home folder as `.zshrc` + +```bash ln -s ~/zsh/zshrc ~/.zshrc ``` - - Set the `powerlevel10k` theme the way you like it -``` + +- Set the `powerlevel10k` theme the way you like it + +```bash zsh ``` - - If configuration won't start automatically, just run -``` + +- If configuration won't start automatically, just run + +```bash p10k config ``` - - Set `zsh` as your default shell -### There are two ways: -#### Running this command: -- ```chsch $USER``` + +- Set `zsh` as your default shell + +### There are two ways + +#### Running `chsh` + +```bash +chsch $USER +``` + - Input your password - Input `/bin/zsh` #### 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 - * Change the end of the line - From: ...`:/bin/bash` +- Find line containing your username +- Change the end of the line - To: ...`:/bin/zsh` +From: ...`:/bin/bash` + +To: ...`:/bin/zsh`
## Updating -``` + +```bash cd ~/zsh git pull --recurse-submodules git submodule update --init --recursive ``` -### Problems with updating (this will delete any customizations you have made in `~/zsh` - - If you get `fatal: refusing to merge unrelated histories` you have changes in `~zsh` that are not in the repository - - If you have backed up your customizations (if you have any) this will delete all differences between `~/zsh` and the repository -``` +### Problems with updating (this will delete any customizations you have made in `~/zsh`) + +- If you get `fatal: refusing to merge unrelated histories` you have changes in +`~zsh` that are not in the repository +- If you have backed up your customizations (if you have any) this will delete +all differences between `~/zsh` and the repository + +```bash cd ~/zsh git fetch git reset --hard origin/master @@ -62,22 +90,41 @@ git reset --hard origin/master ## Get Dependencies ### Included in this repository - - [`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 + +- [`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 ### 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`) + +- [`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¨¨ + +- [`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¨¨ ## Stats + ![Alt](https://repobeats.axiom.co/api/embed/0af45810ad05b4ddd92d30b2d1fa5a63be0d5bc0.svg "Repobeats analytics image") -- 2.45.2 From 67ec85532736437139a3f8e50b31d6baac5591a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Fri, 8 Sep 2023 20:31:02 +0200 Subject: [PATCH 50/50] docs: Remove stats as they don't work on Gitea MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jiří Štefka --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index d387f4a..6a764e8 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,3 @@ console commands (when you mess up a command, type `fuck`) 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¨¨ - -## Stats - -![Alt](https://repobeats.axiom.co/api/embed/0af45810ad05b4ddd92d30b2d1fa5a63be0d5bc0.svg "Repobeats analytics image") -- 2.45.2