From 9442bcd3e6691fc394f0f76d3bb601675efc07b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Wed, 18 Nov 2020 16:53:23 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B=20app?=
 =?UTF-8?q?-editors/vim?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 merge/app-editors/.calculate_directory     | 1 +
 merge/app-editors/vim/.calculate_directory | 1 +
 merge/app-editors/vim/99editor             | 3 +++
 merge/app-editors/vim/vim.desktop          | 1 +
 merge/app-editors/vim/vimrc.local          | 5 +++++
 5 files changed, 11 insertions(+)
 create mode 100644 merge/app-editors/.calculate_directory
 create mode 100644 merge/app-editors/vim/.calculate_directory
 create mode 100644 merge/app-editors/vim/99editor
 create mode 100644 merge/app-editors/vim/vim.desktop
 create mode 100644 merge/app-editors/vim/vimrc.local

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 %}