diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl
index 4f8e2c7..2d4a71e 100644
--- a/.chezmoi.toml.tmpl
+++ b/.chezmoi.toml.tmpl
@@ -15,8 +15,7 @@
 {{-     $chassisType = "desktop" }}
 {{-   end }}
 {{- else if eq .chezmoi.os "linux" }}
-#  $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }}
-{{-   $chassisType = "server" }}
+{{-   $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }}
 {{- else if eq .chezmoi.os "windows" }}
 {{-   $sysType = "windows" }}
 {{-   $chassisType = (output "powershell.exe" "-NoProfile" "-NonInteractive" "-Command" "if ((Get-CimInstance -Class Win32_Battery | Measure-Object).Count -gt 0) { Write-Output 'laptop' } else { Write-Output 'desktop' }") | trim }}
diff --git a/.chezmoiscripts/run_init.sh.tmpl b/.chezmoiscripts/run_init.sh.tmpl
index d74d340..9f1dc0f 100755
--- a/.chezmoiscripts/run_init.sh.tmpl
+++ b/.chezmoiscripts/run_init.sh.tmpl
@@ -7,7 +7,6 @@ cd "$CHEZMOI_SOURCE_DIR"
 #CZ_MODEL="$(ioreg -l | grep "product-name" | sed -Ee 's/^.*\<"(.*)\"\>.*$/\1/')"
 set | grep '^CZ_'
 printf 'System detected as %s/%s, setting up .chezmoiroot and initializing...\n' "$CZ_SYS" "$CZ_CHASSIS"
-set -x
 if [ -r "base.chezmoiroot.$CZ_SYS.$CZ_CHASSIS" ]; then
     ln -s "base.chezmoiroot.$CZ_SYS.$CZ_CHASSIS" .chezmoiroot
 elif [ -r "base.chezmoiroot.$CZ_SYS" ]; then
diff --git a/_home/private_dot_config/pet/config.toml b/_home/private_dot_config/pet/config.toml
deleted file mode 120000
index 434a914..0000000
--- a/_home/private_dot_config/pet/config.toml
+++ /dev/null
@@ -1 +0,0 @@
-../../../_src.posix/private_dot_config/pet/config.toml
\ No newline at end of file
diff --git a/_home/private_dot_config/pet/snippet.toml b/_home/private_dot_config/pet/snippet.toml
deleted file mode 120000
index 47f0c4c..0000000
--- a/_home/private_dot_config/pet/snippet.toml
+++ /dev/null
@@ -1 +0,0 @@
-../../../_src.posix/private_dot_config/pet/snippet.toml
\ No newline at end of file
diff --git a/_home/private_dot_config/sz.env/zza_pet.env b/_home/private_dot_config/sz.env/zza_pet.env
deleted file mode 120000
index a35fff6..0000000
--- a/_home/private_dot_config/sz.env/zza_pet.env
+++ /dev/null
@@ -1 +0,0 @@
-../../../_src.posix/private_dot_config/sz.env/zza_pet.env
\ No newline at end of file
diff --git a/_home/private_dot_config/sz.env/zzz_chezmoi.env b/_home/private_dot_config/sz.env/zzz_chezmoi.env
new file mode 120000
index 0000000..fb97cec
--- /dev/null
+++ b/_home/private_dot_config/sz.env/zzz_chezmoi.env
@@ -0,0 +1 @@
+../../../_src.posix/private_dot_config/sz.env/zzz_chezmoi.env
\ No newline at end of file
diff --git a/_home/private_dot_config/sz.env/zzz_chezmoi.env.tmpl b/_home/private_dot_config/sz.env/zzz_chezmoi.env.tmpl
deleted file mode 120000
index 51767bd..0000000
--- a/_home/private_dot_config/sz.env/zzz_chezmoi.env.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-../../../_src.posix/private_dot_config/sz.env/zzz_chezmoi.env.tmpl
\ No newline at end of file
diff --git a/_home/private_dot_local/bin/executable_auto-copy-ssh-id b/_home/private_dot_local/bin/executable_auto-copy-ssh-id
deleted file mode 120000
index c54d6f6..0000000
--- a/_home/private_dot_local/bin/executable_auto-copy-ssh-id
+++ /dev/null
@@ -1 +0,0 @@
-../../../_src.posix/private_dot_local/bin/executable_auto-copy-ssh-id
\ No newline at end of file
diff --git a/_home/private_dot_local/bin/symlink_nvim b/_home/private_dot_local/bin/symlink_nvim
new file mode 120000
index 0000000..0c7503f
--- /dev/null
+++ b/_home/private_dot_local/bin/symlink_nvim
@@ -0,0 +1 @@
+../../../_src.posix/private_dot_local/bin/symlink_nvim
\ No newline at end of file
diff --git a/_home/private_dot_local/bin/symlink_vi b/_home/private_dot_local/bin/symlink_vi
new file mode 120000
index 0000000..5173085
--- /dev/null
+++ b/_home/private_dot_local/bin/symlink_vi
@@ -0,0 +1 @@
+../../../_src.posix/private_dot_local/bin/symlink_vi
\ No newline at end of file
diff --git a/_home/private_dot_local/bin/symlink_vim b/_home/private_dot_local/bin/symlink_vim
new file mode 120000
index 0000000..eb45531
--- /dev/null
+++ b/_home/private_dot_local/bin/symlink_vim
@@ -0,0 +1 @@
+../../../_src.posix/private_dot_local/bin/symlink_vim
\ No newline at end of file
diff --git a/_home/private_dot_local/bin/symlink_vim.tiny b/_home/private_dot_local/bin/symlink_vim.tiny
new file mode 120000
index 0000000..638793a
--- /dev/null
+++ b/_home/private_dot_local/bin/symlink_vim.tiny
@@ -0,0 +1 @@
+../../../_src.posix/private_dot_local/bin/symlink_vim.tiny
\ No newline at end of file
diff --git a/_home/private_dot_local/bin/symlink_vimdiff b/_home/private_dot_local/bin/symlink_vimdiff
new file mode 120000
index 0000000..d1e0ef1
--- /dev/null
+++ b/_home/private_dot_local/bin/symlink_vimdiff
@@ -0,0 +1 @@
+../../../_src.posix/private_dot_local/bin/symlink_vimdiff
\ No newline at end of file
diff --git a/_src.posix/.chezmoi.toml.tmpl b/_src.posix/.chezmoi.toml.tmpl
index 95e69e6..031b1d0 100644
--- a/_src.posix/.chezmoi.toml.tmpl
+++ b/_src.posix/.chezmoi.toml.tmpl
@@ -26,8 +26,7 @@
 {{-     $chassisType = "desktop" }}
 {{-   end }}
 {{- else if eq .chezmoi.os "linux" }}
-#  $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }}
-{{-   $chassisType = "server" }}
+{{-   $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }}
 {{- else if eq .chezmoi.os "windows" }}
 {{-   $sysType = "windows" }}
 {{-   $sysVendor = "pc" }}
diff --git a/_src.posix/private_dot_config/sz.env/aliases.env b/_src.posix/private_dot_config/sz.env/aliases.env
index fb96806..d5c470b 100644
--- a/_src.posix/private_dot_config/sz.env/aliases.env
+++ b/_src.posix/private_dot_config/sz.env/aliases.env
@@ -8,9 +8,7 @@ alias ll='l -A'
 
 alias sudo='sudo '
 
-is_cmd nvim \
-&& alias nvim='POSTFIX_BUITINS=1 command nvim -p ' \
-|| alias nvim='POSTFIX_BUITINS=1 command vim -p '
+alias nvim='POSTFIX_BUITINS=1 command nvim -p '
 alias vi='nvim '
 alias vim='nvim '
 alias nvimdiff='nvim -d '
diff --git a/symclone.sh b/symclone.sh
index c762bb8..a5e6cfe 100755
--- a/symclone.sh
+++ b/symclone.sh
@@ -32,7 +32,7 @@ fi
 mkdir -p "$DEST_DIR"
 
 # Find all directories and recreate them in the destination
-find "$SRC_DIR" -mindepth 1 -type d | while read -r dir; do
+find "$SRC_DIR" -type d -mindepth 1 | while read -r dir; do
     mkdir -p "$DEST_DIR/${dir#$SRC_DIR/}"
 done