diff --git a/.gitmodules b/.gitmodules index f37c34e..29e86f7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,12 @@ -[submodule " .oh-my-zsh"] +[submodule ".oh-my-zsh"] path = .oh-my-zsh url = https://git.gc4.at/linux/ohmyzsh + +[submodule ".oh-my-zsh/custom/plugins/zsh-autosuggestions"] + path = .oh-my-zsh/custom/plugins/zsh-autosuggestions + url = https://git.gc4.at/linux/zsh-autosuggestions + +[submodule ".oh-my-zsh/custom/plugins/zsh-syntax-highlighting"] + path = .oh-my-zsh/custom/plugins/zsh-syntax-highlighting + url = https://git.gc4.at/linux/zsh-syntax-highlighting + diff --git a/.zshrc b/.zshrc index 899cd73..4c7c797 100644 --- a/.zshrc +++ b/.zshrc @@ -9,7 +9,7 @@ fi # export PATH=$HOME/bin:/usr/local/bin:$PATH # Path to your oh-my-zsh installation. -export ZSH="/home/elmar/.oh-my-zsh" +export ZSH="$HOME/.config_repos/zsh-settings/.oh-my-zsh" # Set name of the theme to load --- if set to "random", it will # load a random theme each time oh-my-zsh is loaded, in which case, @@ -79,8 +79,8 @@ ZSH_THEME="powerlevel10k/powerlevel10k" # Add wisely, as too many plugins slow down shell startup. plugins=( git - zsh-autosuggestions - zsh-syntax-highlighting + zsh-autosuggestions + zsh-syntax-highlighting sudo copydir copyfile @@ -92,8 +92,8 @@ plugins=( npm pip python - jump - web-search + jump + web-search battery colorize emacs @@ -103,7 +103,7 @@ plugins=( supervisor systemd vscode - zsh-colorls + #zsh-colorls ) source $ZSH/oh-my-zsh.sh @@ -187,8 +187,8 @@ alias histg="history | grep" ## vim as default editor export EDITOR=vim ##Civili Change between repo and play -alias civrepo="rm -f /home/elmar/.local/share/Steam/steamapps/common/Sid\ Meier\'s\ Civilization\ IV\ Beyond\ the\ Sword/Beyond\ the\ Sword/Mods/Better\ Choices && ln -s /home/elmar/.local/share/Steam/steamapps/common/Sid\ Meier\'s\ Civilization\ IV\ Beyond\ the\ Sword/Beyond\ the\ Sword/Mods/Better\ Choices_repo /home/elmar/.local/share/Steam/steamapps/common/Sid\ Meier\'s\ Civilization\ IV\ Beyond\ the\ Sword/Beyond\ the\ Sword/Mods/Better\ Choices" -alias civplay="rm -f /home/elmar/.local/share/Steam/steamapps/common/Sid\ Meier\'s\ Civilization\ IV\ Beyond\ the\ Sword/Beyond\ the\ Sword/Mods/Better\ Choices && ln -s /home/elmar/.local/share/Steam/steamapps/common/Sid\ Meier\'s\ Civilization\ IV\ Beyond\ the\ Sword/Beyond\ the\ Sword/Mods/Better\ Choices_play /home/elmar/.local/share/Steam/steamapps/common/Sid\ Meier\'s\ Civilization\ IV\ Beyond\ the\ Sword/Beyond\ the\ Sword/Mods/Better\ Choices" +alias civrepo="rm -f ~/.local/share/Steam/steamapps/common/Sid\ Meier\'s\ Civilization\ IV\ Beyond\ the\ Sword/Beyond\ the\ Sword/Mods/Better\ Choices && ln -s /home/elmar/.local/share/Steam/steamapps/common/Sid\ Meier\'s\ Civilization\ IV\ Beyond\ the\ Sword/Beyond\ the\ Sword/Mods/Better\ Choices_repo /home/elmar/.local/share/Steam/steamapps/common/Sid\ Meier\'s\ Civilization\ IV\ Beyond\ the\ Sword/Beyond\ the\ Sword/Mods/Better\ Choices" +alias civplay="rm -f ~/.local/share/Steam/steamapps/common/Sid\ Meier\'s\ Civilization\ IV\ Beyond\ the\ Sword/Beyond\ the\ Sword/Mods/Better\ Choices && ln -s /home/elmar/.local/share/Steam/steamapps/common/Sid\ Meier\'s\ Civilization\ IV\ Beyond\ the\ Sword/Beyond\ the\ Sword/Mods/Better\ Choices_play /home/elmar/.local/share/Steam/steamapps/common/Sid\ Meier\'s\ Civilization\ IV\ Beyond\ the\ Sword/Beyond\ the\ Sword/Mods/Better\ Choices" ## sshuttle to ssh.geo (root all traffic but local and ssh.geo itself) alias geossh="sshuttle --dns -r ssh -x 192.189.78.0/23 -x 192.168.178.0/23 -x 128.131.74.216 0/0" alias geoes="sshuttle --dns -r es -x 192.189.78.0/23 -x 192.168.178.0/23 -x 128.131.74.216 -x 128.131.72.92 -x 128.131.72.55 0/0" diff --git a/README.md b/README.md index 6b864d3..413e0ca 100644 --- a/README.md +++ b/README.md @@ -9,11 +9,36 @@ - https://git.gc4.at/linux/ohmyzsh - https://git.gc4.at/linux/colorls - https://git.gc4.at/linux/powerlevel10k + - https://git.gc4.at/linux/zsh-autosuggestions + - https://git.gc4.at/linux/zsh-syntax-highlighting + - Install - mkdir ~/.config_repos + - cd ~/.config_repos - - git clone https://git.gc4.at/linux/zsh-settings + + - git clone --recurse-submodules -j8 https://git.gc4.at/linux/zsh-settings.git + + - Use ssh if you want to commit also: + + git clone --recurse-submodules -j8 ssh://git@git.gc4.at:4258/linux/zsh-settings.git + + - --recurse-submodules -j8 is important since .oh-my-zsh and .oh-my-zsh/custom/plugins are also remote repos (int his repo) = submodules + - cd ~ + - ln -s .config_repos/zsh-settings/.zshrc + - ln -s .config_repos/zsh-settings/.p10k.zsh + - ln -s .config_repos/zsh-settings/.oh-my-zsh + + - Powerlevel10k + + - Already pre installed with (git clone --depth=1 https://git.gc4.at/linux/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k) + + - Update with: + + ``` + git -C ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k pull + ```