diff --git a/home/dot_config/nvim/.chezmoiignore b/home/dot_config/nvim/.chezmoiignore
index 27be49f..3d07f6f 100644
--- a/home/dot_config/nvim/.chezmoiignore
+++ b/home/dot_config/nvim/.chezmoiignore
@@ -1,2 +1,2 @@
 lazy-lock.json*
-
+lazyvim.json
diff --git a/home/dot_config/private_fish/conf.d/11-abbr.fish b/home/dot_config/private_fish/conf.d/11-abbr.fish.tmpl
similarity index 82%
rename from home/dot_config/private_fish/conf.d/11-abbr.fish
rename to home/dot_config/private_fish/conf.d/11-abbr.fish.tmpl
index c2d0e64..201adc7 100644
--- a/home/dot_config/private_fish/conf.d/11-abbr.fish
+++ b/home/dot_config/private_fish/conf.d/11-abbr.fish.tmpl
@@ -18,3 +18,8 @@ if type -q eza
     alias ll 'eza --long --all --group --header'
     alias lt 'eza --long --all --group --header --tree --level'
 end
+
+{{ if (eq .chezmoi.os "darwin") -}}
+abbr ap "ansible-playbook"
+abbr apb "ansible-playbook --ask-become"
+{{ end -}}
diff --git a/home/dot_config/private_fish/conf.d/96-cdpath.fish.tmpl b/home/dot_config/private_fish/conf.d/96-cdpath.fish.tmpl
new file mode 100644
index 0000000..b889b3f
--- /dev/null
+++ b/home/dot_config/private_fish/conf.d/96-cdpath.fish.tmpl
@@ -0,0 +1,7 @@
+{{ if (eq .chezmoi.os "darwin") -}}
+set -gx CDPATH . $HOME $HOME/Development $HOME/Development/XCode $HOME/.config
+{{ end -}}
+
+{{ if (eq .chezmoi.os "linux") -}}
+set -gx CDPATH . $HOME $HOME/dev
+{{ end -}}
diff --git a/home/dot_config/private_fish/omf/platforms/Linux.fish b/home/dot_config/private_fish/conf.d/96-ssh-env.fish
similarity index 100%
rename from home/dot_config/private_fish/omf/platforms/Linux.fish
rename to home/dot_config/private_fish/conf.d/96-ssh-env.fish
diff --git a/home/dot_config/private_fish/functions/.chezmoiignore b/home/dot_config/private_fish/functions/.chezmoiignore
new file mode 100644
index 0000000..b3946cf
--- /dev/null
+++ b/home/dot_config/private_fish/functions/.chezmoiignore
@@ -0,0 +1,8 @@
+{{- if not (eq .chezmoi.os "darwin") }}
+df.fish
+flushdns.fish
+{{- end }}
+
+{{ if not (eq .chezmoi.os "linux") -}}
+agent.fish
+{{- end }}
diff --git a/home/dot_config/private_fish/omf/platforms/Linux/functions/agent.fish b/home/dot_config/private_fish/functions/agent.fish
similarity index 100%
rename from home/dot_config/private_fish/omf/platforms/Linux/functions/agent.fish
rename to home/dot_config/private_fish/functions/agent.fish
diff --git a/home/dot_config/private_fish/omf/hosts/Odin/functions/df.fish b/home/dot_config/private_fish/functions/df.fish
similarity index 100%
rename from home/dot_config/private_fish/omf/hosts/Odin/functions/df.fish
rename to home/dot_config/private_fish/functions/df.fish
diff --git a/home/dot_config/private_fish/omf/platforms/Darwin/functions/flushdns.fish b/home/dot_config/private_fish/functions/flushdns.fish
similarity index 100%
rename from home/dot_config/private_fish/omf/platforms/Darwin/functions/flushdns.fish
rename to home/dot_config/private_fish/functions/flushdns.fish
diff --git a/home/dot_config/private_fish/omf/hosts/Odin/functions/kpsql.fish b/home/dot_config/private_fish/functions/kpsql.fish
similarity index 100%
rename from home/dot_config/private_fish/omf/hosts/Odin/functions/kpsql.fish
rename to home/dot_config/private_fish/functions/kpsql.fish
diff --git a/home/dot_config/private_fish/omf/hosts/Odin/functions/kspsql.fish b/home/dot_config/private_fish/functions/kspsql.fish
similarity index 100%
rename from home/dot_config/private_fish/omf/hosts/Odin/functions/kspsql.fish
rename to home/dot_config/private_fish/functions/kspsql.fish
diff --git a/home/dot_config/private_fish/omf/bundle b/home/dot_config/private_fish/omf/bundle
deleted file mode 100644
index 740ff58..0000000
--- a/home/dot_config/private_fish/omf/bundle
+++ /dev/null
@@ -1,5 +0,0 @@
-package brew
-package direnv
-package local-config
-package rustup
-theme default
diff --git a/home/dot_config/private_fish/omf/channel b/home/dot_config/private_fish/omf/channel
deleted file mode 100644
index 2bf5ad0..0000000
--- a/home/dot_config/private_fish/omf/channel
+++ /dev/null
@@ -1 +0,0 @@
-stable
diff --git a/home/dot_config/private_fish/omf/hosts/Odin.fish b/home/dot_config/private_fish/omf/hosts/Odin.fish
deleted file mode 100644
index cb5a9b3..0000000
--- a/home/dot_config/private_fish/omf/hosts/Odin.fish
+++ /dev/null
@@ -1 +0,0 @@
-set -gx CDPATH . $HOME $HOME/Development $HOME/Development/XCode $HOME/.config
diff --git a/home/dot_config/private_fish/omf/hosts/Odin/conf.d/11-abbr.fish b/home/dot_config/private_fish/omf/hosts/Odin/conf.d/11-abbr.fish
deleted file mode 100644
index 2beab65..0000000
--- a/home/dot_config/private_fish/omf/hosts/Odin/conf.d/11-abbr.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-# Aliases
-abbr ap "ansible-playbook"
-abbr apb "ansible-playbook --ask-become"
diff --git a/home/dot_config/private_fish/omf/hosts/empty_athena.fish b/home/dot_config/private_fish/omf/hosts/empty_athena.fish
deleted file mode 100644
index e69de29..0000000
diff --git a/home/dot_config/private_fish/omf/hosts/ragnar.fish b/home/dot_config/private_fish/omf/hosts/ragnar.fish
deleted file mode 100644
index 91bf7fc..0000000
--- a/home/dot_config/private_fish/omf/hosts/ragnar.fish
+++ /dev/null
@@ -1 +0,0 @@
-set -gx CDPATH . $HOME $HOME/dev
diff --git a/home/dot_config/private_fish/omf/hosts/ragnar/functions/.keep b/home/dot_config/private_fish/omf/hosts/ragnar/functions/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/home/dot_config/private_fish/omf/hosts/symlink_odin-wifi.zinn.tech b/home/dot_config/private_fish/omf/hosts/symlink_odin-wifi.zinn.tech
deleted file mode 100644
index 9388443..0000000
--- a/home/dot_config/private_fish/omf/hosts/symlink_odin-wifi.zinn.tech
+++ /dev/null
@@ -1 +0,0 @@
-Odin
diff --git a/home/dot_config/private_fish/omf/hosts/symlink_odin-wifi.zinn.tech.fish b/home/dot_config/private_fish/omf/hosts/symlink_odin-wifi.zinn.tech.fish
deleted file mode 100644
index abdd71b..0000000
--- a/home/dot_config/private_fish/omf/hosts/symlink_odin-wifi.zinn.tech.fish
+++ /dev/null
@@ -1 +0,0 @@
-Odin.fish
diff --git a/home/dot_config/private_fish/omf/hosts/symlink_odin.zinn.tech b/home/dot_config/private_fish/omf/hosts/symlink_odin.zinn.tech
deleted file mode 100644
index 9388443..0000000
--- a/home/dot_config/private_fish/omf/hosts/symlink_odin.zinn.tech
+++ /dev/null
@@ -1 +0,0 @@
-Odin
diff --git a/home/dot_config/private_fish/omf/hosts/symlink_odin.zinn.tech.fish b/home/dot_config/private_fish/omf/hosts/symlink_odin.zinn.tech.fish
deleted file mode 100644
index abdd71b..0000000
--- a/home/dot_config/private_fish/omf/hosts/symlink_odin.zinn.tech.fish
+++ /dev/null
@@ -1 +0,0 @@
-Odin.fish
diff --git a/home/dot_config/private_fish/omf/platforms/Darwin/conf.d/empty_11-aliases.fish b/home/dot_config/private_fish/omf/platforms/Darwin/conf.d/empty_11-aliases.fish
deleted file mode 100644
index e69de29..0000000
diff --git a/home/dot_config/private_fish/omf/platforms/Darwin/functions/.keep b/home/dot_config/private_fish/omf/platforms/Darwin/functions/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/home/dot_config/private_fish/omf/platforms/Darwin/functions/agent.fish b/home/dot_config/private_fish/omf/platforms/Darwin/functions/agent.fish
deleted file mode 100644
index 97504f9..0000000
--- a/home/dot_config/private_fish/omf/platforms/Darwin/functions/agent.fish
+++ /dev/null
@@ -1,37 +0,0 @@
-function agent --description "Start ssh-agent if not started yet, or uses already started ssh-agent."
-  function __ssh_agent_is_started -d "check if ssh agent is already started"
-    if test -f $SSH_ENV
-      source $SSH_ENV > /dev/null
-    else
-      return 1
-    end
-
-    if test -z "$SSH_AGENT_PID"
-      return 1
-    end
-
-    ps -ef | grep $SSH_AGENT_PID | grep -v grep | grep -v defunct | grep -q ssh-agent
-    return $status
-  end
-
-  function __ssh_agent_start -d "start a new ssh agent"
-    if ! test -z (pgrep ssh-agent)
-      for i in (string split ' ' (pgrep ssh-agent))
-        kill -9 $i
-      end
-    end
-    ssh-agent -c | grep -v echo > $SSH_ENV
-    chmod 600 $SSH_ENV
-    source $SSH_ENV > /dev/null
-    true  # suppress errors from setenv, i.e. set -gx
-  end
-
-  if test -z "$SSH_ENV"
-    set -xg SSH_ENV $HOME/.ssh/environment
-  end
-
-  if not __ssh_agent_is_started
-    __ssh_agent_start
-    ssh-add
-  end
-end
diff --git a/home/dot_config/private_fish/omf/platforms/empty_Darwin.fish b/home/dot_config/private_fish/omf/platforms/empty_Darwin.fish
deleted file mode 100644
index e69de29..0000000
diff --git a/home/dot_config/private_fish/omf/theme b/home/dot_config/private_fish/omf/theme
deleted file mode 100644
index 4ad96d5..0000000
--- a/home/dot_config/private_fish/omf/theme
+++ /dev/null
@@ -1 +0,0 @@
-default
diff --git a/home/dot_config/private_fish/omf/users/empty_scotte.fish b/home/dot_config/private_fish/omf/users/empty_scotte.fish
deleted file mode 100644
index e69de29..0000000
diff --git a/home/dot_config/private_fish/themes/.keep b/home/dot_config/private_fish/themes/.keep
deleted file mode 100644
index e69de29..0000000