From db9ef4c5d72e493bb311f0fda5cdd22aa1dc6622 Mon Sep 17 00:00:00 2001
From: John Bowdre <john@bowdre.net>
Date: Fri, 24 Mar 2023 16:06:42 -0500
Subject: [PATCH] vim state tweaks

- change id to avoid ambiguity with package names
- rename module/folder because I'm not going to configure other editors
- update references to match
---
 README.md                                              | 4 ++--
 srv/salt/{edit/vim.sls => vim/init.sls}                | 4 ++--
 srv/salt/{edit/vim-uninstall.sls => vim/uninstall.sls} | 2 +-
 srv/salt/{edit => vim}/vimrc                           | 0
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename srv/salt/{edit/vim.sls => vim/init.sls} (82%)
 rename srv/salt/{edit/vim-uninstall.sls => vim/uninstall.sls} (91%)
 rename srv/salt/{edit => vim}/vimrc (100%)

diff --git a/README.md b/README.md
index 4c0fc64..d627d8f 100644
--- a/README.md
+++ b/README.md
@@ -70,9 +70,9 @@ minion04:
     True
 ```
 
-And finally, as a treat, apply a [Salt state to install vim and my vimrc](srv/salt/edit/vim.sls) on the minions with the `roles:saltlab` grain:
+And finally, as a treat, apply a [Salt state to install vim and my vimrc](srv/salt/vim/init.sls) on the minions with the `roles:saltlab` grain:
 ```shell
-sudo salt -G 'roles:saltlab` state.apply edit.vim
+sudo salt -G 'roles:saltlab` state.apply vim
 ```
 
 Happy Salting!
diff --git a/srv/salt/edit/vim.sls b/srv/salt/vim/init.sls
similarity index 82%
rename from srv/salt/edit/vim.sls
rename to srv/salt/vim/init.sls
index 05489fe..5eae0ac 100644
--- a/srv/salt/edit/vim.sls
+++ b/srv/salt/vim/init.sls
@@ -1,4 +1,4 @@
-vim:
+install_vim:
   pkg.installed:
     {% if grains['os_family'] == 'RedHat'%}
     - name: vim-enhanced
@@ -8,7 +8,7 @@ vim:
 
 /etc/vimrc:
   file.managed:
-    - source: salt://edit/vimrc
+    - source: salt://vim/vimrc
     - mode: 644
     - user: root
     - group: root
diff --git a/srv/salt/edit/vim-uninstall.sls b/srv/salt/vim/uninstall.sls
similarity index 91%
rename from srv/salt/edit/vim-uninstall.sls
rename to srv/salt/vim/uninstall.sls
index ed1d1db..12f74ec 100644
--- a/srv/salt/edit/vim-uninstall.sls
+++ b/srv/salt/vim/uninstall.sls
@@ -1,4 +1,4 @@
-vim:
+uninstall_vim:
   pkg.removed:
     {% if grains['os_family'] == 'RedHat'%}
     - name: vim-enhanced
diff --git a/srv/salt/edit/vimrc b/srv/salt/vim/vimrc
similarity index 100%
rename from srv/salt/edit/vimrc
rename to srv/salt/vim/vimrc