diff --git a/README.md b/README.md index 3c6b4c2..6ea8bef 100644 --- a/README.md +++ b/README.md @@ -7,15 +7,19 @@ I manage my dotfiles using [dotdrop](https://github.com/deadc0de6/dotdrop). 1. Install [Homebrew](https://brew.sh/) 2. Install `coreutils` via Homebrew. 3. Install [pyenv](https://github.com/pyenv/pyenv) -4. Install the latest python version via pyenv -5. Configure the latest python version as system (global) default + a. Install [pyenv-virtualenv](https://github.com/pyenv/pyenv-virtualenv) + b. Add pyenv temporarly to your path: `export PATH=$(pyenv root)/shims:${PATH}` + c. Install the latest python version via pyenv + d. Create a new virtual-env caleld `dotdrop` via `pyenv virtualenv dotdrop` +4. Initialize pyenv; run `pyenv init` for instructions +5. Activate the `dotdrop` virtualenv by using `pyenv shell dotdrop` 6. Clone dotfiles, install dependencies for dotdrop and install dotfiles. ```shell git clone https://github.com/shokinn/.files ~/.files \ && cd ~/.files \ && git submodule update --init \ && cd .. \ -&& pip install --user -r ~/.files/dotdrop/requirements.txt \ +&& pip install -r ~/.files/dotdrop/requirements.txt \ && eval $(grep -v "^#" ~/.files/.env.public) ~/.files/dotdrop.sh install ``` diff --git a/config.yaml b/config.yaml index d5e553a..3c6875a 100644 --- a/config.yaml +++ b/config.yaml @@ -184,6 +184,39 @@ profiles: - f_wsladdhypervroute - f_wslenablehypervforwarding - f_wslshowhypervforwarding + sbx0nucmac01.home.pphg.tech: + dotfiles: + - f_vimrc + - f_zshrc + - f_zshenv + - f_powerlevel10krc + - d_colors + - f_c3cp + - f_mount_c3voc + - f_c3l + - f_c3kdenlive + - f_c3mpv + - f_c3check + - f_zprofile + - f_commonfunc + susanoo.int.r3w.de: + dotfiles: + - f_vimrc + - f_zshrc + - f_zshenv + - f_powerlevel10krc + - d_colors + - f_c3cp + - f_mount_c3voc + - f_c3l + - f_c3kdenlive + - f_c3mpv + - f_c3check + - f_zprofile + - f_dotdrop.sh + - f_rmquarantine + - f_commonfunc + - f_secretfiles yoetunheimr: dotfiles: - d_bspwm @@ -271,21 +304,6 @@ profiles: - d_colors - f_zprofile - f_commonfunc - sbx0nucmac01.home.pphg.tech: - dotfiles: - - f_vimrc - - f_zshrc - - f_zshenv - - f_powerlevel10krc - - d_colors - - f_c3cp - - f_mount_c3voc - - f_c3l - - f_c3kdenlive - - f_c3mpv - - f_c3check - - f_zprofile - - f_commonfunc WVDEWOBMC001307: dotfiles: - f_vimrc @@ -305,4 +323,4 @@ profiles: - f_rpki - f_rmquarantine - f_commonfunc - - f_secretfiles \ No newline at end of file + - f_secretfiles diff --git a/dotfiles/bin/dotdrop.sh b/dotfiles/bin/dotdrop.sh index 4651b42..6f561f6 100755 --- a/dotfiles/bin/dotdrop.sh +++ b/dotfiles/bin/dotdrop.sh @@ -5,4 +5,5 @@ # eval $(grep -v "^#" {{@@ env['HOME'] @@}}/.files/.env.public) +export PYENV_VERSION="dotdrop" {{@@ env['HOME'] @@}}/.files/dotdrop.sh ${@} diff --git a/dotfiles/commonfunc b/dotfiles/commonfunc index fc7b938..8f30ee9 100644 --- a/dotfiles/commonfunc +++ b/dotfiles/commonfunc @@ -58,11 +58,11 @@ EOF fi } -{%@@ if profile == 'WVDEWOBMC001307' @@%} +{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.int.r3w.de' @@%} macnst (){ netstat -Watnlv | grep LISTEN | awk '{"ps -o comm= -p " $9 | getline procname;colred="\033[01;31m";colclr="\033[0m"; print colred "proto: " colclr $1 colred " | addr.port: " colclr $4 colred " | pid: " colclr $9 colred " | name: " colclr procname; }' | column -t -s "|" } - +{%@@ endif @@%}{%@@ if profile == 'WVDEWOBMC001307' @@%} function setProxyEnv(){ local HIGHLIGHT='\033[36;1m' local RESET='\033[0;0m' diff --git a/dotfiles/z_profile b/dotfiles/z_profile index 752a26b..d85e764 100644 --- a/dotfiles/z_profile +++ b/dotfiles/z_profile @@ -9,7 +9,7 @@ export VISUAL EDITOR='vim' export EDITOR -{%@@ if profile == 'WVDEWOBMC001307' @@%} +{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.int.r3w.de' @@%} [[ $(command -v /opt/homebrew/bin/brew) ]] && eval "$(/opt/homebrew/bin/brew shellenv)" # Added by Toolbox App diff --git a/dotfiles/zshenv b/dotfiles/zshenv index dd37447..fe3c7ce 100644 --- a/dotfiles/zshenv +++ b/dotfiles/zshenv @@ -46,7 +46,7 @@ export GPG_TTY=$(tty) # X410 (Windows X11 Server) export DISPLAY=$(cat /etc/resolv.conf | grep nameserver | awk '{print $2; exit;}'):0.0 {%@@ endif @@%} -{%@@ if profile == 'WVDEWOBMC001307' @@%} +{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.int.r3w.de' @@%} export HOMEBREW_CASK_OPTS="--appdir=~/Applications" {%@@ endif @@%} diff --git a/dotfiles/zshrc b/dotfiles/zshrc index fff7c7b..2705ce9 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -107,7 +107,7 @@ plugins=( autoload -U compinit && compinit -{%@@ if profile == 'ymir' @@%} +{%@@ if profile == 'ymir' or profile == 'susanoo.int.r3w.de' @@%} # Source fzf-tab-completions # source {{@@ env['HOME'] @@}}/.oh-my-zsh/custom/plugins/fzf-tab-completion/zsh/fzf-zsh-completion.sh # zstyle ':completion:*' fzf-search-display true @@ -170,7 +170,7 @@ if [ -f "{{@@ env['HOME'] @@}}/.local/bin/pipx" ]; then eval "$(register-python-argcomplete pipx)" fi -{%@@ if profile == 'WVDEWOBMC001307' @@%} +{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.int.r3w.de' @@%} # Decide which homebrew installation (x64_86 / arm64) should be used if [ "$(sysctl -n sysctl.proc_translated)" = "1" ]; then local brew_path="/usr/local/homebrew/bin"