diff --git a/merge/app-editors/.calculate_directory b/merge/app-editors/.calculate_directory
new file mode 100644
index 0000000..8e3df7f
--- /dev/null
+++ b/merge/app-editors/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append = 'skip' %}
diff --git a/merge/app-editors/vim/.calculate_directory b/merge/app-editors/vim/.calculate_directory
new file mode 100644
index 0000000..b30694d
--- /dev/null
+++ b/merge/app-editors/vim/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append='skip', package='app-editors/vim' %}
diff --git a/merge/app-editors/vim/99editor b/merge/app-editors/vim/99editor
new file mode 100644
index 0000000..6a3ce10
--- /dev/null
+++ b/merge/app-editors/vim/99editor
@@ -0,0 +1,3 @@
+{% calculate path='/etc/env.d', format='raw', append='replace' %}
+
+EDITOR="/usr/bin/vim"
diff --git a/merge/app-editors/vim/vim.desktop b/merge/app-editors/vim/vim.desktop
new file mode 100644
index 0000000..5396149
--- /dev/null
+++ b/merge/app-editors/vim/vim.desktop
@@ -0,0 +1 @@
+{% calculate append='remove', path='/usr/share/applications' %}
diff --git a/merge/app-editors/vim/vimrc.local b/merge/app-editors/vim/vimrc.local
new file mode 100644
index 0000000..e1cc945
--- /dev/null
+++ b/merge/app-editors/vim/vimrc.local
@@ -0,0 +1,5 @@
+{% calculate comment='"', path='/etc/vim', format='raw', append='replace' %}
+set t_Co=256
+{% if pkg('app-vim/colorschemes') %}
+colorscheme desert256
+{% endif %}