diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 288a0a6..2589400 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -113,7 +113,7 @@ font:
     #   - (Windows) Consolas
     #family: monospace
     # Next time: Check for Cascadia (Code|Mono) PL
-    family: "Cascadia Code"
+    family: "Cascadia Code PL"
 
     # if fallback is implemented
     #family: Roboto Mono for Powerline 11
@@ -125,6 +125,7 @@ font:
 
     # The `style` can be specified to pick a specific face.
     #style: Regular
+    style: Regular
 
   # Bold font face
   #bold:
@@ -165,7 +166,7 @@ font:
     #style: Bold Italic
 
   # Point size
-  size: 11.0
+  size: 12.0
 
   # Offset is the extra space around each character. `offset.y` can be thought
   # of as modifying the line spacing, and `offset.x` as modifying the letter
@@ -250,7 +251,7 @@ schemes:
       cyan:    '#8ec07c'
       white:   '#ebdbb2'
 
-colors: *light
+colors: *dark
 #colors:
   # Default colors
   #primary:
diff --git a/.config/aliases b/.config/aliases
index a575fb8..e853b8a 100644
--- a/.config/aliases
+++ b/.config/aliases
@@ -5,7 +5,6 @@
 abbr     v    'vi'
 alias    vi   'nvim'
 alias    vim  'nvim'
-abbr     open 'xdg-open'
 
 abbr     l    "ls -lFh"
 alias    ls   'ls --color=auto'
@@ -15,6 +14,7 @@ abbr     lS   'ls -1FSsh'
 abbr     ll   "ls -l"
 abbr     l1   "ls -1"
 abbr     sl   'ls'
+alias    ip   'ip -c'
 alias    tree 'tree -C'
 
 # Configuration files
@@ -42,24 +42,40 @@ abbr    glo  "git log --oneline"
 abbr    grhh "git reset --hard HEAD"
 abbr    gcp  "git cherry-pick $1"
 
-# Pacman
-alias   pacman 'pacman --color=auto'
-abbr    pm     'pacman'
-abbr    pms    'pacman -Ss'
-abbr    pmsi   'pacman -Sii'
-abbr    pmq    'pacman -Qs'
-abbr    pmqi   'pacman -Qii'
-abbr    pmqo   'pacman -Qo'
-abbr    pmqm   'pacman -Qem' #list foreign (explicit) packages
-abbr    pmi    'sudo pacman -S'
-abbr    pmr    'sudo pacman -Rns'
-abbr    pmu    'sudo pacman -Syu'
-abbr    pmro   'sudo pacman -Rns (pacman -Qtdq) #remove orphans'
-abbr    pmcc   'pacman -Qii | awk '\''/^MODIFIED/ {print $2}'\''' #list changed config files
-abbr    aur    'auracle'
-
 # Archives
 abbr    tgz    'tar -xvzf'  # extract .tar.gz
 abbr    tbz    'tar -xvjf'  # extract .tar.bz2
 
+# Linux specific aliases
+if [ (uname) = "Linux" ]
+  # Pacman
+  alias   pacman 'pacman --color=auto'
+  abbr    pm     'pacman'
+  abbr    pms    'pacman -Ss'
+  abbr    pmsi   'pacman -Sii'
+  abbr    pmq    'pacman -Qs'
+  abbr    pmqi   'pacman -Qii'
+  abbr    pmqo   'pacman -Qo'
+  abbr    pmqm   'pacman -Qem' #list foreign (explicit) packages
+  abbr    pmi    'sudo pacman -S'
+  abbr    pmr    'sudo pacman -Rns'
+  abbr    pmu    'sudo pacman -Syu'
+  abbr    pmro   'sudo pacman -Rns (pacman -Qtdq) #remove orphans'
+  abbr    pmcc   'pacman -Qii | awk '\''/^MODIFIED/ {print $2}'\''' #list changed config files
+  abbr    aur    'auracle'
+
+  abbr    open 'xdg-open'
+end
+
+# MacOS specific aliases
+if [ (uname) = "Darwin" ]
+  alias tailscale "/Applications/Tailscale.app/Contents/MacOS/Tailscale"
+end
+
+# Machine specific aliases
+if test -e "$XDG_CONFIG_HOME/$(hostname).aliases"
+  source "$XDG_CONFIG_HOME/$(hostname).aliases"
+end
+
+
 # EOF
diff --git a/.config/environment b/.config/environment
index cc8670e..88ce9f2 100644
--- a/.config/environment
+++ b/.config/environment
@@ -10,6 +10,7 @@ set -x LANG de_DE.UTF-8
 set -x XKB_DEFAULT_LAYOUT eu,de
 #set -x SUDO_ASKPASS "$HOME/.bin/sway/dmenupass"
 set -x PASSWORD_STORE_DIR "$HOME/.passwords"
+set -x HOMEBREW_CASK_OPTS "--no-quarantine --require-sha"
 
 # Path: ~/.bin for user scripts
 [ -L ~/.bin ] && set -gx PATH ~/.bin ~/.local/bin $PATH
@@ -45,12 +46,16 @@ set -x XDG_DATA_DIRS       "/usr/local/share:/usr/share"
 set -x XDG_CONFIG_DIRS     "/etc/xdg"
 
 # GPG and SSH agent
-set -e SSH_AUTH_SOCK
-set -U -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)
-set -x GPG_TTY (tty)
-gpgconf --launch gpg-agent
+if [ (uname) = "Linux" ]
+  set -e SSH_AUTH_SOCK
+  set -U -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)
+  set -x GPG_TTY (tty)
+  gpgconf --launch gpg-agent
+end
 
 # Clean home directory
-set -x ATOM_HOME "$XDG_DATA_HOME/atom"
+set -x ATOM_HOME   "$XDG_DATA_HOME/atom"
+set -x RUSTUP_HOME "$XDG_CONFIG_HOME/rustup"
+set -x CARGO_HOME  "$XDG_CONFIG_HOME/cargo"
 
 # EOF
diff --git a/.config/git/config b/.config/git/config
new file mode 100644
index 0000000..07c606e
--- /dev/null
+++ b/.config/git/config
@@ -0,0 +1,31 @@
+[user]
+	name = hoellen
+	email = dev@hoellen.eu
+
+[core]
+	excludesfile = ~/.config/git/ignore
+	editor = nvim
+
+[pull]
+	rebase = true
+
+[commit]
+	verbose = yes
+
+[includeIf "gitdir/i:~/Repositories/BfArM/"]
+    path = ~/Repositories/BfArM/.gitconfig
+
+[difftool]
+    prompt = true
+
+[diff]
+    tool = nvimdiff
+
+[difftool "nvimdiff"]
+    cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
+
+[filter "lfs"]
+	process = git-lfs filter-process
+	required = true
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
diff --git a/.config/git/ignore b/.config/git/ignore
new file mode 100644
index 0000000..79b5594
--- /dev/null
+++ b/.config/git/ignore
@@ -0,0 +1 @@
+**/.DS_Store
diff --git a/.config/mpv/config b/.config/mpv/config
index 8e6f0cf..2eace2a 100644
--- a/.config/mpv/config
+++ b/.config/mpv/config
@@ -1,5 +1,5 @@
 [default]
-geometry=40%
+geometry=30%
 
 # limit max youtube quality
-ytdl-format=bestvideo[height<=?1080]+bestaudio/best
+#ytdl-format=bestvideo[height<=?1080]+bestaudio/best
diff --git a/.config/mpv/input.conf b/.config/mpv/input.conf
index 8e412a2..ba33950 100644
--- a/.config/mpv/input.conf
+++ b/.config/mpv/input.conf
@@ -1,3 +1,5 @@
 
 # disable keybinding
 ctrl+w ignore
+meta+w ignore
+