diff --git a/.profile.d-linux/go.sh b/.profile.d-linux/go.sh deleted file mode 100644 index aa59dca..0000000 --- a/.profile.d-linux/go.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -export GOPATH=$HOME/.local/share/Go -export GOBIN=$GOPATH/bin diff --git a/.profile.d-linux/graalvm.sh b/.profile.d-linux/graalvm.sh deleted file mode 100644 index d983061..0000000 --- a/.profile.d-linux/graalvm.sh +++ /dev/null @@ -1 +0,0 @@ -export GRAALVM_HOME="${SDKMAN_DIR}/candidates/java/current" diff --git a/.profile.d-linux/java.sh b/.profile.d-linux/java.sh deleted file mode 100644 index 36837f7..0000000 --- a/.profile.d-linux/java.sh +++ /dev/null @@ -1 +0,0 @@ -export JAVA_HOME="$SDKMAN_CANDIDATES_DIR/java/current" diff --git a/.profile.d-linux/jmeter.sh b/.profile.d-linux/jmeter.sh deleted file mode 100644 index d413316..0000000 --- a/.profile.d-linux/jmeter.sh +++ /dev/null @@ -1,2 +0,0 @@ -export JMETER_HOME=`which jmeter` - diff --git a/.zshenv-linux b/.zshenv-linux deleted file mode 100644 index 60ff4a1..0000000 --- a/.zshenv-linux +++ /dev/null @@ -1,24 +0,0 @@ -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/.zshrc-linux b/.zshrc-linux deleted file mode 100644 index 8bf6322..0000000 --- a/.zshrc-linux +++ /dev/null @@ -1,152 +0,0 @@ -# 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/resolv.conf.head b/resolv.conf.head deleted file mode 100644 index 13c14f4..0000000 --- a/resolv.conf.head +++ /dev/null @@ -1,43 +0,0 @@ -# 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/resolv.conf.tail b/resolv.conf.tail deleted file mode 100644 index 6914e32..0000000 --- a/resolv.conf.tail +++ /dev/null @@ -1 +0,0 @@ -options timeout:1