From e35f0afc4e7ad901fc157672b5e011975784d4f0 Mon Sep 17 00:00:00 2001 From: Oliver Ladner Date: Thu, 30 Mar 2023 22:41:18 +0200 Subject: [PATCH] update many things --- .bashrc_append_this | 24 +++-- .bashrc_local | 10 -- .gitconfig | 2 + .vim/pack/jvirtanen/start/vim-hcl | 1 + brew.txt | 147 +++--------------------------- 5 files changed, 33 insertions(+), 151 deletions(-) create mode 160000 .vim/pack/jvirtanen/start/vim-hcl diff --git a/.bashrc_append_this b/.bashrc_append_this index 52d73d1..47643b7 100644 --- a/.bashrc_append_this +++ b/.bashrc_append_this @@ -32,14 +32,22 @@ fi # Fetch a Splunk auth token for ansible history if [ ! -z $VAULT_TOKEN ]; then export SPLUNK_AUTHTOKEN=$(curl -X GET https://vault.unic.com/api/v1/secrets/14730/fields/api-key -H "Authorization: Bearer $VAULT_TOKEN" -s | tr -d \"); else echo "Splunk: \$VAULT_TOKEN not set"; fi -export VIRTUALENV_PYTHON=/usr/local/bin/python3 -export VIRTUALENVWRAPPER_PYTHON=/usr/local/bin/python3 -export WORKON_HOME=~/python_envs/ -source /usr/local/bin/virtualenvwrapper.sh - -eval $(thefuck --alias) - test -e "${HOME}/.iterm2_shell_integration.bash" && source "${HOME}/.iterm2_shell_integration.bash" ulimit -n 1024 -. "$HOME/.cargo/env" + +# >>> conda initialize >>> +# !! Contents within this block are managed by 'conda init' !! +__conda_setup="$('/Users/oliver.ladner/opt/miniconda3/bin/conda' 'shell.bash' 'hook' 2> /dev/null)" +if [ $? -eq 0 ]; then + eval "$__conda_setup" +else + if [ -f "/Users/oliver.ladner/opt/miniconda3/etc/profile.d/conda.sh" ]; then + . "/Users/oliver.ladner/opt/miniconda3/etc/profile.d/conda.sh" + else + export PATH="/Users/oliver.ladner/opt/miniconda3/bin:$PATH" + fi +fi +unset __conda_setup +# <<< conda initialize <<< + diff --git a/.bashrc_local b/.bashrc_local index 5abcb4d..058cb0e 100644 --- a/.bashrc_local +++ b/.bashrc_local @@ -6,13 +6,3 @@ HISTTIMEFORMAT="%d.%m.%Y %H:%M %Z # " # 256-color terminal if available export TERM=xterm-256color - -export WORKON_HOME=$HOME/virtualenvs -export PROJECT_HOME=$HOME/git -[ -f /usr/local/bin/virtualenvwrapper.sh ] && source /usr/local/bin/virtualenvwrapper.sh - -PATH=$PATH:~/bin:/usr/local/opt/python@3.7/bin - -parse_git_branch() { - git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' -} diff --git a/.gitconfig b/.gitconfig index 2c52e53..8a00daf 100644 --- a/.gitconfig +++ b/.gitconfig @@ -23,3 +23,5 @@ postBuffer = 524288000 [pull] rebase = false +[safe] + directory = /opt/homebrew diff --git a/.vim/pack/jvirtanen/start/vim-hcl b/.vim/pack/jvirtanen/start/vim-hcl new file mode 160000 index 0000000..1e1116c --- /dev/null +++ b/.vim/pack/jvirtanen/start/vim-hcl @@ -0,0 +1 @@ +Subproject commit 1e1116c17a5774851360ea8077f349e36fc733c1 diff --git a/brew.txt b/brew.txt index d631cdb..c64f1bc 100644 --- a/brew.txt +++ b/brew.txt @@ -1,127 +1,57 @@ -adns aom -asciinema -assimp -atk awscli -azure-cli -bash-completion -bdw-gc -bicep -boost brotli c-ares ca-certificates cairo -cdrtools -coreutils -cowsay -dbus -diffuse -displayplacer -dnslookup -docbook -docbook-xsl +docutils dos2unix -double-conversion -feroxbuster -figlet findutils fontconfig -fortune -fping freetype fribidi gd -gdbm -gdk-pixbuf -geoip -geoipupdate gettext -ghostscript giflib git -git-flow -glew glib gmp -gnu-getopt gnupg gnuplot gnutls go -goaccess -gobject-introspection -gource graphite2 -grc -gtk+ -guile harfbuzz -hashcat -helm -hicolor-icon-theme +highway htop -hunspell icu4c -ilmbase -imagemagick imath ipcalc -iperf -ipmitool -ipv6calc -jansson -jasper -jbig2dec -jemalloc -jpeg +jpeg-turbo jpeg-xl jq -juju k9s -kind kubectx -kubeprompt kubernetes-cli -kubernetes-helm +libarchive libassuan libavif libb2 libcbor libcerf -libde265 -libev libevent -libffi libfido2 libgcrypt libgpg-error -libheif -libice -libidn libidn2 libksba -liblqr -libmaxminddb -libmng libnghttp2 -libomp libpng -libproxy -libpthread-stubs -libraw -libslirp -libsm -libsmi -libssh libssh2 libtasn1 libtiff -libtool libunistring libusb -libusb-compat libuv libvmaf libx11 @@ -129,113 +59,64 @@ libxau libxcb libxdmcp libxext -libxml2 -libxmlsec1 -libxmu libxrender -libxt libyaml little-cms2 lolcat lua -lua@5.1 lz4 lzo -m4 -md4c md5sha1sum midnight-commander minicom -minikube mpdecimal -mtr -mysql mysql-client -mysql-connector-c ncdu ncurses nettle -nghttp2 -nmap node npth oniguruma openexr openjdk -openjpeg openssl@1.1 openssl@3 openstackclient p11-kit packer pango -pcre pcre2 pinentry pixman -pkg-config prettyping -protobuf -protobuf@3.7 -pssh -pth pwgen -py2cairo -pygobject -pygtk -python@2 -python@3.10 -python@3.7 -python@3.8 -python@3.9 -qemu -qrencode -qt +pycparser +python-typing-extensions +python@3.11 +pyyaml qt@5 readline rpm2cpio s-lang -sbt -screenfetch -sdl2 -sdl2_image -sevenzip -shared-mime-info six -snappy speedtest-cli sqlite sslyze swaks -tcl-tk -telnet +terraform tflint -thefuck -tokyo-cabinet -tox +tig tree unbound -unrar -vde watch -wdiff webp -websocat wget -wireshark -wmctrl -x265 -xmlto xorgproto xz -youtube-dl +zlib zsh-autosuggestions zstd -authy -font-inconsolata -font-roboto-mono -gifcapture -mtmr +microsoft-auto-update +microsoft-teams powershell -wireshark -xquartz +skype-for-business