From a78613920c49e63e387a435fb99145e18a898413 Mon Sep 17 00:00:00 2001
From: Alex Tavarez <admin@sukaato.moe>
Date: Thu, 18 Jun 2026 19:14:14 -0400
Subject: [PATCH] moved vim to userspace package group, referenced crowdsec
 handler, added password hashing/encryption

---
 group_vars/armitage_test.yml | 22 +++++++++++-----------
 group_vars/sukaato_test.yml  | 22 +++++++++++-----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/group_vars/armitage_test.yml b/group_vars/armitage_test.yml
index 86d5928..c3f6fb6 100644
--- a/group_vars/armitage_test.yml
+++ b/group_vars/armitage_test.yml
@@ -1,6 +1,6 @@
 # @TODO create inventory group variables akin to structure of sukaato group's for homeserver
 # <str<vault>> representing password for Linux root user account of VPS
-password: "{{ lookup('password', '../.tmp/armitage_test.pass', seed='armitage_test') }}"
+password: "{{ lookup('password', '../.tmp/armitage_test.pass', seed='armitage_test', encrypt='sha512_crypt') }}"
 # <str> representing hostname for LAN server; same as host or group variable name
 instance: armitage
 # <str<enum>> representing Linux distro or OS image to be used for VPS 
@@ -20,7 +20,7 @@ admins:
       - ecdsa-37851076-sk@staging
       - ed25519-37851076-sk@staging
     # <str<vault?>> hashed (and maybe salted) password
-    password: "{{ lookup('password', '../.tmp/armitage_test.pass', seed='senpai:armitage_test') }}"
+    password: "{{ lookup('password', '../.tmp/senpai@armitage_test.pass', seed='senpai:armitage_test', encrypt='sha512_crypt') }}"
 # <dict[<str>:<dict>]> package groups
 pkgs:
   # <dict[<str>:<dict>]> representing package groups installed by package manager via repositories
@@ -83,14 +83,6 @@ pkgs:
         suites: ~
         comps: ~
         handler: ~
-      - name: vim
-        uri: ~
-        sources: ~
-        sigkey: ~
-        types: ~
-        suites: ~
-        comps: ~
-        handler: vim
       - name: vim-vimwiki
         uri: ~
         sigkey: ~
@@ -170,7 +162,7 @@ pkgs:
         types: ~
         suites: ~
         comps: ~
-        handler: ~
+        handler: crowdsec
       - name: glow
         uri: ~
         sigkey: "https://repo.charm.sh/apt/gpg.key"
@@ -388,6 +380,14 @@ pkgs:
         comps: ~
         handler: ~
     userspace:
+      - name: vim
+        uri: ~
+        sources: ~
+        sigkey: ~
+        types: ~
+        suites: ~
+        comps: ~
+        handler: vim
       - name: neovim
         uri: ~
         sources: ~
diff --git a/group_vars/sukaato_test.yml b/group_vars/sukaato_test.yml
index 506c24d..e699221 100644
--- a/group_vars/sukaato_test.yml
+++ b/group_vars/sukaato_test.yml
@@ -1,5 +1,5 @@
 # <str<vault>> representing password for Linux root user account of VPS
-password: "{{ lookup('password', '../.tmp/sukaato_test.pass', seed='sukaato_test') }}"
+password: "{{ lookup('password', './.tmp/sukaato_test.pass', seed='sukaato_test', encrypt='sha512_crypt') }}"
 # <str<vault>> representing API token for VPS cloud service
 token: ~
 # <str> representing name and hostname of VPS to be made in VPS cloud service
@@ -22,7 +22,7 @@ admins:
       - ecdsa-37851076-sk@staging
       - ed25519-37851076-sk@staging
     # <str<vault?>> hashed (and maybe salted) password
-    password: "{{ lookup('password', '../.tmp/sukaato_test.pass', seed='senpai:sukaato_test') }}"
+    password: "{{ lookup('password', './.tmp/senpai@sukaato_test.pass', seed='senpai:sukaato_test', encrypt='sha512_crypt') }}"
 # <dict[<str>:<dict>]> package groups
 pkgs:
   # <dict[<str>:<dict>]> representing package groups installed by package manager via repositories
@@ -157,14 +157,6 @@ pkgs:
         suites: ~
         comps: ~
         handler: ~
-      - name: vim
-        uri: ~
-        sources: ~
-        sigkey: ~
-        types: ~
-        suites: ~
-        comps: ~
-        handler: vim
       - name: git
         uri: ~
         sources: ~
@@ -188,7 +180,7 @@ pkgs:
         types: ~
         suites: ~
         comps: ~
-        handler: ~
+        handler: crowdsec
       - name: glow
         uri: ~
         sigkey: "https://repo.charm.sh/apt/gpg.key"
@@ -335,6 +327,14 @@ pkgs:
         comps: ~
         handler: headscale
     userspace:
+      - name: vim
+        uri: ~
+        sources: ~
+        sigkey: ~
+        types: ~
+        suites: ~
+        comps: ~
+        handler: vim
       - name: neovim
         uri: ~
         sigkey: ~