From 4b9fa5e6bcd07c0098fca402826b6c923f77d244 Mon Sep 17 00:00:00 2001 From: Fabio Scotto di Santolo Date: Sun, 2 Apr 2023 15:48:31 +0200 Subject: [PATCH] Add plugin in zsh configuration and move linux configuration under folder --- .p10k.zsh | 28 +++---- .profile | 8 ++ .zshenv-linux | 6 ++ .zshrc | 5 +- linux/.profile.d/go.sh | 4 + linux/.profile.d/graalvm.sh | 1 + linux/.profile.d/java.sh | 1 + linux/.profile.d/jmeter.sh | 2 + linux/.zshenv | 24 ++++++ linux/.zshrc | 152 ++++++++++++++++++++++++++++++++++++ linux/resolv.conf.head | 43 ++++++++++ linux/resolv.conf.tail | 1 + 12 files changed, 260 insertions(+), 15 deletions(-) create mode 100644 linux/.profile.d/go.sh create mode 100644 linux/.profile.d/graalvm.sh create mode 100644 linux/.profile.d/java.sh create mode 100644 linux/.profile.d/jmeter.sh create mode 100644 linux/.zshenv create mode 100644 linux/.zshrc create mode 100644 linux/resolv.conf.head create mode 100644 linux/resolv.conf.tail diff --git a/.p10k.zsh b/.p10k.zsh index cf17155..5b5c0e8 100644 --- a/.p10k.zsh +++ b/.p10k.zsh @@ -55,25 +55,25 @@ anaconda # conda environment (https://conda.io/) pyenv # python environment (https://github.com/pyenv/pyenv) goenv # go environment (https://github.com/syndbg/goenv) - nodenv # node.js version from nodenv (https://github.com/nodenv/nodenv) - nvm # node.js version from nvm (https://github.com/nvm-sh/nvm) - nodeenv # node.js environment (https://github.com/ekalinin/nodeenv) + # nodenv # node.js version from nodenv (https://github.com/nodenv/nodenv) + # nvm # node.js version from nvm (https://github.com/nvm-sh/nvm) + # nodeenv # node.js environment (https://github.com/ekalinin/nodeenv) # node_version # node.js version - # go_version # go version (https://golang.org) - # rust_version # rustc version (https://www.rust-lang.org) + go_version # go version (https://golang.org) + rust_version # rustc version (https://www.rust-lang.org) # dotnet_version # .NET version (https://dotnet.microsoft.com) # php_version # php version (https://www.php.net/) # laravel_version # laravel php framework version (https://laravel.com/) - # java_version # java version (https://www.java.com/) + java_version # java version (https://www.java.com/) # package # name@version from package.json (https://docs.npmjs.com/files/package.json) - rbenv # ruby version from rbenv (https://github.com/rbenv/rbenv) - rvm # ruby version from rvm (https://rvm.io) - fvm # flutter version management (https://github.com/leoafarias/fvm) - luaenv # lua version from luaenv (https://github.com/cehoffman/luaenv) - jenv # java version from jenv (https://github.com/jenv/jenv) - plenv # perl version from plenv (https://github.com/tokuhirom/plenv) - phpenv # php version from phpenv (https://github.com/phpenv/phpenv) - scalaenv # scala version from scalaenv (https://github.com/scalaenv/scalaenv) + # rbenv # ruby version from rbenv (https://github.com/rbenv/rbenv) + # rvm # ruby version from rvm (https://rvm.io) + # fvm # flutter version management (https://github.com/leoafarias/fvm) + # luaenv # lua version from luaenv (https://github.com/cehoffman/luaenv) + # jenv # java version from jenv (https://github.com/jenv/jenv) + # plenv # perl version from plenv (https://github.com/tokuhirom/plenv) + # phpenv # php version from phpenv (https://github.com/phpenv/phpenv) + # scalaenv # scala version from scalaenv (https://github.com/scalaenv/scalaenv) haskell_stack # haskell version from stack (https://haskellstack.org/) kubecontext # current kubernetes context (https://kubernetes.io/) terraform # terraform workspace (https://www.terraform.io) diff --git a/.profile b/.profile index 22c63a2..0c3aa6a 100644 --- a/.profile +++ b/.profile @@ -1,3 +1,5 @@ +# Fig pre block. Keep at the top of this file. +[[ -f "$HOME/.fig/shell/profile.pre.bash" ]] && builtin source "$HOME/.fig/shell/profile.pre.bash" # Load profiles from /etc/profile.d if test -d $HOME/.profile.d/; then for profile in $HOME/.profile.d/*.sh; do @@ -5,3 +7,9 @@ if test -d $HOME/.profile.d/; then done unset profile fi +<<<<<<< Updated upstream +======= + +# Fig post block. Keep at the bottom of this file. +[[ -f "$HOME/.fig/shell/profile.post.bash" ]] && builtin source "$HOME/.fig/shell/profile.post.bash" +>>>>>>> Stashed changes diff --git a/.zshenv-linux b/.zshenv-linux index af2a22f..60ff4a1 100644 --- a/.zshenv-linux +++ b/.zshenv-linux @@ -7,8 +7,14 @@ function appendpath() { esac } +<<<<<<< Updated upstream:.zshenv-linux appendpath $GOBIN appendpath $HOME/.local/bin +======= +appendpath "$GOPATH/bin" +appendpath "$HOME/.local/bin" +appendpath "$HOME/Library/Application\ Support/JetBrains/Toolbox/scripts" +>>>>>>> Stashed changes:.zshenv unset appendpath diff --git a/.zshrc b/.zshrc index 09d754f..c6c37f1 100644 --- a/.zshrc +++ b/.zshrc @@ -1,5 +1,6 @@ # Fig pre block. Keep at the top of this file. [[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh" + # If you come from bash you might have to change your $PATH. # export PATH=$HOME/bin:/usr/local/bin:$PATH @@ -79,6 +80,7 @@ plugins=( docker docker-compose docker-machine + gem git git-auto-fetch git-extras @@ -99,6 +101,8 @@ plugins=( profiles pylint python + rake + ruby themes tmux web-search @@ -159,4 +163,3 @@ export NVM_DIR="$HOME/.nvm" # Fig post block. Keep at the bottom of this file. [[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh" - diff --git a/linux/.profile.d/go.sh b/linux/.profile.d/go.sh new file mode 100644 index 0000000..aa59dca --- /dev/null +++ b/linux/.profile.d/go.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +export GOPATH=$HOME/.local/share/Go +export GOBIN=$GOPATH/bin diff --git a/linux/.profile.d/graalvm.sh b/linux/.profile.d/graalvm.sh new file mode 100644 index 0000000..d983061 --- /dev/null +++ b/linux/.profile.d/graalvm.sh @@ -0,0 +1 @@ +export GRAALVM_HOME="${SDKMAN_DIR}/candidates/java/current" diff --git a/linux/.profile.d/java.sh b/linux/.profile.d/java.sh new file mode 100644 index 0000000..36837f7 --- /dev/null +++ b/linux/.profile.d/java.sh @@ -0,0 +1 @@ +export JAVA_HOME="$SDKMAN_CANDIDATES_DIR/java/current" diff --git a/linux/.profile.d/jmeter.sh b/linux/.profile.d/jmeter.sh new file mode 100644 index 0000000..d413316 --- /dev/null +++ b/linux/.profile.d/jmeter.sh @@ -0,0 +1,2 @@ +export JMETER_HOME=`which jmeter` + diff --git a/linux/.zshenv b/linux/.zshenv new file mode 100644 index 0000000..60ff4a1 --- /dev/null +++ b/linux/.zshenv @@ -0,0 +1,24 @@ +function appendpath() { + case ":$PATH:" in + *:"$1":*) + ;; + *) + PATH="${PATH:+$PATH:}$1" + esac +} + +<<<<<<< Updated upstream:.zshenv-linux +appendpath $GOBIN +appendpath $HOME/.local/bin +======= +appendpath "$GOPATH/bin" +appendpath "$HOME/.local/bin" +appendpath "$HOME/Library/Application\ Support/JetBrains/Toolbox/scripts" +>>>>>>> Stashed changes:.zshenv + +unset appendpath + +#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! +export SDKMAN_DIR="$HOME/.sdkman" +[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" +# \ No newline at end of file diff --git a/linux/.zshrc b/linux/.zshrc new file mode 100644 index 0000000..8bf6322 --- /dev/null +++ b/linux/.zshrc @@ -0,0 +1,152 @@ +# If you come from bash you might have to change your $PATH. +# export PATH=$HOME/bin:/usr/local/bin:$PATH + +# Path to your oh-my-zsh installation. +export ZSH="$HOME/.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, +# to know which specific one was loaded, run: echo $RANDOM_THEME +# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes +ZSH_THEME="powerlevel10k/powerlevel10k" + +# Set list of themes to pick from when loading at random +# Setting this variable when ZSH_THEME=random will cause zsh to load +# a theme from this variable instead of looking in $ZSH/themes/ +# If set to an empty array, this variable will have no effect. +# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" + +# Uncomment the following line to use hyphen-insensitive completion. +# Case-sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + +# Uncomment one of the following lines to change the auto-update behavior +# zstyle ':omz:update' mode disabled # disable automatic updates +# zstyle ':omz:update' mode auto # update automatically without asking +# zstyle ':omz:update' mode reminder # just remind me to update when it's time + +# Uncomment the following line to change how often to auto-update (in days). +# zstyle ':omz:update' frequency 13 + +# Uncomment the following line if pasting URLs and other text is messed up. +# DISABLE_MAGIC_FUNCTIONS="true" + +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" + +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" + +# Uncomment the following line to enable command auto-correction. +# ENABLE_CORRECTION="true" + +# Uncomment the following line to display red dots whilst waiting for completion. +# You can also set it to another string to have that shown instead of the default red dots. +# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" +# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) +# COMPLETION_WAITING_DOTS="true" + +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# You can set one of the optional three formats: +# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# or set a custom format using the strftime function format specifications, +# see 'man strftime' for details. +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +ZSH_CUSTOM=$ZSH/custom + +# Which plugins would you like to load? +# Standard plugins can be found in $ZSH/plugins/ +# Custom plugins may be added to $ZSH_CUSTOM/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=( + colored-man-pages + colorize + command-not-found + docker + docker-compose + docker-machine + git + git-auto-fetch + git-extras + git-flow + github + gitignore + git-prompt + golang + httpie + jsontools + kubectl + lein + man + minikube + mvn + pep8 + pip + profiles + pylint + python + themes + tmux + web-search + zsh-navigation-tools +) + +source $ZSH/oh-my-zsh.sh + +# User configuration + +# export MANPATH="/usr/local/man:$MANPATH" + +# You may need to manually set your language environment +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='mvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch x86_64" + +# Set personal aliases, overriding those provided by oh-my-zsh libs, +# plugins, and themes. Aliases can be placed here, though oh-my-zsh +# users are encouraged to define aliases within the ZSH_CUSTOM folder. +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" + +# Setup emacs keymap +bindkey -e + +autoload -U compinit && compinit + +source "/usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" + +# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. +[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh + +# NVM configuration +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion + +#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! +export SDKMAN_DIR="$HOME/.sdkman" +[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" + diff --git a/linux/resolv.conf.head b/linux/resolv.conf.head new file mode 100644 index 0000000..13c14f4 --- /dev/null +++ b/linux/resolv.conf.head @@ -0,0 +1,43 @@ +# OpenDNS servers +#nameserver 208.67.222.222 +#nameserver 208.67.220.220 + +# Chaos Computer Club Berlin +nameserver 213.73.91.35 + +# Comodo Secure DNS +nameserver 156.154.70.22 +nameserver 156.154.71.22 + +# Censurfridns +nameserver 89.233.43.71 +nameserver 89.104.194.142 + +# DNS Advantage +nameserver 156.154.70.1 +nameserver 156.154.71.1 + +# Dotplex +nameserver 91.102.11.144 +nameserver 212.222.128.86 + +# FoeBuD e.V. +nameserver 85.214.20.141 + +# Swiss Privacy Foundation +#nameserver 87.118.104.203 +#nameserver 62.141.58.13 +#nameserver 87.118.109.2 + +# Schweden DNS Kalmar NDC Registry +nameserver 213.132.114.4 + +# Island DNS Island Telecom +nameserver 213.167.155.16 + +# Antartica DNS (Cyberbunker NL) +nameserver 84.22.106.30 + +# US DNS Westelcom Internet, Inc. +#nameserver 64.19.76.8 + diff --git a/linux/resolv.conf.tail b/linux/resolv.conf.tail new file mode 100644 index 0000000..6914e32 --- /dev/null +++ b/linux/resolv.conf.tail @@ -0,0 +1 @@ +options timeout:1