aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Runge <dave@sleepmap.de>2020-03-10 22:38:02 +0100
committerDavid Runge <dave@sleepmap.de>2020-03-10 22:38:02 +0100
commitca9b7f318fbad873fb8cb7767f87a0f16b72a47c (patch)
tree2758c0eeb3c267e593945469c7f0a9c77c84ebcd
parent64fb68cf8542f554f431596762b337cbf85bc9fd (diff)
parented0cb6f5d91e0924a0136275ac9025f2696a451f (diff)
downloaddotfiles-ca9b7f318fbad873fb8cb7767f87a0f16b72a47c.tar.gz
dotfiles-ca9b7f318fbad873fb8cb7767f87a0f16b72a47c.tar.bz2
dotfiles-ca9b7f318fbad873fb8cb7767f87a0f16b72a47c.tar.xz
dotfiles-ca9b7f318fbad873fb8cb7767f87a0f16b72a47c.zip
Merge branch 'master' of sleepmap.de:dave/dotfiles
* 'master' of sleepmap.de:dave/dotfiles: Moving the setting of dircolors from .zprofile to .zshrc, as a successful export relies upon finding dircolors in PATH and for that PATH has to be setup properly (which is not the case, when .zprofile is sourced on macOS. .zsh.before/path.zsh: Adding a few GNU tools to PATH, if they were installed via brew. .zsh.after/export.zsh: If brew is found in PATH, export a few environment variables for it. .config/alacritty/alacritty.yml: Setting decorations to full, as otherwise the application is unusable on macOS.
-rw-r--r--.config/alacritty/alacritty.yml2
-rw-r--r--.zprofile4
-rw-r--r--.zsh.after/export.zsh7
-rw-r--r--.zsh.before/path.zsh8
-rw-r--r--.zshrc3
5 files changed, 18 insertions, 6 deletions
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index ed688b5..9a2588b 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -49,7 +49,7 @@ window:
# Values for `decorations` (macOS only):
# - transparent: Title bar, transparent background and title bar buttons
# - buttonless: Title bar, transparent background, but no title bar buttons
- decorations: none
+ decorations: full
# Startup Mode (changes require restart)
#
diff --git a/.zprofile b/.zprofile
index e76fdd3..0d11dbd 100644
--- a/.zprofile
+++ b/.zprofile
@@ -50,7 +50,3 @@ TMPPREFIX="${TMPDIR%/}/zsh"
if [[ ! -d "$TMPPREFIX" ]]; then
mkdir -p "$TMPPREFIX"
fi
-
-# dircolors
-# Set colors for ls output
-eval $(dircolors ~/.dircolors)
diff --git a/.zsh.after/export.zsh b/.zsh.after/export.zsh
index 7ecaa85..db2b22d 100644
--- a/.zsh.after/export.zsh
+++ b/.zsh.after/export.zsh
@@ -67,6 +67,13 @@ export PIPENV_HIDE_EMOJIS="true"
export PIPENV_VENV_IN_PROJECT="true"
#export PIPENV_CACHE_DIR="$HOME/.cache/pipenv"
+# brew
+if command -v brew > /dev/null; then
+ export HOMEBREW_NO_ANALYTICS="true"
+ export HOMEBREW_NO_AUTO_UPDATE="true"
+ export HOMEBREW_NO_EMOJI="true"
+fi
+
# GnuPG
export GPG_TTY=$TTY
export GPG_AGENT_INFO=""
diff --git a/.zsh.before/path.zsh b/.zsh.before/path.zsh
index f19b704..4db5668 100644
--- a/.zsh.before/path.zsh
+++ b/.zsh.before/path.zsh
@@ -8,4 +8,10 @@
[ -d "${HOME}/bin" ] && PATH="${HOME}/bin:${PATH}"
# Debilian
[ -d "/usr/sbin" ] && [ ! -L "/usr/sbin" ] && PATH="${PATH}:/usr/sbin"
-
+# whackOS
+[ -d "/usr/local/opt/coreutils/libexec/gnubin" ] && PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
+[ -d "/usr/local/opt/gnu-sed/libexec/gnubin" ] && PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"
+[ -d "/usr/local/opt/gnu-tar/libexec/gnubin" ] && PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"
+[ -d "/usr/local/opt/gnu-which/libexec/gnubin" ] && PATH="/usr/local/opt/gnu-which/libexec/gnubin:$PATH"
+[ -d "/usr/local/opt/findutils/libexec/gnubin" ] && PATH="/usr/local/opt/findutils/libexec/gnubin:$PATH"
+[ -d "/usr/local/opt/grep/libexec/gnubin" ] && PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"
diff --git a/.zshrc b/.zshrc
index 219801b..c99346e 100644
--- a/.zshrc
+++ b/.zshrc
@@ -4,6 +4,9 @@ for config_file ($HOME/.zsh.functions/*.zsh) source $config_file
# zsh.before
for config_file ($HOME/.zsh.before/*.zsh) source $config_file
+# dircolors
+# Set colors for ls output
+eval $(dircolors ~/.dircolors)
# Environment
#