phg/.files
0
0
Fork 0
mirror of https://github.com/shokinn/.files.git synced 2025-01-18 13:22:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

add meta and os profiles; add distro and vw variable

Browse source
This commit is contained in:
Philip Henning 2024-12-13 16:44:14 +01:00
parent e1d6ae2686
commit 14f0cc458a
6 changed files with 63 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

223
config.yaml
View file

@ -143,194 +143,69 @@ dotfiles:
dst: ~/.ssh/config dst: ~/.ssh/config
chmod: '600' chmod: '600'
profiles: profiles:
AINCRAD: meta_base:
variables:
linux: false
vw: false
wsl: false
dotfiles: dotfiles:
- d_fonts
- f_profile
- f_vimrc
- f_zshrc
- f_zshenv
- f_powerlevel10krc
- d_colors - d_colors
- f_compton.conf - f_agenix_helper
- f_rofi_config
- f_c3cp
- f_mount_c3voc
- f_c3l
- f_c3kdenlive
- f_c3mpv
- f_c3check
- f_zprofile
- f_start_systemd_shell.sh
- f_wsladdhypervroute
- f_wslenablehypervforwarding
- f_wslshowhypervforwarding
- f_config
AINCRAD-wsl:
dotfiles:
- d_fonts
- f_profile
- f_vimrc
- f_zshrc
- f_zshenv
- f_powerlevel10krc
- d_colors
- f_compton.conf
- f_rofi_config
- f_c3cp
- f_mount_c3voc
- f_c3l
- f_c3kdenlive
- f_c3mpv
- f_c3check
- f_zprofile
- f_start_systemd_shell.sh
- f_wsladdhypervroute
- f_wslenablehypervforwarding
- f_wslshowhypervforwarding
- f_config
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 - f_commonfunc
- f_config - f_config
susanoo.local:
dotfiles:
- f_vimrc
- f_zshrc
- f_zshenv
- f_powerlevel10krc - f_powerlevel10krc
- d_colors
- f_c3cp
- f_mount_c3voc
- f_c3l
- f_c3kdenlive
- f_c3mpv
- f_c3check
- f_zprofile
- f_rmquarantine - f_rmquarantine
- f_commonfunc
- f_secretfiles - f_secretfiles
- f_agenix_helper
- f_config
yoetunheimr:
dotfiles:
- d_bspwm
- d_polybar
- d_sxhkd
- f_fehbg
- d_fonts
- f_profile
- f_vimrc - f_vimrc
- f_xinitrc
- f_xsession
- f_zprofile - f_zprofile
- f_zshrc
- f_zshenv - f_zshenv
- f_powerlevel10krc - f_zshrc
- d_colors meta_linux:
- f_xresources variables:
- f_ssh-agent.service linux: true
- f_compton.conf
- f_rofi_config
- f_c3cp
- f_mount_c3voc
- f_c3l
- f_c3kdenlive
- f_c3mpv
- f_c3check
- f_wsladdhypervroute
- f_wslenablehypervforwarding
- f_wslshowhypervforwarding
- f_config
YOETUNHEIMR-wsl:
dotfiles: dotfiles:
- d_fonts - d_fonts
- f_profile - f_profile
- f_vimrc meta_vw:
- f_zshrc variables:
- f_zshenv vw: true
- f_powerlevel10krc
- d_colors
- f_compton.conf
- f_rofi_config
- f_c3cp
- f_mount_c3voc
- f_c3l
- f_c3kdenlive
- f_c3mpv
- f_c3check
- f_zprofile
- f_start_systemd_shell.sh
- f_wsladdhypervroute
- f_wslenablehypervforwarding
- f_wslshowhypervforwarding
- f_config
ymir:
dotfiles: dotfiles:
- f_zshrc
- f_zshenv
- f_zprofile
- d_fonts
- f_profile
- f_vimrc
- f_powerlevel10krc
- d_colors
- f_c3cp
- f_mount_c3voc
- f_c3l
- f_c3kdenlive
- f_c3mpv
- f_c3check
- f_wsladdhypervroute
- f_wslenablehypervforwarding
- f_wslshowhypervforwarding
- f_commonfunc
- f_gpgagent
- f_secretfiles
- f_agenix_helper
- f_config
workspace:
dotfiles:
- d_fonts
- f_profile
- f_vimrc
- f_zshrc
- f_zshenv
- f_powerlevel10krc
- d_colors
- f_zprofile
- f_commonfunc
- f_config
WVDEWOBMC001307:
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_pu - f_pu
- f_rpki - f_rpki
meta_wsl:
variables:
wsl: true
dotfiles:
- f_wsladdhypervroute
- f_wslenablehypervforwarding
- f_wslshowhypervforwarding
os_macos:
variables:
distro: macos
include:
- meta_base
dotfiles:
- f_rmquarantine - f_rmquarantine
- f_commonfunc os_ubuntu:
- f_secretfiles variables:
- f_agenix_helper distro: ubuntu
- f_config include:
- meta_base
- meta_linux
sbx0nucmac01.home.pphg.tech:
include:
- os_macos
susanoo.local:
include:
- os_macos
workspace:
include:
- os_ubuntu
WVDEWOBMC001307:
include:
- os_macos
- meta_vw
WVDEWOBMC002277:
include:
- os_macos
- meta_vw

4
dotfiles/commonfunc
View file

@ -124,7 +124,7 @@ EOF
fi fi
} }
{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.local' @@%} {%@@ if distro == 'macos' @@%}
####################################### #######################################
# Shows a netstat -tulpn styled output on mac. # Shows a netstat -tulpn styled output on mac.
# Globals: # Globals:
@ -351,7 +351,7 @@ dotdrop() {
{{@@ env['HOME'] @@}}/.local/bin/dotdrop --cfg={{@@ env['HOME'] @@}}/.files/config.yaml ${@} {{@@ env['HOME'] @@}}/.local/bin/dotdrop --cfg={{@@ env['HOME'] @@}}/.files/config.yaml ${@}
} }
{%@@ endif @@%}{%@@ if profile == 'WVDEWOBMC001307' @@%} {%@@ endif @@%}{%@@ if vw == true @@%}
setProxyEnv() { setProxyEnv() {
local HIGHLIGHT='\033[36;1m' local HIGHLIGHT='\033[36;1m'
local RESET='\033[0;0m' local RESET='\033[0;0m'

2
dotfiles/ssh/config
View file

@ -7,7 +7,7 @@ Include {{@@ env['HOME'] @@}}/.colima/ssh_config
Include config.d/*.config Include config.d/*.config
Include config.d/*/*.config Include config.d/*/*.config
{%@@ if profile == 'susanoo.local' or profile == 'WVDEWOBMC001307' @@%}# {%@@ if distro == 'macos' @@%}#
# This have to be LAST # This have to be LAST
# #
Match host * exec "[[ -z $SSH_CLIENT && -z $SSH_TTY ]]" Match host * exec "[[ -z $SSH_CLIENT && -z $SSH_TTY ]]"

8
dotfiles/z_profile
View file

@ -9,26 +9,26 @@ export VISUAL
EDITOR='vim' EDITOR='vim'
export EDITOR export EDITOR
{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.local' @@%} {%@@ if distro == 'macos' @@%}
[[ $(command -v /opt/homebrew/bin/brew) ]] && eval "$(/opt/homebrew/bin/brew shellenv)" [[ $(command -v /opt/homebrew/bin/brew) ]] && eval "$(/opt/homebrew/bin/brew shellenv)"
# Added by Toolbox App # Added by Toolbox App
export PATH="$PATH:{{@@ env['HOME'] @@}}/Library/Application Support/JetBrains/Toolbox/scripts" export PATH="$PATH:{{@@ env['HOME'] @@}}/Library/Application Support/JetBrains/Toolbox/scripts"
{%@@ endif @@%} {%@@ endif @@%}
{%@@ if profile == 'AINCRAD-wsl' or profile == 'AINCRAD' or profile == 'YOETUNHEIMR-wsl' or profile == 'yoetunheimr' @@%} {%@@ if linux == true @@%}
# Set DOTNET_ROOT enviroment variable # Set DOTNET_ROOT enviroment variable
DOTNET_ROOT=/opt/dotnet DOTNET_ROOT=/opt/dotnet
export DOTNET_ROOT export DOTNET_ROOT
{%@@ endif @@%} {%@@ endif @@%}
{%@@ if profile == 'AINCRAD-wsl' or profile == 'AINCRAD' or profile == 'YOETUNHEIMR-wsl' or profile == 'yoetunheimr' or profile == 'ymir' @@%} {%@@ if linux == true @@%}
# Set XDG_CONFIG_HOME # Set XDG_CONFIG_HOME
XDG_CONFIG_HOME="{{@@ env['HOME'] @@}}/.config" XDG_CONFIG_HOME="{{@@ env['HOME'] @@}}/.config"
export XDG_CONFIG_HOME export XDG_CONFIG_HOME
{%@@ endif @@%} {%@@ endif @@%}
{%@@ if profile == 'AINCRAD-wsl' or profile == 'AINCRAD' or profile == 'YOETUNHEIMR-wsl' or profile == 'yoetunheimr' or profile == 'ymir' @@%} {%@@ if wsl == true @@%}
# Run VPN-Kit alpine VM to route traffic through Windows and if connected through VPNs # Run VPN-Kit alpine VM to route traffic through Windows and if connected through VPNs
wsl.exe -d wsl-vpnkit service wsl-vpnkit start wsl.exe -d wsl-vpnkit service wsl-vpnkit start
{%@@ endif @@%} {%@@ endif @@%}

6
dotfiles/zshenv
View file

@ -11,13 +11,13 @@ export ANSIBLE_NOCOWS=1
# Include ~/.local/bin to PATH # Include ~/.local/bin to PATH
[[ -d "{{@@ env['HOME'] @@}}/.local/bin" ]] && export PATH="{{@@ env['HOME'] @@}}/.local/bin:${PATH}" [[ -d "{{@@ env['HOME'] @@}}/.local/bin" ]] && export PATH="{{@@ env['HOME'] @@}}/.local/bin:${PATH}"
{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.local' @@%}# Include /opt/homebrew/opt/gnu-getopt/bin to PATH {%@@ if distro == 'macos' @@%}# Include /opt/homebrew/opt/gnu-getopt/bin to PATH
[[ -d "/opt/homebrew/opt/gnu-getopt/bin" ]] && export PATH="/opt/homebrew/opt/gnu-getopt/bin:${PATH}" [[ -d "/opt/homebrew/opt/gnu-getopt/bin" ]] && export PATH="/opt/homebrew/opt/gnu-getopt/bin:${PATH}"
{%@@ endif @@%}# Include $(go env GOPATH) to PATH {%@@ endif @@%}# Include $(go env GOPATH) to PATH
[[ $(command -v go) ]] && [[ -d "$(go env GOPATH)/bin" ]] && export PATH="$(go env GOPATH)/bin:${PATH}" [[ $(command -v go) ]] && [[ -d "$(go env GOPATH)/bin" ]] && export PATH="$(go env GOPATH)/bin:${PATH}"
{%@@ if profile == 'AINCRAD-wsl' or profile == 'AINCRAD' or profile == 'YOETUNHEIMR-wsl' or profile == 'yoetunheimr' or profile == 'ymir' @@%} {%@@ if wsl == true @@%}
# Connect to windows ssh pageant # Connect to windows ssh pageant
# https://github.com/BlackReloaded/wsl2-ssh-pageant # https://github.com/BlackReloaded/wsl2-ssh-pageant
export SSH_AUTH_SOCK={{@@ env['HOME'] @@}}/.ssh/agent.sock export SSH_AUTH_SOCK={{@@ env['HOME'] @@}}/.ssh/agent.sock
@ -43,7 +43,7 @@ export GPG_TTY=$(tty)
# X410 (Windows X11 Server) # X410 (Windows X11 Server)
export DISPLAY=$(cat /etc/resolv.conf | grep nameserver | awk '{print $2; exit;}'):0.0 export DISPLAY=$(cat /etc/resolv.conf | grep nameserver | awk '{print $2; exit;}'):0.0
{%@@ endif @@%} {%@@ endif @@%}
{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.local' @@%} {%@@ if distro == 'macos' @@%}
export HOMEBREW_CASK_OPTS="--appdir=~/Applications" export HOMEBREW_CASK_OPTS="--appdir=~/Applications"
{%@@ endif @@%} {%@@ endif @@%}

8
dotfiles/zshrc
View file

@ -105,11 +105,11 @@ plugins=(
vscode vscode
zsh-navigation-tools zsh-navigation-tools
zsh-ssh zsh-ssh
{%@@ if profile == 'WVDEWOBMC001307' or profile == 'ymir' or profile == 'susanoo.local' @@%} # Mac specifics {%@@ if distro == 'macos' @@%} # Mac specifics
brew brew
iterm2 iterm2
macos macos
{%@@ endif @@%}{%@@ if profile == 'yoetunheimr' or profile == 'AINCRAD-wsl' or profile == 'AINCRAD' or profile == 'YOETUNHEIMR-wsl' or profile == 'ymir' @@%} # Archlinux specifics {%@@ endif @@%}{%@@ if distro == 'arch' @@%} # Archlinux specifics
archlinux archlinux
{%@@ endif @@%} {%@@ endif @@%}
) )
@ -157,7 +157,7 @@ source ${ZSH}/oh-my-zsh.sh
# alias ohmyzsh="mate ~/.oh-my-zsh" # alias ohmyzsh="mate ~/.oh-my-zsh"
# [[ -f {{@@ env['HOME'] @@}}/.files/dotdrop.sh ]] && alias dotdrop='eval $(grep -v "^#" {{@@ env['HOME'] @@}}/.files/.env.public) {{@@ env['HOME'] @@}}/.files/dotdrop.sh' # Not required anymore since I now use # [[ -f {{@@ env['HOME'] @@}}/.files/dotdrop.sh ]] && alias dotdrop='eval $(grep -v "^#" {{@@ env['HOME'] @@}}/.files/.env.public) {{@@ env['HOME'] @@}}/.files/dotdrop.sh' # Not required anymore since I now use
[[ $(command -v thefuck) ]] && eval $(thefuck --alias) [[ $(command -v thefuck) ]] && eval $(thefuck --alias)
#{%@@ if profile == 'AINCRAD-wsl' or profile == 'YOETUNHEIMR-wsl' or profile == 'ymir' @@%} #{%@@ if linux == true @@%}
# Use https://github.com/jgaa/shinysocks as simple socks5 proxy for windows # Use https://github.com/jgaa/shinysocks as simple socks5 proxy for windows
#[[ $(command -v kubectl) ]] && alias proxy_kubectl="http_proxy=socks5://$(cat /etc/resolv.conf | grep nameserver | awk '{print $2; exit;}'):1080 https_proxy=socks5://$(cat /etc/resolv.conf | grep nameserver | awk '{print $2; exit;}'):1080 kubectl" #[[ $(command -v kubectl) ]] && alias proxy_kubectl="http_proxy=socks5://$(cat /etc/resolv.conf | grep nameserver | awk '{print $2; exit;}'):1080 https_proxy=socks5://$(cat /etc/resolv.conf | grep nameserver | awk '{print $2; exit;}'):1080 kubectl"
#[[ $(command -v kubectl) ]] && alias pk='proxy_kubectl' #[[ $(command -v kubectl) ]] && alias pk='proxy_kubectl'
@ -173,7 +173,7 @@ alias ssh-strongbox-keys="SSH_AUTH_SOCK=~/Library/Group\ Containers/group.strong
# Include $(go env GOPATH) to PATH # Include $(go env GOPATH) to PATH
[[ $(command -v go) ]] && [[ -d "$(go env GOPATH)/bin" ]] && export PATH="$(go env GOPATH)/bin:${PATH}" [[ $(command -v go) ]] && [[ -d "$(go env GOPATH)/bin" ]] && export PATH="$(go env GOPATH)/bin:${PATH}"
{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.local' @@%} {%@@ if distro == 'macos' @@%}
# Decide which homebrew installation (x64_86 / arm64) should be used # Decide which homebrew installation (x64_86 / arm64) should be used
if [ "$(sysctl -n sysctl.proc_translated)" = "1" ]; then if [ "$(sysctl -n sysctl.proc_translated)" = "1" ]; then
local brew_path="/usr/local/homebrew/bin" local brew_path="/usr/local/homebrew/bin"