29 files changed, 47 insertions, 37 deletions
diff --git a/.gitignore b/.gitignore
index a7b357b..2132b5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 config/duplicity/config
 config/duplicity/excludes
-config/git/config-local
-config/kitty/local.conf
-config/zsh/00-local.zsh
+config/all/git/config-local
+config/all/kitty/local.conf
+config/all/zsh/00-local.zsh
 dotfiles-backup
diff --git a/bin/color_test b/bin/all/color_test
index 6d6b6aa..6d6b6aa 100755
--- a/bin/color_test
+++ b/bin/all/color_test
diff --git a/bin/backup b/bin/linux/backup
index 75aded9..75aded9 100755
--- a/bin/backup
+++ b/bin/linux/backup
diff --git a/bin/dmenu-wl b/bin/linux/dmenu-wl
index 7ac2273..7ac2273 100755
--- a/bin/dmenu-wl
+++ b/bin/linux/dmenu-wl
diff --git a/bin/dnf-needs-restarting b/bin/linux/dnf-needs-restarting
index 60f7f7c..60f7f7c 100755
--- a/bin/dnf-needs-restarting
+++ b/bin/linux/dnf-needs-restarting
diff --git a/bin/setbright b/bin/linux/setbright
index 42cd48f..42cd48f 100755
--- a/bin/setbright
+++ b/bin/linux/setbright
diff --git a/bin/setvol b/bin/linux/setvol
index bf9cbed..bf9cbed 100755
--- a/bin/setvol
+++ b/bin/linux/setvol
diff --git a/config/dircolors.conf b/config/all/dircolors.conf
index cfd5f8d..cfd5f8d 100644
--- a/config/dircolors.conf
+++ b/config/all/dircolors.conf
diff --git a/config/git/config b/config/all/git/config
index 0a3bed8..0a3bed8 100644
--- a/config/git/config
+++ b/config/all/git/config
diff --git a/config/git/ignore b/config/all/git/ignore
index 57dd8e6..57dd8e6 100644
--- a/config/git/ignore
+++ b/config/all/git/ignore
diff --git a/config/kitty/kitty.conf b/config/all/kitty/kitty.conf
index 318ce8e..318ce8e 100644
--- a/config/kitty/kitty.conf
+++ b/config/all/kitty/kitty.conf
diff --git a/config/tmux/tmux.conf b/config/all/tmux/tmux.conf
index b1b98e0..b1b98e0 100644
--- a/config/tmux/tmux.conf
+++ b/config/all/tmux/tmux.conf
diff --git a/config/zsh/.zprofile b/config/all/zsh/.zprofile
index a9a13c9..a9a13c9 100644
--- a/config/zsh/.zprofile
+++ b/config/all/zsh/.zprofile
diff --git a/config/zsh/.zshrc b/config/all/zsh/.zshrc
index f33ca44..f33ca44 100644
--- a/config/zsh/.zshrc
+++ b/config/all/zsh/.zshrc
diff --git a/config/zsh/20-appearance.zsh b/config/all/zsh/20-appearance.zsh
index 4f7c8d9..4f7c8d9 100644
--- a/config/zsh/20-appearance.zsh
+++ b/config/all/zsh/20-appearance.zsh
diff --git a/config/zsh/30-behavior.zsh b/config/all/zsh/30-behavior.zsh
index 6b2b2c2..6b2b2c2 100644
--- a/config/zsh/30-behavior.zsh
+++ b/config/all/zsh/30-behavior.zsh
diff --git a/config/zsh/40-key-bindings.zsh b/config/all/zsh/40-key-bindings.zsh
index 4deac62..4deac62 100644
--- a/config/zsh/40-key-bindings.zsh
+++ b/config/all/zsh/40-key-bindings.zsh
diff --git a/config/zsh/50-completion.zsh b/config/all/zsh/50-completion.zsh
index 23cb052..23cb052 100644
--- a/config/zsh/50-completion.zsh
+++ b/config/all/zsh/50-completion.zsh
diff --git a/config/zsh/99-function-overrides.zsh b/config/all/zsh/99-function-overrides.zsh
index 8b233e5..8b233e5 100644
--- a/config/zsh/99-function-overrides.zsh
+++ b/config/all/zsh/99-function-overrides.zsh
diff --git a/config/foot/foot.ini b/config/linux/foot/foot.ini
index 47ba8be..47ba8be 100644
--- a/config/foot/foot.ini
+++ b/config/linux/foot/foot.ini
diff --git a/config/sway/config b/config/linux/sway/config
index ae737ea..ae737ea 100644
--- a/config/sway/config
+++ b/config/linux/sway/config
diff --git a/config/swaylock/config b/config/linux/swaylock/config
index f8ceefc..f8ceefc 100644
--- a/config/swaylock/config
+++ b/config/linux/swaylock/config
diff --git a/config/waybar/config b/config/linux/waybar/config
index d8cefd2..d8cefd2 100644
--- a/config/waybar/config
+++ b/config/linux/waybar/config
diff --git a/config/waybar/style.css b/config/linux/waybar/style.css
index ebcf4a6..ebcf4a6 100644
--- a/config/waybar/style.css
+++ b/config/linux/waybar/style.css
diff --git a/config/wob/wob.ini b/config/linux/wob/wob.ini
index 8205a29..8205a29 100644
--- a/config/wob/wob.ini
+++ b/config/linux/wob/wob.ini
diff --git a/config/wofi/style.css b/config/linux/wofi/style.css
index abf8ae8..abf8ae8 100644
--- a/config/wofi/style.css
+++ b/config/linux/wofi/style.css
diff --git a/deploy.sh b/deploy.sh
index baf4c7f..675490d 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -28,29 +28,42 @@ xconfig="${XDG_CONFIG_HOME:-${HOME}/.config}"
 userbin="$HOME/.local/bin"
 systemd="$xconfig/systemd/user"
 
+uname=$(uname | tr '[:upper:]' '[:lower:]')
+
 mkdir -p "$xcache" "$xdata" "$xconfig" "$userbin" "$systemd"
 
 function link {
-    src="$1"
-    dest="$2"
-    if [ -e "$dest" ] && [ ! -L "$dest" ]; then
+    link_src="$1"
+    link_dest="$2"
+    if [ -e "$link_dest" ] && [ ! -L "$link_dest" ]; then
         mkdir -p "../dotfiles-backup"
-        mv "$dest" "../dotfiles-backup/."
+        mv "$link_dest" "../dotfiles-backup/."
     fi
-    if [ ! -e "$dest" ]; then
-        ln -sf "$src" "$dest"
+    if [ ! -e "$link_dest" ]; then
+        ln -sf "$link_src" "$link_dest"
     fi
 }
 
-# deploy to XDG dirs
-mkdir -p "${xcache}/zsh"
-mkdir -p "${xdata}/zsh"
-cd config
-for d in *
-do
-    link "$(pwd)/$d" "${xconfig}/$d"
-done
-cd ..
+function deploy {
+  deploy_src="$1"
+  deploy_dest="$2"
+  if [ -e "$deploy_src/all" ]; then
+    cd "$deploy_src/all"
+    for f in *
+    do
+        link "$(pwd)/${f}" "$deploy_dest/${f}"
+    done
+    cd ../..
+  fi
+  if [ -e "$deploy_src/$uname" ]; then
+    cd "$deploy_src/$uname"
+    for f in *
+    do
+        link "$(pwd)/${f}" "$deploy_dest/${f}"
+    done
+    cd ../..
+  fi
+}
 
 # deploy to home
 cd home
@@ -60,21 +73,16 @@ do
 done
 cd ..
 
+# deploy to XDG dirs
+mkdir -p "${xcache}/zsh"
+mkdir -p "${xdata}/zsh"
+deploy config "$xconfig"
+
 # deploy user executables
-cd bin
-for f in *
-do
-    link "$(pwd)/${f}" "$userbin/${f}"
-done
-cd ..
+deploy bin "$userbin"
 
 # deploy systemd user units
-cd systemd
-for f in *
-do
-    link "$(pwd)/${f}" "$systemd/${f}"
-done
-cd ..
+deploy systemd "$systemd"
 
 autoload="$HOME/.vim/autoload"
 mkdir -p "$autoload"
@@ -103,13 +111,15 @@ fi
 if [ ! -e "$HOME/.config/kitty/local.conf" ]; then
     cp local/kitty-local.conf config/kitty/local.conf
 fi
-dconfig="$xconfig/duplicity"
-mkdir -p "$dconfig"
-if [ ! -e "$dconfig/config" ]; then
-    cp local/duplicity-config "$dconfig/config"
-fi
-if [ ! -e "$dconfig/excludes" ]; then
-    cp local/duplicity-excludes "$dconfig/excludes"
+if [ "$uname" = "linux" ]; then
+  dconfig="$xconfig/duplicity"
+  mkdir -p "$dconfig"
+  if [ ! -e "$dconfig/config" ]; then
+      cp local/duplicity-config "$dconfig/config"
+  fi
+  if [ ! -e "$dconfig/excludes" ]; then
+      cp local/duplicity-excludes "$dconfig/excludes"
+  fi
 fi
 
 # download nerdfonts
diff --git a/systemd/backup.service b/systemd/linux/backup.service
index c1adfde..c1adfde 100644
--- a/systemd/backup.service
+++ b/systemd/linux/backup.service
diff --git a/systemd/backup.timer b/systemd/linux/backup.timer
index b7815d6..b7815d6 100644
--- a/systemd/backup.timer
+++ b/systemd/linux/backup.timer