diff --git a/.gitignore b/.gitignore
index 263544b..f442e87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@ vim/vim.xdg.symlink/.netrwhist
 vim/vim.xdg.symlink/plugged
 vim/vim.xdg.symlink/plugged-update
 
+git/git.xdg.symlink/host.gitconfig
+
 zsh/zsh.symlink/liquidprompt
 zsh/zsh.symlink/zsh-completions
 zsh/zsh.symlink/zsh-syntax-highlighting
diff --git a/fish/fish.xdg.symlink/config.fish b/fish/fish.xdg.symlink/config.fish
index 224af4a..9f61d04 100644
--- a/fish/fish.xdg.symlink/config.fish
+++ b/fish/fish.xdg.symlink/config.fish
@@ -1,27 +1,11 @@
 # Base Path
 set PATH "/usr/local/bin" "/usr/bin" "/bin" "/usr/sbin" "/sbin"
 
-# Homebrew (generated by `brew shellenv fish`, reformatted)
-set -gx HOMEBREW_PREFIX "/opt/homebrew";
-set -gx HOMEBREW_CELLAR "/opt/homebrew/Cellar";
-set -gx HOMEBREW_REPOSITORY "/opt/homebrew";
-
-fish_add_path --global --move --path "/opt/homebrew/bin" "/opt/homebrew/sbin";
-
-if test -n "$MANPATH[1]"
-    set -gx MANPATH '' $MANPATH
-end
-
-if not contains "/opt/homebrew/share/info" $INFOPATH
-    set -gx INFOPATH "/opt/homebrew/share/info" $INFOPATH
-end
+source "$HOME/dotfiles/fish/fish.xdg.symlink/hosts/$(uname -s).fish"
 
 # Rust
 fish_add_path --global --move --path "$HOME/.cargo/bin"
 
-# Ruby
-fish_add_path --global --move --path "$(brew --prefix ruby)/bin"
-
 # Go
 set -gx GOPATH "$HOME/go"
 set -gx GOBIN "$GOPATH/bin"
@@ -38,23 +22,6 @@ end
 source "$HOME/dotfiles/python/venv/bin/activate.fish"
 set -gx PYTHONPATH "$PYTHONPATH:$HOME/dotfiles/lib/python"
 
-# Node.js
-set -gx NODEPATH "$(brew --prefix node@$NODE_VERSION)"
-fish_add_path --global --move --path "$NODEPATH/bin"
-
-# pnpm
-set -gx PNPM_HOME "$HOME/Library/pnpm"
-fish_add_path --global --move --path "$PNPM_HOME"
-
-# Java
-set -gx JAVAPATH "$(brew --prefix openjdk@21)"
-fish_add_path --global --move --path "$JAVAPATH/bin"
-
-# Android
-set -gx ANDROID_HOME "$HOME/Library/Android/sdk"
-fish_add_path --global --move --path "$ANDROID_HOME/emulator" "$ANDROID_HOME/platform-tools"
-
-# Python
 source "$HOME/dotfiles/python/venv/bin/activate.fish"
 set -gx PYTHONPATH "$PYTHONPATH:$DOTFILES_PATH/lib/python"
 
@@ -62,11 +29,9 @@ set -gx PYTHONPATH "$PYTHONPATH:$DOTFILES_PATH/lib/python"
 fish_add_path --global --move --path "$DOTFILES_PATH/bin" "$DOTFILES_PATH/bin/misc"
 
 # FZF
-
 set -gx FZF_DEFAULT_COMMAND 'rg --files --hidden --follow --glob "!.git/*"'
 
 # Git
-
 set -gx GIT_COMMITTER_NAME "$GIT_AUTHOR_NAME"
 set -gx GIT_COMMITTER_EMAIL "$GIT_AUTHOR_EMAIL"
 
@@ -74,7 +39,6 @@ set -g __fish_git_prompt_show_informative_status true
 set -g __fish_git_prompt_showdirtystate true
 
 # JJ
-
 set -gx JJ_CONFIG "$HOME/.config/jj/config.toml"
 
 # Vim aliases
@@ -101,7 +65,7 @@ alias ls "eza --git --color=never"
 
 # Syntax highlighting
 
-fish_config theme choose none
+fish_config theme choose None
 
 set -g fish_color_user normal
 set -g fish_color_cwd normal
diff --git a/fish/fish.xdg.symlink/hosts/Darwin.fish b/fish/fish.xdg.symlink/hosts/Darwin.fish
new file mode 100644
index 0000000..629aabf
--- /dev/null
+++ b/fish/fish.xdg.symlink/hosts/Darwin.fish
@@ -0,0 +1,33 @@
+# Homebrew (generated by `brew shellenv fish`, reformatted)
+set -gx HOMEBREW_PREFIX "/opt/homebrew";
+set -gx HOMEBREW_CELLAR "/opt/homebrew/Cellar";
+set -gx HOMEBREW_REPOSITORY "/opt/homebrew";
+
+fish_add_path --global --move --path "/opt/homebrew/bin" "/opt/homebrew/sbin";
+
+if test -n "$MANPATH[1]"
+    set -gx MANPATH '' $MANPATH
+end
+
+if not contains "/opt/homebrew/share/info" $INFOPATH
+    set -gx INFOPATH "/opt/homebrew/share/info" $INFOPATH
+end
+
+# Ruby
+fish_add_path --global --move --path "$(brew --prefix ruby)/bin"
+
+# Node.js
+set -gx NODEPATH "$(brew --prefix node@$NODE_VERSION)"
+fish_add_path --global --move --path "$NODEPATH/bin"
+
+# pnpm
+set -gx PNPM_HOME "$HOME/Library/pnpm"
+fish_add_path --global --move --path "$PNPM_HOME"
+
+# Java
+set -gx JAVAPATH "$(brew --prefix openjdk@21)"
+fish_add_path --global --move --path "$JAVAPATH/bin"
+
+# Android
+set -gx ANDROID_HOME "$HOME/Library/Android/sdk"
+fish_add_path --global --move --path "$ANDROID_HOME/emulator" "$ANDROID_HOME/platform-tools"
diff --git a/fish/fish.xdg.symlink/hosts/Linux.fish b/fish/fish.xdg.symlink/hosts/Linux.fish
new file mode 100644
index 0000000..4777d6d
--- /dev/null
+++ b/fish/fish.xdg.symlink/hosts/Linux.fish
@@ -0,0 +1 @@
+# Linux does not need any customisation because it's perfect out of the box
diff --git a/git/git.xdg.symlink/config b/git/git.xdg.symlink/config
index ddbd71c..4114b1f 100644
--- a/git/git.xdg.symlink/config
+++ b/git/git.xdg.symlink/config
@@ -69,12 +69,12 @@
 [gpg]
     format = ssh
 
-[gpg "ssh"]
-    program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
-
 [commit]
     gpgsign = true
 
 [bash]
     showInformativeStatus = 1
     showDirtyState = 1
+
+[include]
+    path = host.gitconfig
diff --git a/git/git.xdg.symlink/host.gitconfig.dist b/git/git.xdg.symlink/host.gitconfig.dist
new file mode 100644
index 0000000..9d21303
--- /dev/null
+++ b/git/git.xdg.symlink/host.gitconfig.dist
@@ -0,0 +1,3 @@
+[gpg "ssh"]
+    program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
+