From 8f37b6b73be81139766ce0e57844ed23990d193a Mon Sep 17 00:00:00 2001
From: Josh Brower <Josh@Defensivedepth.com>
Date: Thu, 22 Apr 2021 09:35:42 -0400
Subject: [PATCH] Make sure VIM is installed with correct settings

---
 salt/common/files/vimrc |  6 ++++++
 salt/common/init.sls    | 10 ++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 salt/common/files/vimrc

diff --git a/salt/common/files/vimrc b/salt/common/files/vimrc
new file mode 100644
index 000000000..4234cf772
--- /dev/null
+++ b/salt/common/files/vimrc
@@ -0,0 +1,6 @@
+" Activates filetype detection
+filetype plugin indent on
+
+" Sets .sls files to use YAML syntax highlighting
+autocmd BufNewFile,BufRead *.sls set syntax=yaml
+set number
\ No newline at end of file
diff --git a/salt/common/init.sls b/salt/common/init.sls
index 6ef841ea4..012fcdc9b 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -69,6 +69,13 @@ salttmp:
     - group: 939
     - makedirs: True
 
+# VIM config
+vimconfig:
+  file.managed:
+    - name: /root/.vimrc
+    - source: salt://common/files/vimrc
+    - replace: False
+
 # Install common packages
 {% if grains['os'] != 'CentOS' %}     
 commonpkgs:
@@ -95,6 +102,8 @@ commonpkgs:
       - python3-mysqldb
       - python3-packaging
       - git
+      - vim
+
 heldpackages:
   pkg.installed:
     - pkgs:
@@ -133,6 +142,7 @@ commonpkgs:
       - lvm2
       - openssl
       - git
+      - vim-enhanced
 
 heldpackages:
   pkg.installed: