From 62636c39628a40e9db07572887b7f61356c6c8c4 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Fri, 10 Apr 2026 09:14:02 -0400
Subject: [PATCH 01/36] Add base/template content

---
 notepad-plusplus/_mapdata/_mapdata.jinja      |  13 +
 notepad-plusplus/_mapdata/init.sls            |  22 ++
 notepad-plusplus/clean.sls                    |   8 +
 notepad-plusplus/config/clean.sls             |  16 +
 notepad-plusplus/config/file.sls              |  28 ++
 notepad-plusplus/config/init.sls              |   5 +
 notepad-plusplus/files/default/example.tmpl   |   6 +
 .../files/default/example.tmpl.jinja          |  11 +
 notepad-plusplus/init.sls                     |   8 +
 notepad-plusplus/libmapstack.jinja            | 315 ++++++++++++++++++
 notepad-plusplus/libmatchers.jinja            | 222 ++++++++++++
 notepad-plusplus/libsaltcli.jinja             |  18 +
 notepad-plusplus/libtofs.jinja                | 115 +++++++
 notepad-plusplus/map.jinja                    |  66 ++++
 notepad-plusplus/package/clean.sls            |  16 +
 notepad-plusplus/package/init.sls             |   5 +
 notepad-plusplus/package/install.sls          |  23 ++
 notepad-plusplus/parameters/defaults.yaml     |  10 +
 notepad-plusplus/parameters/os/Fedora.yaml    |  19 ++
 .../parameters/os/MacOS.yaml.jinja            |  20 ++
 notepad-plusplus/parameters/os/Ubuntu.yaml    |  18 +
 .../parameters/os_family/Arch.yaml            |  19 ++
 .../parameters/os_family/Debian.yaml          |  18 +
 .../parameters/os_family/FreeBSD.yaml         |  16 +
 .../parameters/os_family/Gentoo.yaml          |  17 +
 .../parameters/os_family/OpenBSD.yaml         |  16 +
 .../parameters/os_family/RedHat.yaml          |  18 +
 .../parameters/os_family/Suse.yaml            |  17 +
 notepad-plusplus/parameters/osarch/386.yaml   |  16 +
 notepad-plusplus/parameters/osarch/amd64.yaml |  16 +
 notepad-plusplus/parameters/osarch/arm64.yaml |  16 +
 .../parameters/osarch/armv6l.yaml             |  16 +
 .../parameters/osarch/armv7l.yaml             |  16 +
 .../parameters/osarch/ppc64le.yaml            |  16 +
 notepad-plusplus/parameters/osarch/s390x.yaml |  16 +
 .../parameters/osarch/x86_64.yaml             |  16 +
 .../parameters/osfinger/CentOS-6.yaml         |  18 +
 .../parameters/osfinger/Ubuntu-18.04.yaml     |  16 +
 notepad-plusplus/service/clean.sls            |  11 +
 notepad-plusplus/service/init.sls             |   5 +
 notepad-plusplus/service/running.sls          |  17 +
 notepad-plusplus/subcomponent/clean.sls       |   5 +
 .../subcomponent/config/clean.sls             |  16 +
 notepad-plusplus/subcomponent/config/file.sls |  27 ++
 .../files/default/subcomponent-example.tmpl   |   6 +
 .../default/subcomponent-example.tmpl.jinja   |   6 +
 notepad-plusplus/subcomponent/config/init.sls |   5 +
 notepad-plusplus/subcomponent/init.sls        |   5 +
 48 files changed, 1350 insertions(+)
 create mode 100644 notepad-plusplus/_mapdata/_mapdata.jinja
 create mode 100644 notepad-plusplus/_mapdata/init.sls
 create mode 100644 notepad-plusplus/clean.sls
 create mode 100644 notepad-plusplus/config/clean.sls
 create mode 100644 notepad-plusplus/config/file.sls
 create mode 100644 notepad-plusplus/config/init.sls
 create mode 100644 notepad-plusplus/files/default/example.tmpl
 create mode 100644 notepad-plusplus/files/default/example.tmpl.jinja
 create mode 100644 notepad-plusplus/init.sls
 create mode 100644 notepad-plusplus/libmapstack.jinja
 create mode 100644 notepad-plusplus/libmatchers.jinja
 create mode 100644 notepad-plusplus/libsaltcli.jinja
 create mode 100644 notepad-plusplus/libtofs.jinja
 create mode 100644 notepad-plusplus/map.jinja
 create mode 100644 notepad-plusplus/package/clean.sls
 create mode 100644 notepad-plusplus/package/init.sls
 create mode 100644 notepad-plusplus/package/install.sls
 create mode 100644 notepad-plusplus/parameters/defaults.yaml
 create mode 100644 notepad-plusplus/parameters/os/Fedora.yaml
 create mode 100644 notepad-plusplus/parameters/os/MacOS.yaml.jinja
 create mode 100644 notepad-plusplus/parameters/os/Ubuntu.yaml
 create mode 100644 notepad-plusplus/parameters/os_family/Arch.yaml
 create mode 100644 notepad-plusplus/parameters/os_family/Debian.yaml
 create mode 100644 notepad-plusplus/parameters/os_family/FreeBSD.yaml
 create mode 100644 notepad-plusplus/parameters/os_family/Gentoo.yaml
 create mode 100644 notepad-plusplus/parameters/os_family/OpenBSD.yaml
 create mode 100644 notepad-plusplus/parameters/os_family/RedHat.yaml
 create mode 100644 notepad-plusplus/parameters/os_family/Suse.yaml
 create mode 100644 notepad-plusplus/parameters/osarch/386.yaml
 create mode 100644 notepad-plusplus/parameters/osarch/amd64.yaml
 create mode 100644 notepad-plusplus/parameters/osarch/arm64.yaml
 create mode 100644 notepad-plusplus/parameters/osarch/armv6l.yaml
 create mode 100644 notepad-plusplus/parameters/osarch/armv7l.yaml
 create mode 100644 notepad-plusplus/parameters/osarch/ppc64le.yaml
 create mode 100644 notepad-plusplus/parameters/osarch/s390x.yaml
 create mode 100644 notepad-plusplus/parameters/osarch/x86_64.yaml
 create mode 100644 notepad-plusplus/parameters/osfinger/CentOS-6.yaml
 create mode 100644 notepad-plusplus/parameters/osfinger/Ubuntu-18.04.yaml
 create mode 100644 notepad-plusplus/service/clean.sls
 create mode 100644 notepad-plusplus/service/init.sls
 create mode 100644 notepad-plusplus/service/running.sls
 create mode 100644 notepad-plusplus/subcomponent/clean.sls
 create mode 100644 notepad-plusplus/subcomponent/config/clean.sls
 create mode 100644 notepad-plusplus/subcomponent/config/file.sls
 create mode 100644 notepad-plusplus/subcomponent/config/files/default/subcomponent-example.tmpl
 create mode 100644 notepad-plusplus/subcomponent/config/files/default/subcomponent-example.tmpl.jinja
 create mode 100644 notepad-plusplus/subcomponent/config/init.sls
 create mode 100644 notepad-plusplus/subcomponent/init.sls

diff --git a/notepad-plusplus/_mapdata/_mapdata.jinja b/notepad-plusplus/_mapdata/_mapdata.jinja
new file mode 100644
index 0000000..aa9649c
--- /dev/null
+++ b/notepad-plusplus/_mapdata/_mapdata.jinja
@@ -0,0 +1,13 @@
+# yamllint disable rule:indentation rule:line-length
+# {{ grains.get("osfinger", grains.os) }}
+---
+{#- use salt.slsutil.serialize to avoid encoding errors on some platforms #}
+{{ salt["slsutil.serialize"](
+     "yaml",
+     map,
+     default_flow_style=False,
+     allow_unicode=True,
+   )
+   | regex_replace("^\s+'$", "'", multiline=True)
+   | trim
+}}
diff --git a/notepad-plusplus/_mapdata/init.sls b/notepad-plusplus/_mapdata/init.sls
new file mode 100644
index 0000000..3529a8d
--- /dev/null
+++ b/notepad-plusplus/_mapdata/init.sls
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+---
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split("/")[0] %}
+{%- from tplroot ~ "/map.jinja" import mapdata with context %}
+
+{%- set _mapdata = {
+      "values": mapdata,
+    } %}
+{%- do salt["log.debug"]("### MAP.JINJA DUMP ###\n" ~ _mapdata | yaml(False)) %}
+
+{%- set output_dir = "/temp" if grains.os_family == "Windows" else "/tmp" %}
+{%- set output_file = output_dir ~ "/salt_mapdata_dump.yaml" %}
+
+{{ tplroot }}-mapdata-dump:
+  file.managed:
+    - name: {{ output_file }}
+    - source: salt://{{ tplroot }}/_mapdata/_mapdata.jinja
+    - template: jinja
+    - context:
+        map: {{ _mapdata | yaml }}
diff --git a/notepad-plusplus/clean.sls b/notepad-plusplus/clean.sls
new file mode 100644
index 0000000..9e45fb4
--- /dev/null
+++ b/notepad-plusplus/clean.sls
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .subcomponent.clean
+  - .service.clean
+  - .config.clean
+  - .package.clean
diff --git a/notepad-plusplus/config/clean.sls b/notepad-plusplus/config/clean.sls
new file mode 100644
index 0000000..fe9f4e8
--- /dev/null
+++ b/notepad-plusplus/config/clean.sls
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set sls_service_clean = tplroot ~ '.service.clean' %}
+{%- from tplroot ~ "/map.jinja" import mapdata as notepad__plusplus with context %}
+
+include:
+  - {{ sls_service_clean }}
+
+notepad-plusplus-config-clean-file-absent:
+  file.absent:
+    - name: {{ notepad__plusplus.config }}
+    - require:
+      - sls: {{ sls_service_clean }}
diff --git a/notepad-plusplus/config/file.sls b/notepad-plusplus/config/file.sls
new file mode 100644
index 0000000..198e50b
--- /dev/null
+++ b/notepad-plusplus/config/file.sls
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set sls_package_install = tplroot ~ '.package.install' %}
+{%- from tplroot ~ "/map.jinja" import mapdata as notepad__plusplus with context %}
+{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
+
+include:
+  - {{ sls_package_install }}
+
+notepad-plusplus-config-file-file-managed:
+  file.managed:
+    - name: {{ notepad__plusplus.config }}
+    - source: {{ files_switch(['example.tmpl'],
+                              lookup='notepad-plusplus-config-file-file-managed'
+                 )
+              }}
+    - mode: 644
+    - user: root
+    - group: {{ notepad__plusplus.rootgroup }}
+    - makedirs: True
+    - template: jinja
+    - require:
+      - sls: {{ sls_package_install }}
+    - context:
+        notepad__plusplus: {{ notepad__plusplus | json }}
diff --git a/notepad-plusplus/config/init.sls b/notepad-plusplus/config/init.sls
new file mode 100644
index 0000000..465ddfe
--- /dev/null
+++ b/notepad-plusplus/config/init.sls
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .file
diff --git a/notepad-plusplus/files/default/example.tmpl b/notepad-plusplus/files/default/example.tmpl
new file mode 100644
index 0000000..2c9c60f
--- /dev/null
+++ b/notepad-plusplus/files/default/example.tmpl
@@ -0,0 +1,6 @@
+########################################################################
+# File managed by Salt at <{{ source }}>.
+# Your changes will be overwritten.
+########################################################################
+
+This is an example file from SaltStack template-formula.
diff --git a/notepad-plusplus/files/default/example.tmpl.jinja b/notepad-plusplus/files/default/example.tmpl.jinja
new file mode 100644
index 0000000..1b35e46
--- /dev/null
+++ b/notepad-plusplus/files/default/example.tmpl.jinja
@@ -0,0 +1,11 @@
+########################################################################
+# File managed by Salt at <{{ source }}>.
+# Your changes will be overwritten.
+########################################################################
+
+This is another example file from SaltStack template-formula.
+
+# This is here for testing purposes
+{{ notepad__plusplus | json }}
+
+winner of the merge: {{ notepad__plusplus['winner'] }}
diff --git a/notepad-plusplus/init.sls b/notepad-plusplus/init.sls
new file mode 100644
index 0000000..275d1fc
--- /dev/null
+++ b/notepad-plusplus/init.sls
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .package
+  - .config
+  - .service
+  - .subcomponent
diff --git a/notepad-plusplus/libmapstack.jinja b/notepad-plusplus/libmapstack.jinja
new file mode 100644
index 0000000..8f54ef3
--- /dev/null
+++ b/notepad-plusplus/libmapstack.jinja
@@ -0,0 +1,315 @@
+{#- -*- coding: utf-8 -*- #}
+{#- vim: ft=jinja #}
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split("/")[0] %}
+{%- from tplroot ~ "/libmatchers.jinja" import parse_matchers, query_map with context %}
+
+{%- set _default_config_dirs = [
+      "parameters/",
+      tplroot ~ "/parameters"
+    ] %}
+
+{%- macro mapstack(
+      matchers,
+      defaults=None,
+      dirs=_default_config_dirs,
+      log_prefix="libmapstack: "
+    ) %}
+{#-
+    Load configuration in the order of `matchers` and merge
+    successively the values with `defaults`.
+
+    The `matchers` are processed using `libmatchers.jinja` to select
+    the configuration sources from where the values are loaded.
+
+    Parameters:
+
+      - `matchers`: list of matchers in the form
+        `[<TYPE>[:<OPTION>[:<DELIMITER>]]@]<QUERY>`
+
+      - `defaults`: dictionary of default values to start the merging,
+        they are considered built-ins. It must conform to the same
+        layout as the YAML files: a mandatory `values` key and two
+        optional `strategy` and `merge_lists` keys.
+
+      - `dirs`: list of directory where to look-up the configuration
+        file matching the matchers, by default a global `salt://parameters/`
+        and a per formula `salt://<tplroot>/parameters`
+
+      - `log_prefix`: prefix used in the log outputs, by default it is
+        `libmapstack: `
+
+    Example: On a Debian system with `roles=["nginx/server", "telegraf"]`
+
+      {%- set settings = mapstack(
+            matchers=[
+              "Y:G@os_family",
+              "I@" ~ tplroot,
+              "Y:C@roles",
+            ],
+            dirs=["defaults", tplroot ~ "/parameters"],
+          )
+          | load_yaml %}
+
+      This will merge the values:
+
+        - starting with the default empty dictionary `{}` (no
+          `defaults` parameter)
+
+        - from the YAML files
+
+          - `salt://defaults/os_family/Debian.yaml`
+
+          - `salt://{{ tplroot }}/parameters/os_family/Debian.yaml`
+
+        - from the pillar `salt["pillar.get"](tplroot)`
+
+        - from the `nginx/server` YAML files:
+
+          - `salt://defaults/roles/nginx/server.yaml`
+
+          - `salt://{{ tplroot }}/parameters/roles/nginx/server.yaml`
+
+        - from the `telegraf` YAML files:
+
+          - `salt://defaults/roles/telegraf.yaml`
+
+          - `salt://{{ tplroot }}/parameters/roles/telegraf.yaml`
+
+    Each YAML file and the `defaults` parameters must conform to the
+    following layout:
+
+      - a mandatory `values` key to store the configuration values
+
+      - two optional keys to configure the use of `salt.slsutil.merge`
+
+        - an optional `strategy` key to configure the merging
+          strategy, for example `strategy: 'recurse'`, the default is
+          `smart`
+
+        - an optional `merge_lists` key to configure if lists should
+          be merged or overridden for the `recurse` and `overwrite`
+          strategies, for example `merge_lists: 'true'`
+#}
+{%-   set stack = defaults | default({"values": {} }, boolean=True) %}
+
+{#-   Build configuration file names based on matchers #}
+{%-   set config_get_strategy = salt["config.get"](tplroot ~ ":strategy", None) %}
+{%-   set matchers = parse_matchers(
+        matchers,
+        config_get_strategy=config_get_strategy,
+        log_prefix=log_prefix
+      )
+      | load_yaml %}
+
+{%-   do salt["log.debug"](
+        log_prefix
+        ~ "built-in configuration:\n"
+        ~ {"values": defaults | traverse("values")}
+        | yaml(False)
+      ) %}
+
+{%-   for param_dir in dirs %}
+{%-     for matcher in matchers %}
+{#-       `slsutil.merge` options from #}
+{#-       1. the `value` #}
+{#-       2. the `defaults` #}
+{#-       3. the built-in #}
+{%-       set strategy = matcher.value
+          | traverse(
+            "strategy",
+            defaults
+            | traverse(
+              "strategy",
+              "smart"
+            )
+          ) %}
+{%-       set merge_lists = matcher.value
+          | traverse(
+            "merge_lists",
+            defaults
+            | traverse(
+              "merge_lists",
+              False
+            )
+          )
+          | to_bool %}
+
+{%-       if matcher.type in query_map.keys() %}
+{#-         No value is an empty list, must be a dict for `stack.update` #}
+{%-         set normalized_value = matcher.value | default({}, boolean=True) %}
+
+{#-         Merge in `mapdata.<query>` instead of directly in `mapdata` #}
+{%-         set is_sub_key = matcher.option | default(False) == "SUB" %}
+{%-         if is_sub_key %}
+{#-           Merge values with `mapdata.<key>`, `<key>` and `<key>:lookup` are merged together #}
+{%-           set value = { matcher.query | regex_replace(":lookup$", ""): normalized_value } %}
+{%-         else %}
+{%-           set value = normalized_value %}
+{%-         endif %}
+
+{%-         do salt["log.debug"](
+              log_prefix
+              ~ "merge "
+              ~ "sub key " * is_sub_key
+              ~ "'"
+              ~ matcher.query
+              ~ "' retrieved with '"
+              ~ matcher.query_method
+              ~ "', merge: strategy='"
+              ~ strategy
+              ~ "', lists='"
+              ~ merge_lists
+              ~ "':\n"
+              ~ value
+              | yaml(False)
+            ) %}
+
+{%-         do stack.update(
+              {
+                "values": salt["slsutil.merge"](
+                  stack["values"],
+                  value,
+                  strategy=strategy,
+                  merge_lists=merge_lists,
+                )
+              }
+            ) %}
+
+{%-       else %}
+{#-         Load YAML file matching the grain/pillar/... #}
+{#-         Fallback to use the source name as a direct filename #}
+
+{%-         if matcher.value is sequence and matcher.value | length == 0 %}
+{#-           Mangle `matcher.value` to use it as literal path #}
+{%-           set query_parts = matcher.query.split("/") %}
+{%-           set yaml_dirname = query_parts[0:-1] | join("/") %}
+{%-           set yaml_names = query_parts[-1] %}
+{%-         else %}
+{%-           set yaml_dirname = matcher.query %}
+{%-           set yaml_names = matcher.value %}
+{%-         endif %}
+
+{#-         Some configuration return list #}
+{%-         if yaml_names is string %}
+{%-           set yaml_names = [yaml_names] %}
+{%-         elif yaml_names is sequence %}
+{#-           Convert to strings if it's a sequence of numbers #}
+{%-           set yaml_names = yaml_names | map("string") | list %}
+{%-         else %}
+{%-           set yaml_names = [yaml_names | string] %}
+{%-         endif %}
+
+{#-         Try to load a `.yaml.jinja` file for each `.yaml` file #}
+{%-         set all_yaml_names = [] %}
+{%-         for name in yaml_names %}
+{%-           set extension = name.rpartition(".")[2] %}
+{%-           if extension not in ["yaml", "jinja"] %}
+{%-             do all_yaml_names.extend([name ~ ".yaml", name ~ ".yaml.jinja"]) %}
+{%-           elif extension == "yaml" %}
+{%-             do all_yaml_names.extend([name, name ~ ".jinja"]) %}
+{%-           else %}
+{%-             do all_yaml_names.append(name) %}
+{%-           endif %}
+{%-         endfor %}
+
+{#-         `yaml_dirname` can be an empty string with literal path like `myconf.yaml` #}
+{%-         set yaml_dir = [
+              param_dir,
+              yaml_dirname
+            ]
+            | select
+            | join("/") %}
+
+{%-         for yaml_name in all_yaml_names %}
+{%-           set yaml_filename = [
+                yaml_dir.rstrip("/"),
+                yaml_name
+              ]
+              | select
+              | join("/") %}
+
+{%-           do salt["log.debug"](
+                log_prefix
+                ~ "load configuration values from "
+                ~ yaml_filename
+              ) %}
+{%-           load_yaml as yaml_values %}
+{%-             include yaml_filename ignore missing %}
+{%-           endload %}
+
+{%-           if yaml_values %}
+{%-             do salt["log.debug"](
+                  log_prefix
+                  ~ "loaded configuration values from "
+                  ~ yaml_filename
+                  ~ ":\n"
+                  ~ yaml_values
+                  | yaml(False)
+                ) %}
+
+{#-             `slsutil.merge` options from #}
+{#-             1. the `value` #}
+{#-             2. the `defaults` #}
+{#-             3. the built-in #}
+{%-             set strategy = yaml_values
+                  | traverse(
+                    "strategy",
+                    defaults
+                    | traverse(
+                      "strategy",
+                      "smart"
+                    )
+                  ) %}
+{%-             set merge_lists = yaml_values
+                  | traverse(
+                    "merge_lists",
+                    defaults
+                    | traverse(
+                      "merge_lists",
+                      False
+                    )
+                  )
+                  | to_bool %}
+{%-             do stack.update(
+                  {
+                    "values": salt["slsutil.merge"](
+                      stack["values"],
+                      yaml_values
+                      | traverse("values", {}),
+                      strategy=strategy,
+                      merge_lists=merge_lists,
+                    )
+                  }
+                ) %}
+{%-             do salt["log.debug"](
+                  log_prefix
+                  ~ "merged configuration values from "
+                  ~ yaml_filename
+                  ~ ", merge: strategy='"
+                  ~ strategy
+                  ~ "', merge_lists='"
+                  ~ merge_lists
+                  ~ "':\n"
+                  ~ {"values": stack["values"]}
+                  | yaml(False)
+                ) %}
+{%-           endif %}
+{%-         endfor %}
+{%-       endif %}
+{%-     endfor %}
+{%-   endfor %}
+
+{%-   do salt["log.debug"](
+        log_prefix
+        ~ "final configuration values:\n"
+        ~ {"values": stack["values"]}
+        | yaml(False)
+      ) %}
+
+{#- Output stack as YAML, caller should use with something like #}
+{#- `{%- set config = mapstack(matchers=["foo"]) | load_yaml %}` #}
+{{ stack | yaml }}
+
+{%- endmacro %}
diff --git a/notepad-plusplus/libmatchers.jinja b/notepad-plusplus/libmatchers.jinja
new file mode 100644
index 0000000..10ff8bd
--- /dev/null
+++ b/notepad-plusplus/libmatchers.jinja
@@ -0,0 +1,222 @@
+{#- -*- coding: utf-8 -*- #}
+{#- vim: ft=jinja #}
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split("/")[0] %}
+{%- from tplroot ~ "/libsaltcli.jinja" import cli with context %}
+
+{%- set query_map = {
+      "C": "config.get",
+      "G": "grains.get",
+      "I": "pillar.get",
+    } %}
+
+{#- When no part before `@` is provided: #}
+{#-   - define a YAML file path, noted `Y` #}
+{#-   - use `salt["config.get"]`, noted `C` #}
+{#-   - use colon `:` delimiter for querying #}
+{%- set _defaults = {
+      "type": "Y",
+      "query_type": "C",
+      "query_delimiter": ":"
+    } %}
+
+{%- macro parse_matchers(
+      matchers,
+      config_get_strategy=None,
+      log_prefix="libmatchers: "
+    ) %}
+{#-   matcher format is `[<TYPE>[:<OPTION>[:DELIMITER]]@]<KEY>` #}
+{#-   each matcher has a type: #}
+{#-   - `Y` to build a YAML file name (the default when no type is set) #}
+{#-   - `C` to lookup values with `config.get` #}
+{#-   - `G` to lookup values with `grains.get` #}
+{#-   - `I` to lookup values with `pillar.get` #}
+{#-   The `YAML` type option can define query type to build the file name: #}
+{#-   - `C` for query with `config.get` (the default when to query type is set) #}
+{#-   - `G` for query with `grains.get` #}
+{#-   - `I` for query with `pillar.get` #}
+{#-   With `DELIMITER`, you can choose a different delimiter when doing queries #}
+{%-   set parsed_matchers = [] %}
+{%-   for matcher in matchers %}
+{%-     do salt["log.debug"](
+          log_prefix
+          ~ "process matcher: '"
+          ~ matcher
+          ~ "'"
+        ) %}
+
+{%-     set parsed = {} %}
+{%-     set matcher_parts = matcher.split('@') %}
+{%-     if matcher_parts | length == 1 %}
+{#-       By default we load YAML files for config looked up by `config.get` #}
+{%-       do parsed.update(
+            {
+              "type": _defaults["type"],
+              "option": None,
+              "query_method": query_map[_defaults["query_type"]],
+              "query_delimiter": _defaults["query_delimiter"],
+              "query": matcher
+            }
+          ) %}
+{%-       do salt["log.debug"](
+            log_prefix
+            ~ "use built-in defaults for matcher:\n"
+            ~ parsed
+            | yaml(False)
+            | indent(4, True)
+          ) %}
+{%-     else %}
+{%-       do salt["log.debug"](
+            log_prefix
+            ~ "parse matcher: '"
+            ~ matcher
+            ~ "'"
+          ) %}
+{%-       set metadatas = matcher_parts[0].split(":") %}
+{%-       do parsed.update(
+            {
+              "query": matcher_parts[1]
+            }
+          ) %}
+{%-       if metadatas | length == 1 %}
+{%-         do parsed.update(
+              {
+                "type": metadatas[0],
+                "option": "C",
+                "query_delimiter": ":"
+              }
+            ) %}
+{%-         do salt["log.debug"](
+              log_prefix
+              ~ "parse as 1 metadata matcher:\n"
+              ~ parsed
+              | yaml(False)
+              | indent(4, True)
+            ) %}
+{%-       elif metadatas | length == 2 %}
+{%-         do parsed.update(
+              {
+                "type": metadatas[0],
+                "option": metadatas[1],
+                "query_delimiter": ":"
+              }
+            ) %}
+{%-         do salt["log.debug"](
+              log_prefix
+              ~ "parse as 2 metadata matcher:\n"
+              ~ parsed
+              | yaml(False)
+              | indent(4, True)
+            ) %}
+{%-       elif metadatas | length == 3 %}
+{%-         do parsed.update(
+              {
+                "type": metadatas[0],
+                "option": metadatas[1],
+                "query_delimiter": metadatas[2] | default(":", boolean=True)
+              }
+            ) %}
+{%-         do salt["log.debug"](
+              log_prefix
+              ~ "parse as 3 metadata matcher:\n"
+              ~ parsed
+              | yaml(False)
+              | indent(4, True)
+            ) %}
+{%-       elif metadatas | length == 4 %}
+{#-         The delimiter is `:` #}
+{%-         do parsed.update(
+              {
+                "type": metadatas[0],
+                "option": metadatas[1],
+                "query_delimiter": ":"
+              }
+            ) %}
+{%-         do salt["log.debug"](
+              log_prefix
+              ~ "parse as 4 metadata matcher:\n"
+              ~ parsed
+              | yaml(False)
+              | indent(4, True)
+            ) %}
+{%-       endif %}
+{%-     endif %}
+
+{#-     The `<OPTION>` has different meaning based on type #}
+{%-     if query_map.get(parsed.type, False) %}
+{%-       do parsed.update(
+            {
+              "query_method": query_map[parsed.type]
+            }
+          ) %}
+{%-     else %}
+{%-       do parsed.update(
+            {
+              "query_method": query_map[
+                parsed.option
+                | default("C", boolean=True)
+              ]
+            }
+          ) %}
+{%-     endif %}
+
+{#-     Add `merge:` option to `salt["config.get"]` if configured #}
+{%-     if cli not in ["ssh", "unknown"] and parsed.query_method == "config.get" and config_get_strategy %}
+{%-       set query_opts = {
+            "merge": config_get_strategy,
+            "delimiter": parsed.query_delimiter,
+          } %}
+{%-       set query_opts_msg = (
+            ", delimiter='"
+            ~ parsed.query_delimiter
+            ~ "', merge: strategy='"
+            ~ config_get_strategy
+            ~ "'"
+          ) %}
+{%-     else %}
+{%-       if cli in ["ssh", "unknown"] %}
+{%-         do salt["log.warning"](
+              log_prefix
+              ~ "the 'delimiter' and 'merge' options of 'config.get' are skipped when the salt command type is '"
+              ~ cli
+              ~ "'"
+            ) %}
+{%-       endif %}
+{%-       set query_opts = {} %}
+{%-       set query_opts_msg = "" %}
+{%-     endif %}
+
+{%-     do salt["log.debug"](
+          log_prefix
+          ~ "lookup '"
+          ~ parsed.query
+          ~ "' with '"
+          ~ parsed.query_method
+          ~ "'"
+          ~ query_opts_msg
+        ) %}
+{%-     set values = salt[parsed.query_method](
+          parsed.query,
+          default=[],
+          **query_opts
+        ) %}
+{%-     do parsed.update(
+          {
+            "value": values
+          }
+        ) %}
+
+{%-     do parsed_matchers.append(parsed) %}
+
+{%-   endfor %}
+{%-   do salt["log.debug"](
+        log_prefix
+        ~ "parsed matchers:\n"
+        ~ parsed_matchers
+        | yaml(False)
+        | indent(4, True)
+      ) %}
+
+{{ parsed_matchers | yaml }}
+{%- endmacro %}
diff --git a/notepad-plusplus/libsaltcli.jinja b/notepad-plusplus/libsaltcli.jinja
new file mode 100644
index 0000000..c473723
--- /dev/null
+++ b/notepad-plusplus/libsaltcli.jinja
@@ -0,0 +1,18 @@
+{#- -*- coding: utf-8 -*- #}
+{#- vim: ft=jinja #}
+
+{#- Get the relevant values from the `opts` dict #}
+{%- set opts_cli = opts.get('__cli', '') %}
+{%- set opts_masteropts_cli = opts | traverse('__master_opts__:__cli', '') %}
+
+{#- Determine the type of salt command being run #}
+{%- if opts_cli == 'salt-minion' %}
+{%-   set cli = 'minion' %}
+{%- elif opts_cli == 'salt-call' %}
+{%-   set cli = 'ssh' if opts_masteropts_cli in ('salt-ssh', 'salt-master') else 'local' %}
+{%- elif opts_cli %}
+{%-   set cli = 'api' %}
+{%- else %}
+{%-   set cli = 'unknown' %}
+{%- endif %}
+{%- do salt['log.debug']('[libsaltcli] the salt command type has been identified to be: ' ~ cli) %}
diff --git a/notepad-plusplus/libtofs.jinja b/notepad-plusplus/libtofs.jinja
new file mode 100644
index 0000000..f39fd42
--- /dev/null
+++ b/notepad-plusplus/libtofs.jinja
@@ -0,0 +1,115 @@
+{%- macro files_switch(
+      source_files,
+      lookup=None,
+      default_files_switch=["id", "os_family"],
+      indent_width=6,
+      use_subpath=False
+    ) %}
+{#-
+    Returns a valid value for the "source" parameter of a "file.managed"
+    state function. This makes easier the usage of the Template Override and
+    Files Switch (TOFS) pattern.
+    Params:
+      * source_files: ordered list of files to look for
+      * lookup: key under "<tplroot>:tofs:source_files" to prepend to the
+        list of source files
+      * default_files_switch: if there's no config (e.g. pillar)
+        "<tplroot>:tofs:files_switch" this is the ordered list of grains to
+        use as selector switch of the directories under
+        "<path_prefix>/files"
+      * indent_width: indentation of the result value to conform to YAML
+      * use_subpath: defaults to `False` but if set, lookup the source file
+        recursively from the current state directory up to `tplroot`
+    Example (based on a `tplroot` of `xxx`):
+    If we have a state:
+      Deploy configuration:
+        file.managed:
+          - name: /etc/yyy/zzz.conf
+          - source: {{ files_switch(
+                         ["/etc/yyy/zzz.conf", "/etc/yyy/zzz.conf.jinja"],
+                         lookup="Deploy configuration",
+                       ) }}
+          - template: jinja
+    In a minion with id=theminion and os_family=RedHat, it's going to be
+    rendered as:
+      Deploy configuration:
+        file.managed:
+          - name: /etc/yyy/zzz.conf
+          - source:
+            - salt://xxx/files/theminion/etc/yyy/zzz.conf
+            - salt://xxx/files/theminion/etc/yyy/zzz.conf.jinja
+            - salt://xxx/files/RedHat/etc/yyy/zzz.conf
+            - salt://xxx/files/RedHat/etc/yyy/zzz.conf.jinja
+            - salt://xxx/files/default/etc/yyy/zzz.conf
+            - salt://xxx/files/default/etc/yyy/zzz.conf.jinja
+          - template: jinja
+#}
+{#-   Get the `tplroot` from `tpldir` #}
+{%-   set tplroot = tpldir.split("/")[0] %}
+{%-   set path_prefix = salt["config.get"](tplroot ~ ":tofs:path_prefix", tplroot) %}
+{%-   set files_dir = salt["config.get"](tplroot ~ ":tofs:dirs:files", "files") %}
+{%-   set files_switch_list = salt["config.get"](
+        tplroot ~ ":tofs:files_switch", default_files_switch
+      ) %}
+{#-   Lookup source_files (v2), files (v1), or fallback to an empty list #}
+{%-   set src_files = salt["config.get"](
+        tplroot ~ ":tofs:source_files:" ~ lookup,
+        salt["config.get"](tplroot ~ ":tofs:files:" ~ lookup, []),
+      ) %}
+{#-   Append the default source_files #}
+{%-   set src_files = src_files + source_files %}
+{#-   Only add to [""] when supporting older TOFS implementations #}
+{%-   set path_prefix_exts = [""] %}
+{%-   if use_subpath and tplroot != tpldir %}
+{#-     Walk directory tree to find {{ files_dir }} #}
+{%-     set subpath_parts = tpldir.lstrip(tplroot).lstrip("/").split("/") %}
+{%-     for path in subpath_parts %}
+{%-       set subpath = subpath_parts[0 : loop.index] | join("/") %}
+{%-       do path_prefix_exts.append("/" ~ subpath) %}
+{%-     endfor %}
+{%-   endif %}
+{%-   for path_prefix_ext in path_prefix_exts | reverse %}
+{%-     set path_prefix_inc_ext = path_prefix ~ path_prefix_ext %}
+{#-     For older TOFS implementation, use `files_switch` from the config #}
+{#-     Use the default, new method otherwise #}
+{%-     set fsl = salt["config.get"](
+          tplroot ~ path_prefix_ext | replace("/", ":") ~ ":files_switch",
+          files_switch_list,
+        ) %}
+{#-     Append an empty value to evaluate as `default` in the loop below #}
+{%-     if "" not in fsl %}
+{%-       set fsl = fsl + [""] %}
+{%-     endif %}
+{%-     for fs in fsl %}
+{%-       for src_file in src_files %}
+{%-         if fs %}
+{%-           set fs_dirs = salt["config.get"](fs, fs) %}
+{%-         else %}
+{%-           set fs_dirs = salt["config.get"](
+                tplroot ~ ":tofs:dirs:default", "default"
+              ) %}
+{%-         endif %}
+{#-         Force the `config.get` lookup result as a list where necessary #}
+{#-         since we need to also handle grains that are lists #}
+{%-         if fs_dirs is string %}
+{%-           set fs_dirs = [fs_dirs] %}
+{%-         endif %}
+{%-         for fs_dir in fs_dirs %}
+{#-           strip empty elements by using a select #}
+{%-           set url = (
+                [
+                  "- salt:/",
+                  path_prefix_inc_ext.strip("/"),
+                  files_dir.strip("/"),
+                  fs_dir.strip("/"),
+                  src_file.strip("/"),
+                ]
+                | select
+                | join("/")
+              ) %}
+{{ url | indent(indent_width, true) }}
+{%-         endfor %}
+{%-       endfor %}
+{%-     endfor %}
+{%-   endfor %}
+{%- endmacro %}
diff --git a/notepad-plusplus/map.jinja b/notepad-plusplus/map.jinja
new file mode 100644
index 0000000..cc25c18
--- /dev/null
+++ b/notepad-plusplus/map.jinja
@@ -0,0 +1,66 @@
+{#- -*- coding: utf-8 -*- #}
+{#- vim: ft=jinja #}
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split("/")[0] %}
+{%- from tplroot ~ "/libmapstack.jinja" import mapstack with context %}
+
+{#- Where to lookup parameters source files #}
+{%- set formula_param_dir = tplroot ~ "/parameters" %}
+
+{#- List of sources to lookup for parameters #}
+{#- Fallback to previously used grains plus minion `id` #}
+{%- set map_sources = [
+      "Y:G@osarch",
+      "Y:G@os_family",
+      "Y:G@os",
+      "Y:G@osfinger",
+      "C@" ~ tplroot ~ ":lookup",
+      "C@" ~ tplroot,
+      "Y:G@id",
+    ] %}
+
+{%- set _map_settings = mapstack(
+      matchers=["map_jinja.yaml"],
+      defaults={
+        "values": {"sources": map_sources}
+      },
+      log_prefix="map.jinja configuration: ",
+    )
+    | load_yaml %}
+
+{%- set map_sources = _map_settings | traverse("values:sources") %}
+{%- do salt["log.debug"](
+      "map.jinja: load parameters from sources:\n"
+      ~ map_sources
+      | yaml(False)
+    ) %}
+
+{#- Load formula parameters values #}
+{%- set _formula_matchers = ["defaults.yaml"] + map_sources %}
+
+{%- set _formula_settings = mapstack(
+      matchers=_formula_matchers,
+      dirs=[formula_param_dir],
+      defaults={
+        "values": {},
+        "merge_strategy": salt["config.get"](tplroot ~ ":strategy", None),
+        "merge_lists": salt["config.get"](tplroot ~ ":merge_lists", False),
+      },
+      log_prefix="map.jinja: ",
+    )
+    | load_yaml %}
+
+{#- Make sure to track `map.jinja` configuration with `_mapdata` #}
+{%- do _formula_settings["values"].update(
+      {
+        "map_jinja": _map_settings["values"]
+      }
+    ) %}
+
+{%- do salt["log.debug"]("map.jinja: save parameters in variable 'mapdata'") %}
+{%- set mapdata = _formula_settings["values"] %}
+
+{#- Per formula post-processing of `mapdata` if it exists #}
+{%- do salt["log.debug"]("map.jinja: post-processing of 'mapdata'") %}
+{%- include tplroot ~ "/post-map.jinja" ignore missing %}
diff --git a/notepad-plusplus/package/clean.sls b/notepad-plusplus/package/clean.sls
new file mode 100644
index 0000000..c8114f1
--- /dev/null
+++ b/notepad-plusplus/package/clean.sls
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set sls_config_clean = tplroot ~ '.config.clean' %}
+{%- from tplroot ~ "/map.jinja" import mapdata as notepad__plusplus with context %}
+
+include:
+  - {{ sls_config_clean }}
+
+notepad-plusplus-package-clean-pkg-removed:
+  pkg.removed:
+    - name: {{ notepad__plusplus.pkg.name }}
+    - require:
+      - sls: {{ sls_config_clean }}
diff --git a/notepad-plusplus/package/init.sls b/notepad-plusplus/package/init.sls
new file mode 100644
index 0000000..d3e5518
--- /dev/null
+++ b/notepad-plusplus/package/init.sls
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .install
diff --git a/notepad-plusplus/package/install.sls b/notepad-plusplus/package/install.sls
new file mode 100644
index 0000000..fae6a4b
--- /dev/null
+++ b/notepad-plusplus/package/install.sls
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
+{%- if salt.grains.get('cpuarch') == "AMD64" %}
+  {%- set temp_exe = 'C:/Windows/Temp/npp.Installer.x64.exe' %}
+{%- else %}
+  {%- set temp_exe = 'C:/Windows/Temp/npp.Installer.exe' %}
+{%- endif %}
+
+
+Download NotePad++:
+  file.managed:
+    - name: '{{ temp_exe }}'
+    - source: '{{ notepad_plusplus.pkg.installer_uri }}'
+    - skip_verify: True
+    - makedirs: True
+
+## notepad-plusplus-package-install-pkg-installed:
+##   pkg.installed:
+##     - name: {{ notepad__plusplus.pkg.name }}
diff --git a/notepad-plusplus/parameters/defaults.yaml b/notepad-plusplus/parameters/defaults.yaml
new file mode 100644
index 0000000..0d8d1b7
--- /dev/null
+++ b/notepad-plusplus/parameters/defaults.yaml
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set default values.
+---
+values:
+  pkg:
+    name: 'notepad++'
+    installer_uri: 'https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.9.3/npp.8.9.3.Installer.x64.exe'
+...
diff --git a/notepad-plusplus/parameters/os/Fedora.yaml b/notepad-plusplus/parameters/os/Fedora.yaml
new file mode 100644
index 0000000..33f1c0c
--- /dev/null
+++ b/notepad-plusplus/parameters/os/Fedora.yaml
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('os') == Fedora.
+#
+# You just need to add the key:values for this `os` that differ
+# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
+#
+# If you do not need to provide defaults via the `os` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  pkg:
+    name: notepad-plusplus-fedora
+  service:
+    name: service-fedora
+...
diff --git a/notepad-plusplus/parameters/os/MacOS.yaml.jinja b/notepad-plusplus/parameters/os/MacOS.yaml.jinja
new file mode 100644
index 0000000..4afb00c
--- /dev/null
+++ b/notepad-plusplus/parameters/os/MacOS.yaml.jinja
@@ -0,0 +1,20 @@
+{#- -*- coding: utf-8 -*- #}
+{#- vim: ft=jinja #}
+{#-
+    Set values specific to:
+      salt['config.get']('os') == MacOS.
+
+    You just need to add the key:values for this `os` that differ
+    from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
+
+    This jinja2 file must return a valid `map.jinja` YAML.
+
+    If you do not need to provide calculated values via the `os`
+    config, you can remove this file or provide at least an empty
+    dict, e.g.
+    values: {}
+#}
+---
+values:
+  rootgroup: {{ salt['cmd.run']("stat -f '%Sg' /dev/console") }}
+...
diff --git a/notepad-plusplus/parameters/os/Ubuntu.yaml b/notepad-plusplus/parameters/os/Ubuntu.yaml
new file mode 100644
index 0000000..8440598
--- /dev/null
+++ b/notepad-plusplus/parameters/os/Ubuntu.yaml
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('os') == Ubuntu.
+#
+# You just need to add the key:values for this `os` that differ
+# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
+#
+# If you do not need to provide defaults via the `os` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  pkg:
+    name: notepad-plusplus-ubuntu
+  config: /etc/notepad-plusplus.d/custom-ubuntu.conf
+...
diff --git a/notepad-plusplus/parameters/os_family/Arch.yaml b/notepad-plusplus/parameters/os_family/Arch.yaml
new file mode 100644
index 0000000..91aea0c
--- /dev/null
+++ b/notepad-plusplus/parameters/os_family/Arch.yaml
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('os_family') == Arch.
+#
+# You just need to add the key:values for this `os_family` that differ
+# from `defaults.yaml` + `<osarch>.yaml`.
+#
+# If you do not need to provide defaults via the `os_family` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  pkg:
+    name: notepad-plusplus-arch
+  service:
+    name: service-arch
+...
diff --git a/notepad-plusplus/parameters/os_family/Debian.yaml b/notepad-plusplus/parameters/os_family/Debian.yaml
new file mode 100644
index 0000000..7736730
--- /dev/null
+++ b/notepad-plusplus/parameters/os_family/Debian.yaml
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('os_family') == Debian.
+#
+# You just need to add the key:values for this `os_family` that differ
+# from `defaults.yaml` + `<osarch>.yaml`.
+#
+# If you do not need to provide defaults via the `os_family` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  pkg:
+    name: notepad-plusplus-debian
+  config: /etc/notepad-plusplus.d/custom.conf
+...
diff --git a/notepad-plusplus/parameters/os_family/FreeBSD.yaml b/notepad-plusplus/parameters/os_family/FreeBSD.yaml
new file mode 100644
index 0000000..5f8fc25
--- /dev/null
+++ b/notepad-plusplus/parameters/os_family/FreeBSD.yaml
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('os_family') == FreeBSD.
+#
+# You just need to add the key:values for this `os_family` that differ
+# from `defaults.yaml` + `<osarch>.yaml`.
+#
+# If you do not need to provide defaults via the `os_family` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  rootgroup: wheel
+...
diff --git a/notepad-plusplus/parameters/os_family/Gentoo.yaml b/notepad-plusplus/parameters/os_family/Gentoo.yaml
new file mode 100644
index 0000000..98f68b5
--- /dev/null
+++ b/notepad-plusplus/parameters/os_family/Gentoo.yaml
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('os_family') == Gentoo.
+#
+# You just need to add the key:values for this `os_family` that differ
+# from `defaults.yaml` + `<osarch>.yaml`.
+#
+# If you do not need to provide defaults via the `os_family` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  pkg:
+    name: notepad-plusplus-gentoo
+...
diff --git a/notepad-plusplus/parameters/os_family/OpenBSD.yaml b/notepad-plusplus/parameters/os_family/OpenBSD.yaml
new file mode 100644
index 0000000..ef1eca3
--- /dev/null
+++ b/notepad-plusplus/parameters/os_family/OpenBSD.yaml
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('os_family') == OpenBSD.
+#
+# You just need to add the key:values for this `os_family` that differ
+# from `defaults.yaml` + `<osarch>.yaml`.
+#
+# If you do not need to provide defaults via the `os_family` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  rootgroup: wheel
+...
diff --git a/notepad-plusplus/parameters/os_family/RedHat.yaml b/notepad-plusplus/parameters/os_family/RedHat.yaml
new file mode 100644
index 0000000..63ef413
--- /dev/null
+++ b/notepad-plusplus/parameters/os_family/RedHat.yaml
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('os_family') == RedHat.
+#
+# You just need to add the key:values for this `os_family` that differ
+# from `defaults.yaml` + `<osarch>.yaml`.
+#
+# If you do not need to provide defaults via the `os_family` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  pkg:
+    name: notepad-plusplus-redhat
+  config: /etc/notepad-plusplus.conf
+...
diff --git a/notepad-plusplus/parameters/os_family/Suse.yaml b/notepad-plusplus/parameters/os_family/Suse.yaml
new file mode 100644
index 0000000..ea20d97
--- /dev/null
+++ b/notepad-plusplus/parameters/os_family/Suse.yaml
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('os_family') == Suse.
+#
+# You just need to add the key:values for this `os_family` that differ
+# from `defaults.yaml` + `<osarch>.yaml`.
+#
+# If you do not need to provide defaults via the `os_family` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  pkg:
+    name: notepad-plusplus-suse
+...
diff --git a/notepad-plusplus/parameters/osarch/386.yaml b/notepad-plusplus/parameters/osarch/386.yaml
new file mode 100644
index 0000000..ccf033a
--- /dev/null
+++ b/notepad-plusplus/parameters/osarch/386.yaml
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('osarch') == 386.
+#
+# You just need to add the key:values for this `osarch` that differ
+# from `defaults.yaml`.
+#
+# If you do not need to provide defaults via the `osarch` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  arch: 386
+...
diff --git a/notepad-plusplus/parameters/osarch/amd64.yaml b/notepad-plusplus/parameters/osarch/amd64.yaml
new file mode 100644
index 0000000..aefa6f1
--- /dev/null
+++ b/notepad-plusplus/parameters/osarch/amd64.yaml
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('osarch') == amd64.
+#
+# You just need to add the key:values for this `osarch` that differ
+# from `defaults.yaml`.
+#
+# If you do not need to provide defaults via the `osarch` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  arch: amd64
+...
diff --git a/notepad-plusplus/parameters/osarch/arm64.yaml b/notepad-plusplus/parameters/osarch/arm64.yaml
new file mode 100644
index 0000000..d9c1787
--- /dev/null
+++ b/notepad-plusplus/parameters/osarch/arm64.yaml
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('osarch') == arm64.
+#
+# You just need to add the key:values for this `osarch` that differ
+# from `defaults.yaml`.
+#
+# If you do not need to provide defaults via the `osarch` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  arch: arm64
+...
diff --git a/notepad-plusplus/parameters/osarch/armv6l.yaml b/notepad-plusplus/parameters/osarch/armv6l.yaml
new file mode 100644
index 0000000..87791df
--- /dev/null
+++ b/notepad-plusplus/parameters/osarch/armv6l.yaml
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('osarch') == armv6l.
+#
+# You just need to add the key:values for this `osarch` that differ
+# from `defaults.yaml`.
+#
+# If you do not need to provide defaults via the `osarch` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  arch: armv6l
+...
diff --git a/notepad-plusplus/parameters/osarch/armv7l.yaml b/notepad-plusplus/parameters/osarch/armv7l.yaml
new file mode 100644
index 0000000..3d2fac7
--- /dev/null
+++ b/notepad-plusplus/parameters/osarch/armv7l.yaml
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('osarch') == armv7l.
+#
+# You just need to add the key:values for this `osarch` that differ
+# from `defaults.yaml`.
+#
+# If you do not need to provide defaults via the `osarch` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  arch: armv7l
+...
diff --git a/notepad-plusplus/parameters/osarch/ppc64le.yaml b/notepad-plusplus/parameters/osarch/ppc64le.yaml
new file mode 100644
index 0000000..3673997
--- /dev/null
+++ b/notepad-plusplus/parameters/osarch/ppc64le.yaml
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('osarch') == ppc64le.
+#
+# You just need to add the key:values for this `osarch` that differ
+# from `defaults.yaml`.
+#
+# If you do not need to provide defaults via the `osarch` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  arch: ppc64le
+...
diff --git a/notepad-plusplus/parameters/osarch/s390x.yaml b/notepad-plusplus/parameters/osarch/s390x.yaml
new file mode 100644
index 0000000..a4eba53
--- /dev/null
+++ b/notepad-plusplus/parameters/osarch/s390x.yaml
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('osarch') == s390x.
+#
+# You just need to add the key:values for this `osarch` that differ
+# from `defaults.yaml`.
+#
+# If you do not need to provide defaults via the `osarch` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  arch: s390x
+...
diff --git a/notepad-plusplus/parameters/osarch/x86_64.yaml b/notepad-plusplus/parameters/osarch/x86_64.yaml
new file mode 100644
index 0000000..dc08cc9
--- /dev/null
+++ b/notepad-plusplus/parameters/osarch/x86_64.yaml
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('osarch') == x86_64.
+#
+# You just need to add the key:values for this `osarch` that differ
+# from `defaults.yaml`.
+#
+# If you do not need to provide defaults via the `osarch` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  arch: amd64
+...
diff --git a/notepad-plusplus/parameters/osfinger/CentOS-6.yaml b/notepad-plusplus/parameters/osfinger/CentOS-6.yaml
new file mode 100644
index 0000000..4ad86eb
--- /dev/null
+++ b/notepad-plusplus/parameters/osfinger/CentOS-6.yaml
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('osfinger') == CentOS-6.
+#
+# You just need to add the key:values for this `osfinger` that differ
+# from `defaults.yaml`.
+#
+# If you do not need to provide defaults via the `osfinger` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  pkg:
+    name: notepad-plusplus-centos-6
+  config: /etc/notepad-plusplus.d/custom-centos-6.conf
+...
diff --git a/notepad-plusplus/parameters/osfinger/Ubuntu-18.04.yaml b/notepad-plusplus/parameters/osfinger/Ubuntu-18.04.yaml
new file mode 100644
index 0000000..c51aa6b
--- /dev/null
+++ b/notepad-plusplus/parameters/osfinger/Ubuntu-18.04.yaml
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('osfinger') == Ubuntu-18.04.
+#
+# You just need to add the key:values for this `osfinger` that differ
+# from `defaults.yaml`.
+#
+# If you do not need to provide defaults via the `osfinger` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  config: /etc/notepad-plusplus.d/custom-ubuntu-18.04.conf
+...
diff --git a/notepad-plusplus/service/clean.sls b/notepad-plusplus/service/clean.sls
new file mode 100644
index 0000000..eeed917
--- /dev/null
+++ b/notepad-plusplus/service/clean.sls
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import mapdata as notepad__plusplus with context %}
+
+notepad-plusplus-service-clean-service-dead:
+  service.dead:
+    - name: {{ notepad__plusplus.service.name }}
+    - enable: False
diff --git a/notepad-plusplus/service/init.sls b/notepad-plusplus/service/init.sls
new file mode 100644
index 0000000..6fe4d1a
--- /dev/null
+++ b/notepad-plusplus/service/init.sls
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .running
diff --git a/notepad-plusplus/service/running.sls b/notepad-plusplus/service/running.sls
new file mode 100644
index 0000000..4c3d4ce
--- /dev/null
+++ b/notepad-plusplus/service/running.sls
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set sls_config_file = tplroot ~ '.config.file' %}
+{%- from tplroot ~ "/map.jinja" import mapdata as notepad__plusplus with context %}
+
+include:
+  - {{ sls_config_file }}
+
+notepad-plusplus-service-running-service-running:
+  service.running:
+    - name: {{ notepad__plusplus.service.name }}
+    - enable: True
+    - watch:
+      - sls: {{ sls_config_file }}
diff --git a/notepad-plusplus/subcomponent/clean.sls b/notepad-plusplus/subcomponent/clean.sls
new file mode 100644
index 0000000..564769d
--- /dev/null
+++ b/notepad-plusplus/subcomponent/clean.sls
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .config.clean
diff --git a/notepad-plusplus/subcomponent/config/clean.sls b/notepad-plusplus/subcomponent/config/clean.sls
new file mode 100644
index 0000000..90f5def
--- /dev/null
+++ b/notepad-plusplus/subcomponent/config/clean.sls
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set sls_service_clean = tplroot ~ '.service.clean' %}
+{%- from tplroot ~ "/map.jinja" import mapdata as notepad__plusplus with context %}
+
+include:
+  - {{ sls_service_clean }}
+
+notepad-plusplus-subcomponent-config-clean-file-absent:
+  file.absent:
+    - name: {{ notepad__plusplus.subcomponent.config }}
+    - watch_in:
+        - sls: {{ sls_service_clean }}
diff --git a/notepad-plusplus/subcomponent/config/file.sls b/notepad-plusplus/subcomponent/config/file.sls
new file mode 100644
index 0000000..247359b
--- /dev/null
+++ b/notepad-plusplus/subcomponent/config/file.sls
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set sls_config_file = tplroot ~ '.config.file' %}
+{%- from tplroot ~ "/map.jinja" import mapdata as notepad__plusplus with context %}
+{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
+
+include:
+  - {{ sls_config_file }}
+
+notepad-plusplus-subcomponent-config-file-file-managed:
+  file.managed:
+    - name: {{ notepad__plusplus.subcomponent.config }}
+    - source: {{ files_switch(['subcomponent-example.tmpl'],
+                              lookup='notepad-plusplus-subcomponent-config-file-file-managed',
+                              use_subpath=True
+                 )
+              }}
+    - mode: 644
+    - user: root
+    - group: {{ notepad__plusplus.rootgroup }}
+    - makedirs: True
+    - template: jinja
+    - require_in:
+      - sls: {{ sls_config_file }}
diff --git a/notepad-plusplus/subcomponent/config/files/default/subcomponent-example.tmpl b/notepad-plusplus/subcomponent/config/files/default/subcomponent-example.tmpl
new file mode 100644
index 0000000..522de00
--- /dev/null
+++ b/notepad-plusplus/subcomponent/config/files/default/subcomponent-example.tmpl
@@ -0,0 +1,6 @@
+########################################################################
+# File managed by Salt at <{{ source }}>.
+# Your changes will be overwritten.
+########################################################################
+
+This is a subcomponent example file from SaltStack template-formula.
diff --git a/notepad-plusplus/subcomponent/config/files/default/subcomponent-example.tmpl.jinja b/notepad-plusplus/subcomponent/config/files/default/subcomponent-example.tmpl.jinja
new file mode 100644
index 0000000..cbfd51d
--- /dev/null
+++ b/notepad-plusplus/subcomponent/config/files/default/subcomponent-example.tmpl.jinja
@@ -0,0 +1,6 @@
+########################################################################
+# File managed by Salt at <{{ source }}>.
+# Your changes will be overwritten.
+########################################################################
+
+This is another subcomponent example file from SaltStack template-formula.
diff --git a/notepad-plusplus/subcomponent/config/init.sls b/notepad-plusplus/subcomponent/config/init.sls
new file mode 100644
index 0000000..465ddfe
--- /dev/null
+++ b/notepad-plusplus/subcomponent/config/init.sls
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .file
diff --git a/notepad-plusplus/subcomponent/init.sls b/notepad-plusplus/subcomponent/init.sls
new file mode 100644
index 0000000..6003be1
--- /dev/null
+++ b/notepad-plusplus/subcomponent/init.sls
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .config

From ad246c5df31e82cb356443daa5cd5919987477f4 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Fri, 10 Apr 2026 09:54:03 -0400
Subject: [PATCH 02/36] Run EXE-based installer

Also delete the installer once done
---
 notepad-plusplus/package/install.sls | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/notepad-plusplus/package/install.sls b/notepad-plusplus/package/install.sls
index fae6a4b..ba887c8 100644
--- a/notepad-plusplus/package/install.sls
+++ b/notepad-plusplus/package/install.sls
@@ -10,6 +10,11 @@
   {%- set temp_exe = 'C:/Windows/Temp/npp.Installer.exe' %}
 {%- endif %}
 
+Delete EXE-installer:
+  file.absent:
+    - name: '{{ temp_exe }}'
+    - require:
+      - cmd: 'Install NotePad++'
 
 Download NotePad++:
   file.managed:
@@ -18,6 +23,16 @@ Download NotePad++:
     - skip_verify: True
     - makedirs: True
 
-## notepad-plusplus-package-install-pkg-installed:
-##   pkg.installed:
-##     - name: {{ notepad__plusplus.pkg.name }}
+Install NotePad++:
+  cmd.run:
+    - name: |
+        Start-Process "{{ temp_exe }}" -ArgumentList '/S' -Wait
+        Start-Sleep -Seconds 5
+    - require:
+      - file: 'Download NotePad++'
+    - shell: powershell
+    - success_retcodes: [
+        0,
+        3010
+      ]
+    - unless: 'if ( Test-Path "${env:ProgramFiles}\Notepad++\notepad++.exe" ) { exit 0 } else { exit 1 }'

From d55bd62adddd12511e314dbbcbd7252dd5d02699 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Fri, 10 Apr 2026 10:10:30 -0400
Subject: [PATCH 03/36] Set all 'notepad__plusplus' references to
 'notepad_plusplus'

---
 notepad-plusplus/config/clean.sls                 | 4 ++--
 notepad-plusplus/config/file.sls                  | 8 ++++----
 notepad-plusplus/files/default/example.tmpl.jinja | 4 ++--
 notepad-plusplus/package/clean.sls                | 4 ++--
 notepad-plusplus/service/clean.sls                | 4 ++--
 notepad-plusplus/service/running.sls              | 4 ++--
 notepad-plusplus/subcomponent/config/clean.sls    | 4 ++--
 notepad-plusplus/subcomponent/config/file.sls     | 6 +++---
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/notepad-plusplus/config/clean.sls b/notepad-plusplus/config/clean.sls
index fe9f4e8..4d903e8 100644
--- a/notepad-plusplus/config/clean.sls
+++ b/notepad-plusplus/config/clean.sls
@@ -4,13 +4,13 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_service_clean = tplroot ~ '.service.clean' %}
-{%- from tplroot ~ "/map.jinja" import mapdata as notepad__plusplus with context %}
+{%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
 
 include:
   - {{ sls_service_clean }}
 
 notepad-plusplus-config-clean-file-absent:
   file.absent:
-    - name: {{ notepad__plusplus.config }}
+    - name: {{ notepad_plusplus.config }}
     - require:
       - sls: {{ sls_service_clean }}
diff --git a/notepad-plusplus/config/file.sls b/notepad-plusplus/config/file.sls
index 198e50b..102bf5f 100644
--- a/notepad-plusplus/config/file.sls
+++ b/notepad-plusplus/config/file.sls
@@ -4,7 +4,7 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_package_install = tplroot ~ '.package.install' %}
-{%- from tplroot ~ "/map.jinja" import mapdata as notepad__plusplus with context %}
+{%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
 {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
 include:
@@ -12,17 +12,17 @@ include:
 
 notepad-plusplus-config-file-file-managed:
   file.managed:
-    - name: {{ notepad__plusplus.config }}
+    - name: {{ notepad_plusplus.config }}
     - source: {{ files_switch(['example.tmpl'],
                               lookup='notepad-plusplus-config-file-file-managed'
                  )
               }}
     - mode: 644
     - user: root
-    - group: {{ notepad__plusplus.rootgroup }}
+    - group: {{ notepad_plusplus.rootgroup }}
     - makedirs: True
     - template: jinja
     - require:
       - sls: {{ sls_package_install }}
     - context:
-        notepad__plusplus: {{ notepad__plusplus | json }}
+        notepad_plusplus: {{ notepad_plusplus | json }}
diff --git a/notepad-plusplus/files/default/example.tmpl.jinja b/notepad-plusplus/files/default/example.tmpl.jinja
index 1b35e46..26a7ef9 100644
--- a/notepad-plusplus/files/default/example.tmpl.jinja
+++ b/notepad-plusplus/files/default/example.tmpl.jinja
@@ -6,6 +6,6 @@
 This is another example file from SaltStack template-formula.
 
 # This is here for testing purposes
-{{ notepad__plusplus | json }}
+{{ notepad_plusplus | json }}
 
-winner of the merge: {{ notepad__plusplus['winner'] }}
+winner of the merge: {{ notepad_plusplus['winner'] }}
diff --git a/notepad-plusplus/package/clean.sls b/notepad-plusplus/package/clean.sls
index c8114f1..0ac8fe4 100644
--- a/notepad-plusplus/package/clean.sls
+++ b/notepad-plusplus/package/clean.sls
@@ -4,13 +4,13 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_config_clean = tplroot ~ '.config.clean' %}
-{%- from tplroot ~ "/map.jinja" import mapdata as notepad__plusplus with context %}
+{%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
 
 include:
   - {{ sls_config_clean }}
 
 notepad-plusplus-package-clean-pkg-removed:
   pkg.removed:
-    - name: {{ notepad__plusplus.pkg.name }}
+    - name: {{ notepad_plusplus.pkg.name }}
     - require:
       - sls: {{ sls_config_clean }}
diff --git a/notepad-plusplus/service/clean.sls b/notepad-plusplus/service/clean.sls
index eeed917..67b56e4 100644
--- a/notepad-plusplus/service/clean.sls
+++ b/notepad-plusplus/service/clean.sls
@@ -3,9 +3,9 @@
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
-{%- from tplroot ~ "/map.jinja" import mapdata as notepad__plusplus with context %}
+{%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
 
 notepad-plusplus-service-clean-service-dead:
   service.dead:
-    - name: {{ notepad__plusplus.service.name }}
+    - name: {{ notepad_plusplus.service.name }}
     - enable: False
diff --git a/notepad-plusplus/service/running.sls b/notepad-plusplus/service/running.sls
index 4c3d4ce..4e00e4a 100644
--- a/notepad-plusplus/service/running.sls
+++ b/notepad-plusplus/service/running.sls
@@ -4,14 +4,14 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_config_file = tplroot ~ '.config.file' %}
-{%- from tplroot ~ "/map.jinja" import mapdata as notepad__plusplus with context %}
+{%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
 
 include:
   - {{ sls_config_file }}
 
 notepad-plusplus-service-running-service-running:
   service.running:
-    - name: {{ notepad__plusplus.service.name }}
+    - name: {{ notepad_plusplus.service.name }}
     - enable: True
     - watch:
       - sls: {{ sls_config_file }}
diff --git a/notepad-plusplus/subcomponent/config/clean.sls b/notepad-plusplus/subcomponent/config/clean.sls
index 90f5def..0df1b2e 100644
--- a/notepad-plusplus/subcomponent/config/clean.sls
+++ b/notepad-plusplus/subcomponent/config/clean.sls
@@ -4,13 +4,13 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_service_clean = tplroot ~ '.service.clean' %}
-{%- from tplroot ~ "/map.jinja" import mapdata as notepad__plusplus with context %}
+{%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
 
 include:
   - {{ sls_service_clean }}
 
 notepad-plusplus-subcomponent-config-clean-file-absent:
   file.absent:
-    - name: {{ notepad__plusplus.subcomponent.config }}
+    - name: {{ notepad_plusplus.subcomponent.config }}
     - watch_in:
         - sls: {{ sls_service_clean }}
diff --git a/notepad-plusplus/subcomponent/config/file.sls b/notepad-plusplus/subcomponent/config/file.sls
index 247359b..99187d9 100644
--- a/notepad-plusplus/subcomponent/config/file.sls
+++ b/notepad-plusplus/subcomponent/config/file.sls
@@ -4,7 +4,7 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_config_file = tplroot ~ '.config.file' %}
-{%- from tplroot ~ "/map.jinja" import mapdata as notepad__plusplus with context %}
+{%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
 {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
 include:
@@ -12,7 +12,7 @@ include:
 
 notepad-plusplus-subcomponent-config-file-file-managed:
   file.managed:
-    - name: {{ notepad__plusplus.subcomponent.config }}
+    - name: {{ notepad_plusplus.subcomponent.config }}
     - source: {{ files_switch(['subcomponent-example.tmpl'],
                               lookup='notepad-plusplus-subcomponent-config-file-file-managed',
                               use_subpath=True
@@ -20,7 +20,7 @@ notepad-plusplus-subcomponent-config-file-file-managed:
               }}
     - mode: 644
     - user: root
-    - group: {{ notepad__plusplus.rootgroup }}
+    - group: {{ notepad_plusplus.rootgroup }}
     - makedirs: True
     - template: jinja
     - require_in:

From c9fb0f2375b2c6e56955ad1660377f45d0559ee0 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Fri, 10 Apr 2026 10:38:48 -0400
Subject: [PATCH 04/36] Update onlyif requisite

---
 notepad-plusplus/package/install.sls      | 11 ++++++++++-
 notepad-plusplus/parameters/defaults.yaml |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/notepad-plusplus/package/install.sls b/notepad-plusplus/package/install.sls
index ba887c8..8b3cf83 100644
--- a/notepad-plusplus/package/install.sls
+++ b/notepad-plusplus/package/install.sls
@@ -35,4 +35,13 @@ Install NotePad++:
         0,
         3010
       ]
-    - unless: 'if ( Test-Path "${env:ProgramFiles}\Notepad++\notepad++.exe" ) { exit 0 } else { exit 1 }'
+    - unless: |-
+        $nppPath = "C:\Program Files\Notepad++\notepad++.exe"
+
+        if ((Test-Path $nppPath) -and ((Get-Item $nppPath).VersionInfo.FileVersion -eq "{{ notepad_plusplus.pkg.version }}")) {
+          Write-Host 'Already at desired version' -ForegroundColor Green
+          exit 0
+        } else {
+          Write-Host 'Not at desired version (or not installed)' -ForegroundColor Yellow
+          exit 1
+        }
diff --git a/notepad-plusplus/parameters/defaults.yaml b/notepad-plusplus/parameters/defaults.yaml
index 0d8d1b7..a6b87a8 100644
--- a/notepad-plusplus/parameters/defaults.yaml
+++ b/notepad-plusplus/parameters/defaults.yaml
@@ -7,4 +7,5 @@ values:
   pkg:
     name: 'notepad++'
     installer_uri: 'https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.9.3/npp.8.9.3.Installer.x64.exe'
+    version: '8.9.3'
 ...

From c59954dca95c36e1896a2688740a2541694fd307 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Fri, 10 Apr 2026 10:58:49 -0400
Subject: [PATCH 05/36] Use 'latest' logic if no URI specified

---
 notepad-plusplus/package/install.sls      | 30 +++++++++++++++++++++--
 notepad-plusplus/parameters/defaults.yaml |  4 +--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/notepad-plusplus/package/install.sls b/notepad-plusplus/package/install.sls
index 8b3cf83..641a9cd 100644
--- a/notepad-plusplus/package/install.sls
+++ b/notepad-plusplus/package/install.sls
@@ -4,6 +4,22 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
+{%- if not notepad_plusplus.pkg.installer_uri or notepad_plusplus.pkg.installer_uri == '' -%}
+    # NO URI provided in defaults, falling back to GitHub API
+    {%- set github_api = "https://api.github.com/repos/notepad-plus-plus/notepad-plus-plus/releases/latest" -%}
+    {%- set metadata = salt['http.query'](github_api, decode=true, decode_type='json')['dict'] -%}
+
+    {%- for asset in metadata.get('assets', []) -%}
+        {%- if "Installer.x64.exe" in asset.name -%}
+            {%- set download_url = asset.browser_download_url -%}
+        {%- endif -%}
+    {%- endfor -%}
+    {%- set version = metadata.tag_name | replace('v', '') -%}
+{%- else -%}
+    # URI was provided in parameters, use it and the provided version
+    {%- set download_url = notepad_plusplus.pkg.installer_uri -%}
+    {%- set version = notepad_plusplus.pkg.version -%}
+{%- endif -%}
 {%- if salt.grains.get('cpuarch') == "AMD64" %}
   {%- set temp_exe = 'C:/Windows/Temp/npp.Installer.x64.exe' %}
 {%- else %}
@@ -19,9 +35,11 @@ Delete EXE-installer:
 Download NotePad++:
   file.managed:
     - name: '{{ temp_exe }}'
-    - source: '{{ notepad_plusplus.pkg.installer_uri }}'
+    - source: '{{ download_url}}'
     - skip_verify: True
     - makedirs: True
+    - require:
+      - test: 'Pre-flight Message'
 
 Install NotePad++:
   cmd.run:
@@ -38,10 +56,18 @@ Install NotePad++:
     - unless: |-
         $nppPath = "C:\Program Files\Notepad++\notepad++.exe"
 
-        if ((Test-Path $nppPath) -and ((Get-Item $nppPath).VersionInfo.FileVersion -eq "{{ notepad_plusplus.pkg.version }}")) {
+        if ((Test-Path $nppPath) -and ((Get-Item $nppPath).VersionInfo.FileVersion -eq "{{ version }}")) {
           Write-Host 'Already at desired version' -ForegroundColor Green
           exit 0
         } else {
           Write-Host 'Not at desired version (or not installed)' -ForegroundColor Yellow
           exit 1
         }
+
+Pre-flight Message:
+  test.show_notification:
+    - text: |-
+        ---------------------------------------------
+        Will attempt to download Notepdd++ version
+        {{ version }} from {{ download_url }}
+        ---------------------------------------------
diff --git a/notepad-plusplus/parameters/defaults.yaml b/notepad-plusplus/parameters/defaults.yaml
index a6b87a8..8c5f8c8 100644
--- a/notepad-plusplus/parameters/defaults.yaml
+++ b/notepad-plusplus/parameters/defaults.yaml
@@ -6,6 +6,6 @@
 values:
   pkg:
     name: 'notepad++'
-    installer_uri: 'https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.9.3/npp.8.9.3.Installer.x64.exe'
-    version: '8.9.3'
+    installer_uri: ''
+    version: ''
 ...

From 0225fee40ebb59da191bbbbd980fc3f0367c5b4b Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Fri, 10 Apr 2026 11:27:05 -0400
Subject: [PATCH 06/36] assign dynami vars to 'npp' namespace

---
 notepad-plusplus/package/install.sls | 40 +++++++++++++++-------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/notepad-plusplus/package/install.sls b/notepad-plusplus/package/install.sls
index 641a9cd..e354edf 100644
--- a/notepad-plusplus/package/install.sls
+++ b/notepad-plusplus/package/install.sls
@@ -4,22 +4,26 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
-{%- if not notepad_plusplus.pkg.installer_uri or notepad_plusplus.pkg.installer_uri == '' -%}
-    # NO URI provided in defaults, falling back to GitHub API
-    {%- set github_api = "https://api.github.com/repos/notepad-plus-plus/notepad-plus-plus/releases/latest" -%}
-    {%- set metadata = salt['http.query'](github_api, decode=true, decode_type='json')['dict'] -%}
+# Initialize a namespace to persist variables across loops
+{%- set npp = namespace(download_url='', version='') %}
 
-    {%- for asset in metadata.get('assets', []) -%}
-        {%- if "Installer.x64.exe" in asset.name -%}
-            {%- set download_url = asset.browser_download_url -%}
-        {%- endif -%}
-    {%- endfor -%}
-    {%- set version = metadata.tag_name | replace('v', '') -%}
-{%- else -%}
-    # URI was provided in parameters, use it and the provided version
-    {%- set download_url = notepad_plusplus.pkg.installer_uri -%}
-    {%- set version = notepad_plusplus.pkg.version -%}
-{%- endif -%}
+{%- if not notepad_plusplus.pkg.installer_uri %}
+    # Fallback to GitHub API
+    {%- set github_api = "https://api.github.com/repos/notepad-plus-plus/notepad-plus-plus/releases/latest" %}
+    {%- set metadata = salt['http.query'](github_api, decode=true, decode_type='json')['dict'] %}
+
+    {%- set npp.version = metadata.get('tag_name', '0.0.0') | replace('v', '') %}
+
+    {%- for asset in metadata.get('assets', []) %}
+        {%- if "Installer.x64.exe" in asset.name %}
+            {%- set npp.download_url = asset.browser_download_url %}
+        {%- endif %}
+    {%- endfor %}
+{%- else %}
+    # Use provided parameters
+    {%- set npp.download_url = notepad_plusplus.pkg.installer_uri %}
+    {%- set npp.version = notepad_plusplus.pkg.version %}
+{%- endif %}
 {%- if salt.grains.get('cpuarch') == "AMD64" %}
   {%- set temp_exe = 'C:/Windows/Temp/npp.Installer.x64.exe' %}
 {%- else %}
@@ -35,7 +39,7 @@ Delete EXE-installer:
 Download NotePad++:
   file.managed:
     - name: '{{ temp_exe }}'
-    - source: '{{ download_url}}'
+    - source: '{{ npp.download_url}}'
     - skip_verify: True
     - makedirs: True
     - require:
@@ -56,7 +60,7 @@ Install NotePad++:
     - unless: |-
         $nppPath = "C:\Program Files\Notepad++\notepad++.exe"
 
-        if ((Test-Path $nppPath) -and ((Get-Item $nppPath).VersionInfo.FileVersion -eq "{{ version }}")) {
+        if ((Test-Path $nppPath) -and ((Get-Item $nppPath).VersionInfo.FileVersion -eq "{{ npp.version }}")) {
           Write-Host 'Already at desired version' -ForegroundColor Green
           exit 0
         } else {
@@ -69,5 +73,5 @@ Pre-flight Message:
     - text: |-
         ---------------------------------------------
         Will attempt to download Notepdd++ version
-        {{ version }} from {{ download_url }}
+        {{ npp.version }} from {{ npp.download_url }}
         ---------------------------------------------

From e46b60ea06dcf1c3bcb34ef81096873360b36e81 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Mon, 13 Apr 2026 10:44:43 -0400
Subject: [PATCH 07/36] Remove calls to not-implemented 'service' and
 'subcomponent' modules

---
 notepad-plusplus/clean.sls | 2 --
 notepad-plusplus/init.sls  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/notepad-plusplus/clean.sls b/notepad-plusplus/clean.sls
index 9e45fb4..0fba65d 100644
--- a/notepad-plusplus/clean.sls
+++ b/notepad-plusplus/clean.sls
@@ -2,7 +2,5 @@
 # vim: ft=sls
 
 include:
-  - .subcomponent.clean
-  - .service.clean
   - .config.clean
   - .package.clean
diff --git a/notepad-plusplus/init.sls b/notepad-plusplus/init.sls
index 275d1fc..717b68e 100644
--- a/notepad-plusplus/init.sls
+++ b/notepad-plusplus/init.sls
@@ -4,5 +4,3 @@
 include:
   - .package
   - .config
-  - .service
-  - .subcomponent

From e228e687409c4e6d4efba26b483af5900684e2f0 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Mon, 13 Apr 2026 11:15:43 -0400
Subject: [PATCH 08/36] Configure appropriate update-nagging

---
 notepad-plusplus/config/file.sls | 41 ++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/notepad-plusplus/config/file.sls b/notepad-plusplus/config/file.sls
index 102bf5f..be63515 100644
--- a/notepad-plusplus/config/file.sls
+++ b/notepad-plusplus/config/file.sls
@@ -6,23 +6,38 @@
 {%- set sls_package_install = tplroot ~ '.package.install' %}
 {%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
 {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
+{%- set npp_admins = notepad_plusplus.config.npp_admins or ['Administrator'] %}
+{%- set npp_dir = 'C:\\Program Files\\Notepad++' %}
 
 include:
   - {{ sls_package_install }}
 
-notepad-plusplus-config-file-file-managed:
+NPP User Template (No nagging for updates):
   file.managed:
-    - name: {{ notepad_plusplus.config }}
-    - source: {{ files_switch(['example.tmpl'],
-                              lookup='notepad-plusplus-config-file-file-managed'
-                 )
-              }}
-    - mode: 644
-    - user: root
-    - group: {{ notepad_plusplus.rootgroup }}
+    - name: {{ npp_dir }}\config.model.xml
+    - contents: |
+        <NotepadPlus>
+            <GUIConfig name="noUpdate" yesNo="yes" />
+        </NotepadPlus>
+
+{% for admin in npp_admins %}
+{% set admin_appdata = 'C:\\Users\\' ~ admin ~ '\\AppData\\Roaming\\Notepad++' %}
+Ensure NPP Admin Config Dir for {{ admin }} exists:
+  file.directory:
+    - name: '{{ admin_appdata }}'
     - makedirs: True
-    - template: jinja
+    # Gracefully skip if the account was renamed or doesn't exist
+    - onlyif: 'if ( Test-Path "C:\Users\{{ admin }}" ) { exit 0 } else { exit 1 }'
+
+Create NPP Admin Config File for {{ admin }}:
+  file.managed:
+    - name: '{{ admin_appdata }}\config.xml'
+    - contents: |
+        <NotepadPlus>
+            <GUIConfig name="noUpdate" yesNo="no" />
+        </NotepadPlus>
     - require:
-      - sls: {{ sls_package_install }}
-    - context:
-        notepad_plusplus: {{ notepad_plusplus | json }}
+      - file: 'Ensure NPP Admin Config Dir for {{ admin }} exists'
+    # Double-guard to ensure we don't attempt to write to a non-existent path
+    - onlyif: 'if ( Test-Path "C:\Users\{{ admin }}" ) { exit 0 } else { exit 1 }'
+{% endfor %}

From cea3645923754010b64b2982169d460c51739afe Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Mon, 13 Apr 2026 11:46:22 -0400
Subject: [PATCH 09/36] Externalize the EXE-installer logic

---
 notepad-plusplus/config/file.sls       |  2 ++
 notepad-plusplus/files/npp_install.ps1 | 30 ++++++++++++++++++++++
 notepad-plusplus/package/install.sls   | 35 ++++++++------------------
 3 files changed, 42 insertions(+), 25 deletions(-)
 create mode 100644 notepad-plusplus/files/npp_install.ps1

diff --git a/notepad-plusplus/config/file.sls b/notepad-plusplus/config/file.sls
index be63515..1edc534 100644
--- a/notepad-plusplus/config/file.sls
+++ b/notepad-plusplus/config/file.sls
@@ -19,6 +19,8 @@ NPP User Template (No nagging for updates):
         <NotepadPlus>
             <GUIConfig name="noUpdate" yesNo="yes" />
         </NotepadPlus>
+    - require:
+      - cmd: 'Install NotePad++'
 
 {% for admin in npp_admins %}
 {% set admin_appdata = 'C:\\Users\\' ~ admin ~ '\\AppData\\Roaming\\Notepad++' %}
diff --git a/notepad-plusplus/files/npp_install.ps1 b/notepad-plusplus/files/npp_install.ps1
new file mode 100644
index 0000000..21a31c6
--- /dev/null
+++ b/notepad-plusplus/files/npp_install.ps1
@@ -0,0 +1,30 @@
+# Script to install Notepad++ while still keeping saltstack's output not 
+# completely horrific
+$target = $args[0]
+$tempExe = $args[1]
+
+$paths = @(
+  "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Notepad++",
+  "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Notepad++"
+)
+
+$installed = $false
+
+# Iterate our HKLM paths and determine if NPP is already installed and at 
+# correct version
+foreach ($path in $paths) {
+  if (Test-Path $path) {
+    $val = (Get-ItemProperty $path).DisplayVersion
+    if ($val -match $target) { $installed = $true; break }
+  }
+}
+
+# Install if necessary
+if (-not $installed) {
+  Write-Host "Version $target not found. Installing..."
+  Start-Process $tempExe -ArgumentList '/S' -Wait
+  Start-Sleep -Seconds 5
+} else {
+  Write-Host "Notepad++ $target already installed. Skipping."
+}
+
diff --git a/notepad-plusplus/package/install.sls b/notepad-plusplus/package/install.sls
index e354edf..d7356e4 100644
--- a/notepad-plusplus/package/install.sls
+++ b/notepad-plusplus/package/install.sls
@@ -2,19 +2,19 @@
 # vim: ft=sls
 
 {#- Get the `tplroot` from `tpldir` #}
-{%- set tplroot = tpldir.split('/')[0] %}
+{%- set tplroot = tpldir.split('/' )[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
 # Initialize a namespace to persist variables across loops
-{%- set npp = namespace(download_url='', version='') %}
+{%- set npp = namespace(download_url='', version='' ) %}
 
 {%- if not notepad_plusplus.pkg.installer_uri %}
     # Fallback to GitHub API
     {%- set github_api = "https://api.github.com/repos/notepad-plus-plus/notepad-plus-plus/releases/latest" %}
-    {%- set metadata = salt['http.query'](github_api, decode=true, decode_type='json')['dict'] %}
+    {%- set metadata = salt['http.query'](github_api, decode=true, decode_type='json' )['dict'] %}
 
-    {%- set npp.version = metadata.get('tag_name', '0.0.0') | replace('v', '') %}
+    {%- set npp.version = metadata.get('tag_name', '0.0.0' ) | replace('v', '' ) %}
 
-    {%- for asset in metadata.get('assets', []) %}
+    {%- for asset in metadata.get('assets', [] ) %}
         {%- if "Installer.x64.exe" in asset.name %}
             {%- set npp.download_url = asset.browser_download_url %}
         {%- endif %}
@@ -24,7 +24,7 @@
     {%- set npp.download_url = notepad_plusplus.pkg.installer_uri %}
     {%- set npp.version = notepad_plusplus.pkg.version %}
 {%- endif %}
-{%- if salt.grains.get('cpuarch') == "AMD64" %}
+{%- if salt.grains.get('cpuarch' ) == "AMD64" %}
   {%- set temp_exe = 'C:/Windows/Temp/npp.Installer.x64.exe' %}
 {%- else %}
   {%- set temp_exe = 'C:/Windows/Temp/npp.Installer.exe' %}
@@ -46,27 +46,12 @@ Download NotePad++:
       - test: 'Pre-flight Message'
 
 Install NotePad++:
-  cmd.run:
-    - name: |
-        Start-Process "{{ temp_exe }}" -ArgumentList '/S' -Wait
-        Start-Sleep -Seconds 5
+  cmd.script:
+    - source: salt://{{ tplroot }}/files/npp_install.ps1
+    - args: "'{{ npp.version }}' '{{ temp_exe }}'"
+    - shell: powershell
     - require:
       - file: 'Download NotePad++'
-    - shell: powershell
-    - success_retcodes: [
-        0,
-        3010
-      ]
-    - unless: |-
-        $nppPath = "C:\Program Files\Notepad++\notepad++.exe"
-
-        if ((Test-Path $nppPath) -and ((Get-Item $nppPath).VersionInfo.FileVersion -eq "{{ npp.version }}")) {
-          Write-Host 'Already at desired version' -ForegroundColor Green
-          exit 0
-        } else {
-          Write-Host 'Not at desired version (or not installed)' -ForegroundColor Yellow
-          exit 1
-        }
 
 Pre-flight Message:
   test.show_notification:

From 9561e6e426c44fc44456894793fa258f88a8200b Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Mon, 13 Apr 2026 14:25:54 -0400
Subject: [PATCH 10/36] Use better onlyif condition

---
 notepad-plusplus/config/file.sls | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/notepad-plusplus/config/file.sls b/notepad-plusplus/config/file.sls
index 1edc534..b0efc05 100644
--- a/notepad-plusplus/config/file.sls
+++ b/notepad-plusplus/config/file.sls
@@ -28,8 +28,14 @@ Ensure NPP Admin Config Dir for {{ admin }} exists:
   file.directory:
     - name: '{{ admin_appdata }}'
     - makedirs: True
-    # Gracefully skip if the account was renamed or doesn't exist
-    - onlyif: 'if ( Test-Path "C:\Users\{{ admin }}" ) { exit 0 } else { exit 1 }'
+    - onlyif:
+      - shell: powershell
+      - cmd: |
+          if (Get-LocalUser -Name "{{ admin }}" -ErrorAction SilentlyContinue) {
+            exit 0
+          } else {
+            exit 1
+          }
 
 Create NPP Admin Config File for {{ admin }}:
   file.managed:
@@ -40,6 +46,4 @@ Create NPP Admin Config File for {{ admin }}:
         </NotepadPlus>
     - require:
       - file: 'Ensure NPP Admin Config Dir for {{ admin }} exists'
-    # Double-guard to ensure we don't attempt to write to a non-existent path
-    - onlyif: 'if ( Test-Path "C:\Users\{{ admin }}" ) { exit 0 } else { exit 1 }'
 {% endfor %}

From 96a1937202bd6e4f1545b59fef4ce92e4ea2e56e Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Mon, 13 Apr 2026 14:43:23 -0400
Subject: [PATCH 11/36] Disable auto-updater service

---
 notepad-plusplus/config/file.sls | 44 ++++++++++++++++++++++++--------
 notepad-plusplus/files/gup.xml   | 10 ++++++++
 2 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 notepad-plusplus/files/gup.xml

diff --git a/notepad-plusplus/config/file.sls b/notepad-plusplus/config/file.sls
index b0efc05..d1ae310 100644
--- a/notepad-plusplus/config/file.sls
+++ b/notepad-plusplus/config/file.sls
@@ -12,18 +12,32 @@
 include:
   - {{ sls_package_install }}
 
-NPP User Template (No nagging for updates):
+Auto-updater disablement notice:
+  test.show_notification:
+    - text: |-
+        ---------------------------------------------
+        Auto-update disabled to prevent users from
+        being nagged to do something outside their
+        ability to effect. Administrators can still
+        login and force an update, if necessary
+        (typically, system will be re-deployed rather
+        than updated)
+        ---------------------------------------------
+    - require:
+      - cmd: 'Install NotePad++'
+
+{% for admin in npp_admins %}
+{% set admin_appdata = 'C:\\Users\\' ~ admin ~ '\\AppData\\Roaming\\Notepad++' %}
+Create NPP Admin Config File for {{ admin }}:
   file.managed:
-    - name: {{ npp_dir }}\config.model.xml
+    - name: '{{ admin_appdata }}\config.xml'
     - contents: |
         <NotepadPlus>
-            <GUIConfig name="noUpdate" yesNo="yes" />
+            <GUIConfig name="noUpdate" yesNo="no" />
         </NotepadPlus>
     - require:
-      - cmd: 'Install NotePad++'
+      - file: 'Ensure NPP Admin Config Dir for {{ admin }} exists'
 
-{% for admin in npp_admins %}
-{% set admin_appdata = 'C:\\Users\\' ~ admin ~ '\\AppData\\Roaming\\Notepad++' %}
 Ensure NPP Admin Config Dir for {{ admin }} exists:
   file.directory:
     - name: '{{ admin_appdata }}'
@@ -36,14 +50,22 @@ Ensure NPP Admin Config Dir for {{ admin }} exists:
           } else {
             exit 1
           }
+{% endfor %}
 
-Create NPP Admin Config File for {{ admin }}:
+Manage Notepad++ Updater Config:
   file.managed:
-    - name: '{{ admin_appdata }}\config.xml'
+    - name: 'C:\Program Files\Notepad++\updater\gup.xml'
+    - source: salt://{{ tplroot }}/files/gup.xml
+    - makedirs: True
+    - require:
+      - test: 'Auto-updater disablement notice'
+
+NPP User Template (No nagging for updates):
+  file.managed:
+    - name: {{ npp_dir }}\config.model.xml
     - contents: |
         <NotepadPlus>
-            <GUIConfig name="noUpdate" yesNo="no" />
+            <GUIConfig name="noUpdate" yesNo="yes" />
         </NotepadPlus>
     - require:
-      - file: 'Ensure NPP Admin Config Dir for {{ admin }} exists'
-{% endfor %}
+      - cmd: 'Install NotePad++'
diff --git a/notepad-plusplus/files/gup.xml b/notepad-plusplus/files/gup.xml
new file mode 100644
index 0000000..025e839
--- /dev/null
+++ b/notepad-plusplus/files/gup.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<GUP>
+    <uninstallerCmdLine>/S</uninstallerCmdLine>
+    <priority>low</priority>
+    <package>
+        <description>Notepad++</description>
+        <version>8.9.2</version>
+    </package>
+    <infoUrl>http://127.0.0.1</infoUrl>
+</GUP>

From ce1593043349b58469611d49b872492d3c870c83 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Mon, 13 Apr 2026 15:02:05 -0400
Subject: [PATCH 12/36] oops: don't hardcode the version!

---
 notepad-plusplus/config/file.sls | 7 +++++--
 notepad-plusplus/files/gup.xml   | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/notepad-plusplus/config/file.sls b/notepad-plusplus/config/file.sls
index d1ae310..08b314a 100644
--- a/notepad-plusplus/config/file.sls
+++ b/notepad-plusplus/config/file.sls
@@ -54,11 +54,14 @@ Ensure NPP Admin Config Dir for {{ admin }} exists:
 
 Manage Notepad++ Updater Config:
   file.managed:
-    - name: 'C:\Program Files\Notepad++\updater\gup.xml'
-    - source: salt://{{ tplroot }}/files/gup.xml
+    - context:
+        npp_version: {{ notepad_plusplus.version }}
     - makedirs: True
+    - name: 'C:\Program Files\Notepad++\updater\gup.xml'
     - require:
       - test: 'Auto-updater disablement notice'
+    - source: salt://{{ tplroot }}/files/gup.xml
+    - template: jinja
 
 NPP User Template (No nagging for updates):
   file.managed:
diff --git a/notepad-plusplus/files/gup.xml b/notepad-plusplus/files/gup.xml
index 025e839..5b1e381 100644
--- a/notepad-plusplus/files/gup.xml
+++ b/notepad-plusplus/files/gup.xml
@@ -4,7 +4,7 @@
     <priority>low</priority>
     <package>
         <description>Notepad++</description>
-        <version>8.9.2</version>
+        <version>{{ npp_version }}</version>
     </package>
-    <infoUrl>http://127.0.0.1</infoUrl>
+    <infoUrl>http://127.0.0.1/checkUpdate.xml</infoUrl>
 </GUP>

From aaec5682d160869b36fbf89c0978609c4327d797 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Mon, 13 Apr 2026 15:15:25 -0400
Subject: [PATCH 13/36] Illustrate pillar content

---
 pillar.example | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 pillar.example

diff --git a/pillar.example b/pillar.example
new file mode 100644
index 0000000..094b2d7
--- /dev/null
+++ b/pillar.example
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+notepad-plusplus:
+  pkg:                 # Installation-package related settings
+    version: ''        # Target X.Y.Z version-number for installed Notepad++ application
+    installer_uri: ''  # URL to download from. Usually something like:
+                       # 'https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.8.8/npp.8.8.8.Installer.x64.exe'
+
+  config:              # Configuration-related settings for the installed application
+    npp_admins:        # User accounts that have admin rights (list)
+      - Administrator  # Used for designating which users are allowed to be
+      - LocalAdmin     # nagged if the auto-update service is configured
+      - ...

From 19a63ddc8d3737d3a819f763f1cf2c6331880b85 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Mon, 13 Apr 2026 15:32:56 -0400
Subject: [PATCH 14/36] Add some nice-to-have registry values

* Notepad++ and icon in context menues:
    * 'HKEY_CLASSES_ROOT\*\shell\Open with Notepad++'
    * 'HKEY_CLASSES_ROOT\*\shell\Open with Notepad++\command'
* Call npp on actions that would normally call the "stock" notepad
  application:
    * 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe'
* Make it so `runcmd` doesn't care if npp is in the global PATH env:
    * 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\notepad++.exe'
    * 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\notepad++.exe'
---
 notepad-plusplus/config/file.sls | 63 ++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/notepad-plusplus/config/file.sls b/notepad-plusplus/config/file.sls
index 08b314a..e6cac5f 100644
--- a/notepad-plusplus/config/file.sls
+++ b/notepad-plusplus/config/file.sls
@@ -8,10 +8,47 @@
 {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 {%- set npp_admins = notepad_plusplus.config.npp_admins or ['Administrator'] %}
 {%- set npp_dir = 'C:\\Program Files\\Notepad++' %}
+# Initialize a namespace to persist variables across loops
+{%- set npp = namespace(download_url='', version='') %}
+{%- if not notepad_plusplus.pkg.installer_uri %}
+    # Fallback to GitHub API
+    {%- set github_api = "https://api.github.com/repos/notepad-plus-plus/notepad-plus-plus/releases/latest" %}
+    {%- set metadata = salt['http.query'](github_api, decode=true, decode_type='json' )['dict'] %}
+
+    {%- set npp.version = metadata.get('tag_name', '0.0.0' ) | replace('v', '' ) %}
+
+    {%- for asset in metadata.get('assets', [] ) %}
+        {%- if "Installer.x64.exe" in asset.name %}
+            {%- set npp.download_url = asset.browser_download_url %}
+        {%- endif %}
+    {%- endfor %}
+{%- else %}
+    # Use provided parameters
+    {%- set npp.download_url = notepad_plusplus.pkg.installer_uri %}
+    {%- set npp.version = notepad_plusplus.pkg.version %}
+{%- endif %}
+
 
 include:
   - {{ sls_package_install }}
 
+Add NPP Icon to Context Menu:
+  reg.present:
+    - name: 'HKEY_CLASSES_ROOT\*\shell\Open with Notepad++'
+    - vname: Icon
+    - value: 'C:\Program Files\Notepad++\notepad++.exe,0'
+    - vtype: REG_SZ
+    - require:
+      - cmd: 'Install NotePad++'
+
+Add NPP to Context Menu:
+  reg.present:
+    - name: 'HKEY_CLASSES_ROOT\*\shell\Open with Notepad++\command'
+    - value: '"C:\Program Files\Notepad++\notepad++.exe" "%1"'
+    - vtype: REG_SZ
+    - require:
+      - cmd: 'Install NotePad++'
+
 Auto-updater disablement notice:
   test.show_notification:
     - text: |-
@@ -72,3 +109,29 @@ NPP User Template (No nagging for updates):
         </NotepadPlus>
     - require:
       - cmd: 'Install NotePad++'
+
+Replace System Notepad with NPP:
+  reg.present:
+    - name: 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe'
+    - vname: Debugger
+    - value: '"C:\Program Files\Notepad++\notepad++.exe" -systemedit'
+    - vtype: REG_SZ
+    - require:
+      - cmd: 'Install NotePad++'
+
+Set NPP App Path:
+  reg.present:
+    - name: 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\notepad++.exe'
+    - value: 'C:\Program Files\Notepad++\notepad++.exe'
+    - vtype: REG_SZ
+    - require:
+      - cmd: 'Install NotePad++'
+
+Set NPP App Path Default:
+  reg.present:
+    - name: 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\notepad++.exe'
+    - vname: Path
+    - value: 'C:\Program Files\Notepad++'
+    - vtype: REG_SZ
+    - require:
+      - cmd: 'Install NotePad++'

From 11809edc418d1c1fb37b06f1d552293d6e5525ef Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Tue, 14 Apr 2026 07:33:54 -0400
Subject: [PATCH 15/36] Move 'fallback' logic to map.jinja

...and compact the version and/or url references in the config/file and
package/install files to reflect relocation of fallback logic
---
 notepad-plusplus/config/file.sls     | 23 +++--------------------
 notepad-plusplus/map.jinja           | 24 ++++++++++++++++++++++++
 notepad-plusplus/package/install.sls | 28 +++++-----------------------
 3 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/notepad-plusplus/config/file.sls b/notepad-plusplus/config/file.sls
index e6cac5f..3a24efd 100644
--- a/notepad-plusplus/config/file.sls
+++ b/notepad-plusplus/config/file.sls
@@ -6,27 +6,10 @@
 {%- set sls_package_install = tplroot ~ '.package.install' %}
 {%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
 {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
+{%- set npp_version = notepad_plusplus.version %}
+{%- set npp_url = notepad_plusplus.download_url %}
 {%- set npp_admins = notepad_plusplus.config.npp_admins or ['Administrator'] %}
 {%- set npp_dir = 'C:\\Program Files\\Notepad++' %}
-# Initialize a namespace to persist variables across loops
-{%- set npp = namespace(download_url='', version='') %}
-{%- if not notepad_plusplus.pkg.installer_uri %}
-    # Fallback to GitHub API
-    {%- set github_api = "https://api.github.com/repos/notepad-plus-plus/notepad-plus-plus/releases/latest" %}
-    {%- set metadata = salt['http.query'](github_api, decode=true, decode_type='json' )['dict'] %}
-
-    {%- set npp.version = metadata.get('tag_name', '0.0.0' ) | replace('v', '' ) %}
-
-    {%- for asset in metadata.get('assets', [] ) %}
-        {%- if "Installer.x64.exe" in asset.name %}
-            {%- set npp.download_url = asset.browser_download_url %}
-        {%- endif %}
-    {%- endfor %}
-{%- else %}
-    # Use provided parameters
-    {%- set npp.download_url = notepad_plusplus.pkg.installer_uri %}
-    {%- set npp.version = notepad_plusplus.pkg.version %}
-{%- endif %}
 
 
 include:
@@ -92,7 +75,7 @@ Ensure NPP Admin Config Dir for {{ admin }} exists:
 Manage Notepad++ Updater Config:
   file.managed:
     - context:
-        npp_version: {{ notepad_plusplus.version }}
+        npp_version: {{ npp_version}}
     - makedirs: True
     - name: 'C:\Program Files\Notepad++\updater\gup.xml'
     - require:
diff --git a/notepad-plusplus/map.jinja b/notepad-plusplus/map.jinja
index cc25c18..0d81c75 100644
--- a/notepad-plusplus/map.jinja
+++ b/notepad-plusplus/map.jinja
@@ -61,6 +61,30 @@
 {%- do salt["log.debug"]("map.jinja: save parameters in variable 'mapdata'") %}
 {%- set mapdata = _formula_settings["values"] %}
 
+{# Fallback for version if not defined in defaults/pillar #}
+{%- if not mapdata.get('version') %}
+    {%- set github_api = "https://api.github.com/repos/notepad-plus-plus/notepad-plus-plus/releases/latest" %}
+    {%- set metadata = salt['http.query'](github_api, decode=true, decode_type='json').get('dict', {}) %}
+
+    {# Extract version and clean it (v8.6.5 -> 8.6.5) #}
+    {%- set npp_version = metadata.get('tag_name', '0.0.0') | replace('v', '') %}
+
+    {# Also find the download URL while we have the metadata #}
+    {%- set ns = namespace(url='') %}
+    {%- for asset in metadata.get('assets', []) %}
+        {%- if "Installer.x64.exe" in asset.name %}
+            {%- set ns.url = asset.browser_download_url %}
+        {%- endif %}
+    {%- endfor %}
+
+    {# Inject both into mapdata #}
+    {%- do mapdata.update({
+        'version': npp_version,
+        'download_url': ns.url
+    }) %}
+
+{%- endif %}
+
 {#- Per formula post-processing of `mapdata` if it exists #}
 {%- do salt["log.debug"]("map.jinja: post-processing of 'mapdata'") %}
 {%- include tplroot ~ "/post-map.jinja" ignore missing %}
diff --git a/notepad-plusplus/package/install.sls b/notepad-plusplus/package/install.sls
index d7356e4..6b850dc 100644
--- a/notepad-plusplus/package/install.sls
+++ b/notepad-plusplus/package/install.sls
@@ -4,26 +4,8 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/' )[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
-# Initialize a namespace to persist variables across loops
-{%- set npp = namespace(download_url='', version='' ) %}
-
-{%- if not notepad_plusplus.pkg.installer_uri %}
-    # Fallback to GitHub API
-    {%- set github_api = "https://api.github.com/repos/notepad-plus-plus/notepad-plus-plus/releases/latest" %}
-    {%- set metadata = salt['http.query'](github_api, decode=true, decode_type='json' )['dict'] %}
-
-    {%- set npp.version = metadata.get('tag_name', '0.0.0' ) | replace('v', '' ) %}
-
-    {%- for asset in metadata.get('assets', [] ) %}
-        {%- if "Installer.x64.exe" in asset.name %}
-            {%- set npp.download_url = asset.browser_download_url %}
-        {%- endif %}
-    {%- endfor %}
-{%- else %}
-    # Use provided parameters
-    {%- set npp.download_url = notepad_plusplus.pkg.installer_uri %}
-    {%- set npp.version = notepad_plusplus.pkg.version %}
-{%- endif %}
+{%- set npp_version = notepad_plusplus.version %}
+{%- set npp_url = notepad_plusplus.download_url %}
 {%- if salt.grains.get('cpuarch' ) == "AMD64" %}
   {%- set temp_exe = 'C:/Windows/Temp/npp.Installer.x64.exe' %}
 {%- else %}
@@ -39,7 +21,7 @@ Delete EXE-installer:
 Download NotePad++:
   file.managed:
     - name: '{{ temp_exe }}'
-    - source: '{{ npp.download_url}}'
+    - source: '{{ npp_url }}'
     - skip_verify: True
     - makedirs: True
     - require:
@@ -48,7 +30,7 @@ Download NotePad++:
 Install NotePad++:
   cmd.script:
     - source: salt://{{ tplroot }}/files/npp_install.ps1
-    - args: "'{{ npp.version }}' '{{ temp_exe }}'"
+    - args: "'{{ npp_version }}' '{{ temp_exe }}'"
     - shell: powershell
     - require:
       - file: 'Download NotePad++'
@@ -58,5 +40,5 @@ Pre-flight Message:
     - text: |-
         ---------------------------------------------
         Will attempt to download Notepdd++ version
-        {{ npp.version }} from {{ npp.download_url }}
+        {{ npp_version }} from {{ npp_url }}
         ---------------------------------------------

From c408085eabdd602359577d551c314c552e539db3 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Tue, 14 Apr 2026 07:41:47 -0400
Subject: [PATCH 16/36] fix attribute-type

---
 notepad-plusplus/config/file.sls | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/notepad-plusplus/config/file.sls b/notepad-plusplus/config/file.sls
index 3a24efd..c27d1b3 100644
--- a/notepad-plusplus/config/file.sls
+++ b/notepad-plusplus/config/file.sls
@@ -19,7 +19,7 @@ Add NPP Icon to Context Menu:
   reg.present:
     - name: 'HKEY_CLASSES_ROOT\*\shell\Open with Notepad++'
     - vname: Icon
-    - value: 'C:\Program Files\Notepad++\notepad++.exe,0'
+    - vdata: 'C:\Program Files\Notepad++\notepad++.exe,0'
     - vtype: REG_SZ
     - require:
       - cmd: 'Install NotePad++'
@@ -97,7 +97,7 @@ Replace System Notepad with NPP:
   reg.present:
     - name: 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe'
     - vname: Debugger
-    - value: '"C:\Program Files\Notepad++\notepad++.exe" -systemedit'
+    - vdata: '"C:\Program Files\Notepad++\notepad++.exe" -systemedit'
     - vtype: REG_SZ
     - require:
       - cmd: 'Install NotePad++'
@@ -114,7 +114,7 @@ Set NPP App Path Default:
   reg.present:
     - name: 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\notepad++.exe'
     - vname: Path
-    - value: 'C:\Program Files\Notepad++'
+    - vdata: 'C:\Program Files\Notepad++'
     - vtype: REG_SZ
     - require:
       - cmd: 'Install NotePad++'

From e56ee8e0f8af454e359daa9c73aab42832133f25 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Tue, 14 Apr 2026 07:46:04 -0400
Subject: [PATCH 17/36] Replace 'value' with 'vname' and 'vdata' attributes

---
 notepad-plusplus/config/file.sls | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/notepad-plusplus/config/file.sls b/notepad-plusplus/config/file.sls
index c27d1b3..fc20720 100644
--- a/notepad-plusplus/config/file.sls
+++ b/notepad-plusplus/config/file.sls
@@ -27,7 +27,8 @@ Add NPP Icon to Context Menu:
 Add NPP to Context Menu:
   reg.present:
     - name: 'HKEY_CLASSES_ROOT\*\shell\Open with Notepad++\command'
-    - value: '"C:\Program Files\Notepad++\notepad++.exe" "%1"'
+    - vname: ''
+    - vdata: '"C:\Program Files\Notepad++\notepad++.exe" "%1"'
     - vtype: REG_SZ
     - require:
       - cmd: 'Install NotePad++'
@@ -105,7 +106,8 @@ Replace System Notepad with NPP:
 Set NPP App Path:
   reg.present:
     - name: 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\notepad++.exe'
-    - value: 'C:\Program Files\Notepad++\notepad++.exe'
+    - vname: ''
+    - vdata: 'C:\Program Files\Notepad++\notepad++.exe'
     - vtype: REG_SZ
     - require:
       - cmd: 'Install NotePad++'

From d82a74bcbbd8caeae50da11829035f14e411daf7 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Tue, 14 Apr 2026 09:04:29 -0400
Subject: [PATCH 18/36] Ensure only the EXE is pulled

---
 notepad-plusplus/map.jinja | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/notepad-plusplus/map.jinja b/notepad-plusplus/map.jinja
index 0d81c75..7eda9c6 100644
--- a/notepad-plusplus/map.jinja
+++ b/notepad-plusplus/map.jinja
@@ -72,7 +72,7 @@
     {# Also find the download URL while we have the metadata #}
     {%- set ns = namespace(url='') %}
     {%- for asset in metadata.get('assets', []) %}
-        {%- if "Installer.x64.exe" in asset.name %}
+        {%- if "Installer.x64.exe" in asset.name and asset.name.endswith('.exe') %}
             {%- set ns.url = asset.browser_download_url %}
         {%- endif %}
     {%- endfor %}

From db988ded3aa61b8623088b3d723d68c5e0005c4b Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Tue, 14 Apr 2026 09:18:09 -0400
Subject: [PATCH 19/36] Make script exit properly on install-failures

---
 notepad-plusplus/files/npp_install.ps1 | 34 +++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/notepad-plusplus/files/npp_install.ps1 b/notepad-plusplus/files/npp_install.ps1
index 21a31c6..165fa4c 100644
--- a/notepad-plusplus/files/npp_install.ps1
+++ b/notepad-plusplus/files/npp_install.ps1
@@ -1,5 +1,8 @@
-# Script to install Notepad++ while still keeping saltstack's output not 
+# Script to install Notepad++ while still keeping saltstack's output not
 # completely horrific
+# Force PowerShell to stop on errors so we can catch them and report to Salt
+$ErrorActionPreference = 'Stop'
+
 $target = $args[0]
 $tempExe = $args[1]
 
@@ -10,7 +13,7 @@ $paths = @(
 
 $installed = $false
 
-# Iterate our HKLM paths and determine if NPP is already installed and at 
+# Iterate our HKLM paths and determine if NPP is already installed and at
 # correct version
 foreach ($path in $paths) {
   if (Test-Path $path) {
@@ -21,10 +24,29 @@ foreach ($path in $paths) {
 
 # Install if necessary
 if (-not $installed) {
-  Write-Host "Version $target not found. Installing..."
-  Start-Process $tempExe -ArgumentList '/S' -Wait
-  Start-Sleep -Seconds 5
+  Write-Host "Version $target not found. Attempting to install from $tempExe..."
+  try {
+    # If the file is a .sig or corrupted, this will now trigger the 'catch' block
+    Start-Process $tempExe -ArgumentList '/S' -Wait
+    Start-Sleep -Seconds 5
+
+    # Final verification: Check if the registry key now exists
+    $verified = $false
+    foreach ($path in $paths) { if (Test-Path $path) { $verified = $true } }
+
+    if ($verified) {
+        Write-Host "Installation successful."
+        exit 0
+    } else {
+        Write-Error "Installer finished but registry keys not found."
+        exit 1
+    }
+  } catch {
+    Write-Error "Installation failed: $($_.Exception.Message)"
+    # Explicitly return 1 so Salt catches the failure
+    exit 1
+  }
 } else {
   Write-Host "Notepad++ $target already installed. Skipping."
+  exit 0
 }
-

From 104f30c5cb3c44ff3e79431d25b8ebb30e36c387 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Tue, 14 Apr 2026 09:41:34 -0400
Subject: [PATCH 20/36] Need to nest these to aligne to Pillar

Nest "fallback" keys under `pkg` so that
*   notepad_plusplus.pkg.version
*   notepad_plusplus.pkg.installer_uri

Are the same across map-merges performed by the mapdata Jinja-logic
---
 notepad-plusplus/config/file.sls     | 4 ++--
 notepad-plusplus/map.jinja           | 8 +++++---
 notepad-plusplus/package/install.sls | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/notepad-plusplus/config/file.sls b/notepad-plusplus/config/file.sls
index fc20720..ffccac8 100644
--- a/notepad-plusplus/config/file.sls
+++ b/notepad-plusplus/config/file.sls
@@ -6,8 +6,8 @@
 {%- set sls_package_install = tplroot ~ '.package.install' %}
 {%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
 {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
-{%- set npp_version = notepad_plusplus.version %}
-{%- set npp_url = notepad_plusplus.download_url %}
+{%- set npp_version = notepad_plusplus.pkg.version %}
+{%- set npp_url = notepad_plusplus.pkg.installer_uri %}
 {%- set npp_admins = notepad_plusplus.config.npp_admins or ['Administrator'] %}
 {%- set npp_dir = 'C:\\Program Files\\Notepad++' %}
 
diff --git a/notepad-plusplus/map.jinja b/notepad-plusplus/map.jinja
index 7eda9c6..54e14e4 100644
--- a/notepad-plusplus/map.jinja
+++ b/notepad-plusplus/map.jinja
@@ -62,7 +62,7 @@
 {%- set mapdata = _formula_settings["values"] %}
 
 {# Fallback for version if not defined in defaults/pillar #}
-{%- if not mapdata.get('version') %}
+{%- if not mapdata.get('pkg', {}).get('version') %}
     {%- set github_api = "https://api.github.com/repos/notepad-plus-plus/notepad-plus-plus/releases/latest" %}
     {%- set metadata = salt['http.query'](github_api, decode=true, decode_type='json').get('dict', {}) %}
 
@@ -79,8 +79,10 @@
 
     {# Inject both into mapdata #}
     {%- do mapdata.update({
-        'version': npp_version,
-        'download_url': ns.url
+        'pkg': {
+            'version': npp_version,
+            'installer_uri': ns.url
+        }
     }) %}
 
 {%- endif %}
diff --git a/notepad-plusplus/package/install.sls b/notepad-plusplus/package/install.sls
index 6b850dc..9f0a8ec 100644
--- a/notepad-plusplus/package/install.sls
+++ b/notepad-plusplus/package/install.sls
@@ -4,8 +4,8 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/' )[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
-{%- set npp_version = notepad_plusplus.version %}
-{%- set npp_url = notepad_plusplus.download_url %}
+{%- set npp_version = notepad_plusplus.pkg.version %}
+{%- set npp_url = notepad_plusplus.pkg.installer_uri %}
 {%- if salt.grains.get('cpuarch' ) == "AMD64" %}
   {%- set temp_exe = 'C:/Windows/Temp/npp.Installer.x64.exe' %}
 {%- else %}

From 52d5f35b5c1ce23335810c2f5c1d146ab3c08438 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Tue, 14 Apr 2026 11:01:35 -0400
Subject: [PATCH 21/36] Start adding 'clean' logic (packages only)

---
 notepad-plusplus/files/npp_uninstall.ps1 | 45 ++++++++++++++++++++++++
 notepad-plusplus/package/clean.sls       | 19 +++++++---
 2 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 notepad-plusplus/files/npp_uninstall.ps1

diff --git a/notepad-plusplus/files/npp_uninstall.ps1 b/notepad-plusplus/files/npp_uninstall.ps1
new file mode 100644
index 0000000..b1dd731
--- /dev/null
+++ b/notepad-plusplus/files/npp_uninstall.ps1
@@ -0,0 +1,45 @@
+# Setup paths based on standard Notepad++ installation patterns
+$NppPath = "${env:ProgramFiles}\Notepad++"
+$NppExe  = Join-Path $NppPath "notepad++.exe"
+
+# PRE-CONDITION (State Check)
+# Check if the main executable exists. If not, we assume it's already gone.
+if (Test-Path $NppExe) {
+    Write-Output "Found Notepad++ binary at '$NppExe'"
+}
+else {
+    # Salt will see this string in 'stdout'; exit 100 identifies "Already Absent"
+    Write-Output "State: Already Absent"
+    exit 100
+}
+
+# EXECUTION
+# Notepad++ stores its uninstaller directly in the install directory
+$Uninstaller = Join-Path $NppPath "uninstall.exe"
+
+if (Test-Path $Uninstaller) {
+    Write-Output "Found uninstaller at '$Uninstaller'"
+    Write-Output "Executing silent uninstallation..."
+    
+    # Start the uninstaller with the /S (Silent) flag
+    $Proc = Start-Process -FilePath "$Uninstaller" -ArgumentList "/S" -Wait -PassThru
+    
+    # Optional: Wait briefly for file system hooks to release
+    Start-Sleep -Seconds 2
+
+    # FINAL VERIFICATION
+    if (-not (Test-Path $NppExe)) {
+        Write-Output "State: Success"
+        exit 0
+    } else {
+        Write-Error "State: Failed to remove binary"
+        exit 1
+    }
+}
+else {
+    # If binary exists but uninstaller is missing, we have a "dirty" state
+    Write-Error "Binary found but '$Uninstaller' is missing. Manual cleanup required."
+    exit 1
+}
+
+exit 100
diff --git a/notepad-plusplus/package/clean.sls b/notepad-plusplus/package/clean.sls
index 0ac8fe4..bcc5e0f 100644
--- a/notepad-plusplus/package/clean.sls
+++ b/notepad-plusplus/package/clean.sls
@@ -9,8 +9,17 @@
 include:
   - {{ sls_config_clean }}
 
-notepad-plusplus-package-clean-pkg-removed:
-  pkg.removed:
-    - name: {{ notepad_plusplus.pkg.name }}
-    - require:
-      - sls: {{ sls_config_clean }}
+Purge Notepad++ Directory:
+  file.absent:
+    - name: 'C:\Program Files\Notepad++'
+    - onchanges:
+      - cmd: Uninstall Notepad++
+
+Uninstall Notepad++:
+  cmd.script:
+    - source: salt://{{ tplroot }}/files/npp_uninstall.ps1
+    - shell: powershell
+    - success_retcodes: [
+        0,
+        100
+      ]

From c96a00d4f0eaaf7fdbccd7016e2009ce39868ef3 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Tue, 14 Apr 2026 12:42:41 -0400
Subject: [PATCH 22/36] Iterate through HKeys and nuke

---
 notepad-plusplus/config/clean.sls | 35 ++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/notepad-plusplus/config/clean.sls b/notepad-plusplus/config/clean.sls
index 4d903e8..639a82e 100644
--- a/notepad-plusplus/config/clean.sls
+++ b/notepad-plusplus/config/clean.sls
@@ -3,14 +3,35 @@
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
-{%- set sls_service_clean = tplroot ~ '.service.clean' %}
 {%- from tplroot ~ "/map.jinja" import mapdata as notepad_plusplus with context %}
+{%- set npp_admins = notepad_plusplus.config.npp_admins or ['Administrator'] %}
+{%- set npp_dir = 'C:\\Program Files\\Notepad++' %}
 
-include:
-  - {{ sls_service_clean }}
+{# Map descriptive IDs to their respective Registry paths #}
+{%- set npp_registry_map = {
+    'NPP Application Path': 'HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\notepad++.exe',
+    'NPP Context Menu Entry': 'HKEY_CLASSES_ROOT\\*\\shell\\Open with Notepad++',
+    'NPP MuiCache Entry': 'HKEY_CLASSES_ROOT\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\MuiCache',
+    'NPP OpenWithList txt': 'HKEY_CLASSES_ROOT\\.txt\\OpenWithList\\notepad++.exe',
+    'NPP System Notepad Replacement': 'HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Image File Execution Opt
+ions\\notepad.exe'
+  }
+%}
 
-notepad-plusplus-config-clean-file-absent:
+{%- for desc, reg_path in npp_registry_map.items() %}
+Remove {{ desc }}:
+  reg.absent:
+    - name: '{{ reg_path }}'
+{%- endfor %}
+
+{%- for admin in npp_admins %}
+Remove NPP AppData for {{ admin }}:
+  file.absent:
+    - name: 'C:\Users\{{ admin }}\AppData\Roaming\Notepad++'
+{%- endfor %}
+
+Remove NPP System Config Files:
   file.absent:
-    - name: {{ notepad_plusplus.config }}
-    - require:
-      - sls: {{ sls_service_clean }}
+    - names:
+      - '{{ npp_dir }}\updater\gup.xml'
+      - '{{ npp_dir }}\config.model.xml'

From 446c6f01718d3113f2c9fb3fc4cfba668f1717a8 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Tue, 14 Apr 2026 13:22:24 -0400
Subject: [PATCH 23/36] Localize templated README content

---
 README.md | 92 ++++++++++++++++++++++++-------------------------------
 1 file changed, 40 insertions(+), 52 deletions(-)

diff --git a/README.md b/README.md
index 5de6c40..be18d42 100644
--- a/README.md
+++ b/README.md
@@ -1,52 +1,40 @@
-# repo-template
-Generic repo template for Plus3IT repositories
-
-To use this template:
-
-1. Select the green "Use this template" button, or [click here](https://github.com/plus3it/repo-template/generate).
-2. Select the repo Owner, give the repo a name, enter a description, select Public or Private, and click "Create repository from template".
-3. Clone the repository and create a new branch.
-4. Configure the following settings on your new repo.
-    * `GENERAL`
-        * `Features`
-            * Turn off Wikis, Sponsorships, Discussions, and Projects
-        * `Pull Requests`
-            * Turn off Squash Merging
-            * Turn off Rebase Merging
-            * Turn on Allow Auto-Merge
-            * Turn on Automatically delete head branches
-        * `Pushes`
-            * Limit how many branches can be updated in a single push: 2
-    * `COLLABORATORS and TEAMS`
-        * `Manage Access`
-            * Add relevant team roles, for example
-            * `tardigrade-admins` (Admin)
-            * `terraform` (Write)
-            * `releasebot` (Write)
-    * `Branches`
-        * `Create Branch Protection rule` for `main`
-            * Turn on Require pull request before merging
-            * Turn on Require approvals
-            * Turn on Dismiss stale pull requests...
-        * `Required Status Checks`
-            * As relevant to projects, for example
-                * WIP
-                * lint/actionlint
-                * lint/tardigradelint
-                * test / mockstacktest                
-            * Turn on Do not allow bypassing the above settings
-5. Edit the following files to customize them for the new repository:
-    * `LICENSE`
-        * Near the end of the file, edit the date and change the repository name
-    * `CHANGELOG.template.md`
-        * Rename to `CHANGELOG.md`, replacing the repo-template changelog
-        * Edit templated items for the new repo
-    * `.bumpversion.cfg`
-        * Edit the version number for the new repo, ask team if not sure what to
-          start with
-    * `README.md`
-        * Replace contents for the new repo
-    * `.github/`
-        * Inspect dependabot and workflow files in case changes are needed for
-          the new repo
-6. Commit the changes and open a pull request
+# notepad-plusplus-formula
+
+A Saltstack formula designed to install and configure the [Notepad++](https://notepad-plus-plus.org/) text-editor (and to uninstall it later).
+
+It is primarily expected that this formula will be run via [P3](https://www.plus3it.com/)'s "[watchmaker](https://watchmaker.readthedocs.io/en/stable/)" framework.
+
+This formula is able to install and configure the Notepad++ text-editor on Windows-based systems. Linux functionality would also have been provided, but there's currently no Linux variant from the same makers.
+
+## Available states
+
+- [notepad-plusplus](#notepad-plusplus)
+- [notepad-plusplus.clean](#notepad-plusplus.clean)
+- [notepad-plusplus.package](#notepad-plusplus.package)
+- [notepad-plusplus.package.clean](#notepad-plusplus.package.clean)
+- [notepad-plusplus.config](#notepad-plusplus.config)
+- [notepad-plusplus.config.clean](#notepad-plusplus.config.clean)
+
+### notepad-plusplus
+
+Executes the `package` and `config` states to install and configure the Notepad++ editor. This includes the editor binaries, as well as some Windows Registry settings and user-configuration template files.
+
+### notepad-plusplus.clean
+
+Executes the `package` and `config` states' `clean` actions to fully uninstall the Notepad++ editor and associated registry entries
+
+### notepad-plusplus.package
+
+Executes _just_ the `package` state to install the Notepad++ package.
+
+### notepad-plusplus.package.clean
+
+Executes _just_ the `package` state's `clean` module to uninstall the Notepad++ binaries.
+
+### notepad-plusplus.config
+
+Executes _just_ the `config` state to install registry-keys and other configuration-items to support the healthy running of the Notepad++ application
+
+### notepad-plusplus.config.clean
+
+Executes _just_ the `config` state's `clean` module to uninstall the Notepad++ application's registry keys and other configuration-items set up during a prior, formula-managed installation.

From 0c1e921a883b6358cfbba3e21da548bf7d66c2c6 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Tue, 14 Apr 2026 13:57:04 -0400
Subject: [PATCH 24/36] Address tardigradelint findings

---
 notepad-plusplus/_mapdata/_mapdata.jinja      | 14 +++++++-------
 notepad-plusplus/files/npp_uninstall.ps1      |  4 ++--
 notepad-plusplus/libtofs.jinja                |  6 +++---
 notepad-plusplus/subcomponent/config/file.sls |  2 +-
 pillar.example                                | 16 ++++++++--------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/notepad-plusplus/_mapdata/_mapdata.jinja b/notepad-plusplus/_mapdata/_mapdata.jinja
index aa9649c..e356b07 100644
--- a/notepad-plusplus/_mapdata/_mapdata.jinja
+++ b/notepad-plusplus/_mapdata/_mapdata.jinja
@@ -3,11 +3,11 @@
 ---
 {#- use salt.slsutil.serialize to avoid encoding errors on some platforms #}
 {{ salt["slsutil.serialize"](
-     "yaml",
-     map,
-     default_flow_style=False,
-     allow_unicode=True,
-   )
-   | regex_replace("^\s+'$", "'", multiline=True)
-   | trim
+    "yaml",
+    map,
+    default_flow_style=False,
+    allow_unicode=True,
+  )
+  | regex_replace("^\s+'$", "'", multiline=True)
+  | trim
 }}
diff --git a/notepad-plusplus/files/npp_uninstall.ps1 b/notepad-plusplus/files/npp_uninstall.ps1
index b1dd731..5dea267 100644
--- a/notepad-plusplus/files/npp_uninstall.ps1
+++ b/notepad-plusplus/files/npp_uninstall.ps1
@@ -20,10 +20,10 @@ $Uninstaller = Join-Path $NppPath "uninstall.exe"
 if (Test-Path $Uninstaller) {
     Write-Output "Found uninstaller at '$Uninstaller'"
     Write-Output "Executing silent uninstallation..."
-    
+
     # Start the uninstaller with the /S (Silent) flag
     $Proc = Start-Process -FilePath "$Uninstaller" -ArgumentList "/S" -Wait -PassThru
-    
+
     # Optional: Wait briefly for file system hooks to release
     Start-Sleep -Seconds 2
 
diff --git a/notepad-plusplus/libtofs.jinja b/notepad-plusplus/libtofs.jinja
index f39fd42..193f4f3 100644
--- a/notepad-plusplus/libtofs.jinja
+++ b/notepad-plusplus/libtofs.jinja
@@ -26,9 +26,9 @@
         file.managed:
           - name: /etc/yyy/zzz.conf
           - source: {{ files_switch(
-                         ["/etc/yyy/zzz.conf", "/etc/yyy/zzz.conf.jinja"],
-                         lookup="Deploy configuration",
-                       ) }}
+                          ["/etc/yyy/zzz.conf", "/etc/yyy/zzz.conf.jinja"],
+                          lookup="Deploy configuration",
+                        ) }}
           - template: jinja
     In a minion with id=theminion and os_family=RedHat, it's going to be
     rendered as:
diff --git a/notepad-plusplus/subcomponent/config/file.sls b/notepad-plusplus/subcomponent/config/file.sls
index 99187d9..cb7f35e 100644
--- a/notepad-plusplus/subcomponent/config/file.sls
+++ b/notepad-plusplus/subcomponent/config/file.sls
@@ -16,7 +16,7 @@ notepad-plusplus-subcomponent-config-file-file-managed:
     - source: {{ files_switch(['subcomponent-example.tmpl'],
                               lookup='notepad-plusplus-subcomponent-config-file-file-managed',
                               use_subpath=True
-                 )
+                  )
               }}
     - mode: 644
     - user: root
diff --git a/pillar.example b/pillar.example
index 094b2d7..d7afe22 100644
--- a/pillar.example
+++ b/pillar.example
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 notepad-plusplus:
-  pkg:                 # Installation-package related settings
-    version: ''        # Target X.Y.Z version-number for installed Notepad++ application
-    installer_uri: ''  # URL to download from. Usually something like:
-                       # 'https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.8.8/npp.8.8.8.Installer.x64.exe'
+  pkg:                  # Installation-package related settings
+    version: ''         # Target X.Y.Z version-number for installed Notepad++ application
+    installer_uri: ''   # URL to download from. Usually something like:
+                        # 'https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.8.8/npp.8.8.8.Installer.x64.exe'
 
-  config:              # Configuration-related settings for the installed application
-    npp_admins:        # User accounts that have admin rights (list)
-      - Administrator  # Used for designating which users are allowed to be
-      - LocalAdmin     # nagged if the auto-update service is configured
+  config:               # Configuration-related settings for the installed application
+    npp_admins:         # User accounts that have admin rights (list)
+      - Administrator   # Used for designating which users are allowed to be
+      - LocalAdmin      # nagged if the auto-update service is configured
       - ...

From 01abcc6270e8c2d3b411b2180eafa94708c1b402 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Tue, 14 Apr 2026 14:04:13 -0400
Subject: [PATCH 25/36] Construct test-matrix for Windows envs

---
 .github/workflows/test.yml | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 25453c7..2771d9b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,4 +1,4 @@
-name: Run test jobs
+name: Run salt tests
 on:
   pull_request:
 
@@ -7,5 +7,19 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  test:
-    uses: plus3it/actions-workflows/.github/workflows/test.yml@ce3cef72cf4ac9605a29350d1d4387dfb86cd7a8
+  windows:
+    uses: plus3it/actions-workflows/.github/workflows/test-salt-windows.yml@4fc4c282b54628725e2fdccb5f0d348544ce2eac
+    strategy:
+      matrix:
+        os_version:
+          - windows-2019
+          - windows-2022
+          - windows-2025
+        salt_state:
+          - notepad-plusplus
+        salt_pillar_root:
+          - ./tests/pillar/test-main
+    with:
+      salt-os-version: ${{ matrix.os_version }}
+      salt-state: ${{ matrix.salt_state }}
+      salt-pillar-root: ${{ matrix.salt_pillar_root }}

From be66ea36367df6c279034f780300432bffa8ddb0 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Tue, 14 Apr 2026 14:42:08 -0400
Subject: [PATCH 26/36] Update Windows 'test' workflow commit-id

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2771d9b..7bf828c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ concurrency:
 
 jobs:
   windows:
-    uses: plus3it/actions-workflows/.github/workflows/test-salt-windows.yml@4fc4c282b54628725e2fdccb5f0d348544ce2eac
+    uses: plus3it/actions-workflows/.github/workflows/test-salt-windows.yml@00ff10246f901f01818db412fa99124dbed4a00c
     strategy:
       matrix:
         os_version:

From f225867943d99c24c3da6939319d9d2d2297e1fe Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Tue, 14 Apr 2026 15:10:15 -0400
Subject: [PATCH 27/36] Add config:npp_admins as an empty list

---
 notepad-plusplus/parameters/defaults.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/notepad-plusplus/parameters/defaults.yaml b/notepad-plusplus/parameters/defaults.yaml
index 8c5f8c8..5425a55 100644
--- a/notepad-plusplus/parameters/defaults.yaml
+++ b/notepad-plusplus/parameters/defaults.yaml
@@ -8,4 +8,6 @@ values:
     name: 'notepad++'
     installer_uri: ''
     version: ''
+  config:
+    npp_admins: []
 ...

From 6d5ae494f93098d51a979a815dabbe2955163fd8 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Tue, 14 Apr 2026 15:13:38 -0400
Subject: [PATCH 28/36] Define a default list of privileged users

---
 notepad-plusplus/parameters/os_family/Windows.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 notepad-plusplus/parameters/os_family/Windows.yaml

diff --git a/notepad-plusplus/parameters/os_family/Windows.yaml b/notepad-plusplus/parameters/os_family/Windows.yaml
new file mode 100644
index 0000000..6d9fc52
--- /dev/null
+++ b/notepad-plusplus/parameters/os_family/Windows.yaml
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set default values.
+---
+values:
+  pkg:
+    name: 'notepad++'
+  config:
+    npp_admins:
+      - Administrator
+...

From 6598af5057f2cfd065aad0b96867839109a113c0 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Tue, 14 Apr 2026 15:22:15 -0400
Subject: [PATCH 29/36] Add testing Pillar-content

---
 tests/pillar/test-notepad-plusplus/main.sls | 10 ++++++++++
 tests/requirements-el8.txt                  |  0
 tests/requirements.txt                      |  1 +
 3 files changed, 11 insertions(+)
 create mode 100644 tests/pillar/test-notepad-plusplus/main.sls
 create mode 100644 tests/requirements-el8.txt
 create mode 100644 tests/requirements.txt

diff --git a/tests/pillar/test-notepad-plusplus/main.sls b/tests/pillar/test-notepad-plusplus/main.sls
new file mode 100644
index 0000000..009389d
--- /dev/null
+++ b/tests/pillar/test-notepad-plusplus/main.sls
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+notepad-plusplus:
+  pkg:
+    installer_uri: 'https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.8.8/npp.8.8.8.Installer.x64.exe'
+    version: '8.8.8'
+  config:
+    npp_admins:
+      - Administrator
+      - LocalAdmin
diff --git a/tests/requirements-el8.txt b/tests/requirements-el8.txt
new file mode 100644
index 0000000..e69de29
diff --git a/tests/requirements.txt b/tests/requirements.txt
new file mode 100644
index 0000000..df96849
--- /dev/null
+++ b/tests/requirements.txt
@@ -0,0 +1 @@
+salt-minion

From 4f0208d2de75ed9bdeda38f3e4d09901c4e3b81b Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Tue, 14 Apr 2026 15:45:49 -0400
Subject: [PATCH 30/36] Moar repo-std actions

---
 .bumpversion.cfg |  2 +-
 CHANGELOG.md     | 31 ++++++++-----------------------
 LICENSE          |  2 +-
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 027e002..40343da 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.1
+current_version = 0.0.1
 commit = True
 message = Bumps version to {new_version}
 tag = False
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5caad15..0d55a7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,37 +4,22 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
-### [1.2.1] (https://github.com/plus3it/repo-template/releases/tag/1.2.1)
+### [0.0.1] (https://github.com/plus3it/repo-template/releases/tag/0.0.1)
 
-**Summary**:
-
-*   Updated README.md to include config settings for github
-*   Updated LICENSE copyright year
-
-### [1.2.0] (https://github.com/plus3it/repo-template/releases/tag/1.2.0)
+**Released**: 2026.04.14
 
 **Summary**:
 
-*   Updated SHA value for Github Actions Workflows
-*   Updated CHANGELOG.template.md file
-*   Added Master branch in release workflow logic to make migration to Github Actions more efficient
-
-### 1.1.0
-
-**Commit Delta**: N/A
-
-**Released**: 2023.01.27
-
-**Summary**:
+*   Adds all necessary, initial install and configuration content for the Notepad++ application to be installed and ready-to-run
+*   Adds all necessary "clean" content for the Notepad++ application to be fully removed (binaries, config-files and registry-settings
+*   Activates initial CI content from repo-template repository
 
-*   Updated workflow files to be consumable and reusable, and now points to actions-workflows repo
 
-### 1.0.0
 
-**Commit Delta**: N/A
+### [0.0.0] (https://github.com/plus3it/repo-template/releases/tag/0.0.0)
 
-**Released**: 2023.01.10
+**Released**: 2026.04.09
 
 **Summary**:
 
-*   Initial release of capability
+*   "Skeleton" content cloned from [repo-template](https://github.com/plus3it/repo-template) repository
diff --git a/LICENSE b/LICENSE
index c2f93d6..adad242 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2024 Maintainers of plus3it/repo-template
+   Copyright 2026 Maintainers of plus3it/repo-template
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

From 87e4595544ed79b0e3f1ad005221e03ec0b458b4 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Wed, 15 Apr 2026 13:37:37 -0400
Subject: [PATCH 31/36] Try to make more resilient

Especially when running from userData (EC2launch in AWS-based
deployments), Windows default security-settings may interfere. Try to
work around Windows' fuckery
---
 notepad-plusplus/files/npp_install.ps1 | 31 ++++++++++++++++++--------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/notepad-plusplus/files/npp_install.ps1 b/notepad-plusplus/files/npp_install.ps1
index 165fa4c..d94280c 100644
--- a/notepad-plusplus/files/npp_install.ps1
+++ b/notepad-plusplus/files/npp_install.ps1
@@ -1,11 +1,18 @@
 # Script to install Notepad++ while still keeping saltstack's output not
 # completely horrific
+#
+################################################################################
+
 # Force PowerShell to stop on errors so we can catch them and report to Salt
 $ErrorActionPreference = 'Stop'
 
 $target = $args[0]
 $tempExe = $args[1]
 
+# Normalize the exe-installer's path
+$tempExe = $tempExe -replace '/', '\'
+
+# Declare registry-keys to be modified
 $paths = @(
   "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Notepad++",
   "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Notepad++"
@@ -13,8 +20,7 @@ $paths = @(
 
 $installed = $false
 
-# Iterate our HKLM paths and determine if NPP is already installed and at
-# correct version
+# Do pre-installation Check of registry-keys
 foreach ($path in $paths) {
   if (Test-Path $path) {
     $val = (Get-ItemProperty $path).DisplayVersion
@@ -22,28 +28,35 @@ foreach ($path in $paths) {
   }
 }
 
-# Install if necessary
+# Execute the EXE-based installer
 if (-not $installed) {
   Write-Host "Version $target not found. Attempting to install from $tempExe..."
   try {
-    # If the file is a .sig or corrupted, this will now trigger the 'catch' block
-    Start-Process $tempExe -ArgumentList '/S' -Wait
+    # "remote" files may get marked as blocked. Bypass that nonsense
+    Unblock-File -Path $tempExe -ErrorAction SilentlyContinue
+
+    # Execute the EXE-installer
+    & $tempExe /S | Out-Null
+
+    # Capture the result of the installer
+    $exitCode = $LASTEXITCODE
+
+    # Give the Registry a few seconds to flush changes to disk
     Start-Sleep -Seconds 5
 
-    # Final verification: Check if the registry key now exists
+    # Make sure we did what we tried to do...
     $verified = $false
     foreach ($path in $paths) { if (Test-Path $path) { $verified = $true } }
 
     if ($verified) {
-        Write-Host "Installation successful."
+        Write-Host "Installation successful (Exit Code: $exitCode)."
         exit 0
     } else {
-        Write-Error "Installer finished but registry keys not found."
+        Write-Error "Installer finished (Exit Code: $exitCode) but registry keys not found."
         exit 1
     }
   } catch {
     Write-Error "Installation failed: $($_.Exception.Message)"
-    # Explicitly return 1 so Salt catches the failure
     exit 1
   }
 } else {

From f7df02f9c4478eadbd2e5c4030eabb1510e92c10 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Wed, 15 Apr 2026 14:50:05 -0400
Subject: [PATCH 32/36] Use trim() method to clip off extraneous single-quotes

---
 notepad-plusplus/files/npp_install.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/notepad-plusplus/files/npp_install.ps1 b/notepad-plusplus/files/npp_install.ps1
index d94280c..f052c50 100644
--- a/notepad-plusplus/files/npp_install.ps1
+++ b/notepad-plusplus/files/npp_install.ps1
@@ -6,8 +6,8 @@
 # Force PowerShell to stop on errors so we can catch them and report to Salt
 $ErrorActionPreference = 'Stop'
 
-$target = $args[0]
-$tempExe = $args[1]
+$target = $args[0].Trim("'")
+$tempExe = $args[1].Trim("'")
 
 # Normalize the exe-installer's path
 $tempExe = $tempExe -replace '/', '\'

From 0e82c7534f38121ffd1e3023ab146c88812db3e1 Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Thu, 16 Apr 2026 09:54:18 -0400
Subject: [PATCH 33/36] Add PS-linting to CI tests

---
 .github/workflows/test.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7bf828c..0d42304 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,3 +23,38 @@ jobs:
       salt-os-version: ${{ matrix.os_version }}
       salt-state: ${{ matrix.salt_state }}
       salt-pillar-root: ${{ matrix.salt_pillar_root }}
+
+  lint_powershell:
+    name: PowerShell Linting
+    runs-on: windows-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Run PSScriptAnalyzer
+        shell: pwsh
+        run: |
+          $files = Get-ChildItem -Path ./ -Include *.ps1 -Recurse
+          Write-Host "--- Starting PowerShell Static Analysis ---"
+
+          $anyErrors = $false
+
+          foreach ($file in $files) {
+              $relativePath = $file.FullName.Replace($PWD.ProviderPath, ".")
+              $results = Invoke-ScriptAnalyzer -Path $file.FullName -Severity Warning
+
+              if ($results) {
+                  Write-Host "FAIL: $relativePath" -ForegroundColor Red
+                  $results | Format-Table -AutoSize
+                  $anyErrors = $true
+              } else {
+                  Write-Host "PASS: $relativePath" -ForegroundColor Green
+              }
+          }
+
+          if ($anyErrors) {
+              Write-Error "Static analysis failed. Please fix the errors above."
+              exit 1
+          } else {
+              Write-Host "--- All files passed analysis! ---"
+          }

From 3c7189edf2e87f25c4ab79c6eda19b443942ae1c Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Thu, 16 Apr 2026 09:55:05 -0400
Subject: [PATCH 34/36] Fix fouls IDed by PS-linting CI tests

---
 notepad-plusplus/files/npp_install.ps1   |  6 +++---
 notepad-plusplus/files/npp_uninstall.ps1 | 12 +++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/notepad-plusplus/files/npp_install.ps1 b/notepad-plusplus/files/npp_install.ps1
index f052c50..4dbcb16 100644
--- a/notepad-plusplus/files/npp_install.ps1
+++ b/notepad-plusplus/files/npp_install.ps1
@@ -30,7 +30,7 @@ foreach ($path in $paths) {
 
 # Execute the EXE-based installer
 if (-not $installed) {
-  Write-Host "Version $target not found. Attempting to install from $tempExe..."
+  Write-Output "Version $target not found. Attempting to install from $tempExe..."
   try {
     # "remote" files may get marked as blocked. Bypass that nonsense
     Unblock-File -Path $tempExe -ErrorAction SilentlyContinue
@@ -49,7 +49,7 @@ if (-not $installed) {
     foreach ($path in $paths) { if (Test-Path $path) { $verified = $true } }
 
     if ($verified) {
-        Write-Host "Installation successful (Exit Code: $exitCode)."
+        Write-Output "Installation successful (Exit Code: $exitCode)."
         exit 0
     } else {
         Write-Error "Installer finished (Exit Code: $exitCode) but registry keys not found."
@@ -60,6 +60,6 @@ if (-not $installed) {
     exit 1
   }
 } else {
-  Write-Host "Notepad++ $target already installed. Skipping."
+  Write-Output "Notepad++ $target already installed. Skipping."
   exit 0
 }
diff --git a/notepad-plusplus/files/npp_uninstall.ps1 b/notepad-plusplus/files/npp_uninstall.ps1
index 5dea267..1c40d89 100644
--- a/notepad-plusplus/files/npp_uninstall.ps1
+++ b/notepad-plusplus/files/npp_uninstall.ps1
@@ -21,16 +21,22 @@ if (Test-Path $Uninstaller) {
     Write-Output "Found uninstaller at '$Uninstaller'"
     Write-Output "Executing silent uninstallation..."
 
-    # Start the uninstaller with the /S (Silent) flag
+    # Start the uninstaller and capture the process object
     $Proc = Start-Process -FilePath "$Uninstaller" -ArgumentList "/S" -Wait -PassThru
 
+    # Use the variable to provide meaningful output and logic
+    Write-Output "Uninstaller exited with code: $($Proc.ExitCode)"
+
     # Optional: Wait briefly for file system hooks to release
     Start-Sleep -Seconds 2
 
-    # FINAL VERIFICATION
-    if (-not (Test-Path $NppExe)) {
+    # FINAL VERIFICATION: Check both the file system AND the exit code
+    if (-not (Test-Path $NppExe) -and $Proc.ExitCode -eq 0) {
         Write-Output "State: Success"
         exit 0
+    } elseif ($Proc.ExitCode -ne 0) {
+        Write-Error "State: Failed. Uninstaller returned non-zero exit code ($($Proc.ExitCode))"
+        exit 1
     } else {
         Write-Error "State: Failed to remove binary"
         exit 1

From ef210af2a7c341463a4e30a93af5f88d4c71dd5f Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Mon, 20 Apr 2026 13:12:24 -0400
Subject: [PATCH 35/36] Dump-out if not Windows

This is probably redundant, but we're gonna be a bit pedantic, here,
and do an explicit dump-out, regardless
---
 notepad-plusplus/clean.sls | 12 ++++++++++++
 notepad-plusplus/init.sls  | 11 +++++++++++
 2 files changed, 23 insertions(+)

diff --git a/notepad-plusplus/clean.sls b/notepad-plusplus/clean.sls
index 0fba65d..477c179 100644
--- a/notepad-plusplus/clean.sls
+++ b/notepad-plusplus/clean.sls
@@ -1,6 +1,18 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
+{%- if grains.os_family == "Windows" %}
 include:
   - .config.clean
   - .package.clean
+{%- else %}
+Invalid Platform
+  test.show_notification:
+    - text: |
+        ----------------------------------------
+        The notepad++ application is not
+        published for non-Windows platform.
+        Skipping all further actions.
+        ----------------------------------------
+{%- endif %}
+
diff --git a/notepad-plusplus/init.sls b/notepad-plusplus/init.sls
index 717b68e..4029724 100644
--- a/notepad-plusplus/init.sls
+++ b/notepad-plusplus/init.sls
@@ -1,6 +1,17 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
+{%- if grains.os_family == "Windows" %}
 include:
   - .package
   - .config
+{%- else %}
+Invalid Platform
+  test.show_notification:
+    - text: |
+        ----------------------------------------
+        The notepad++ application is not
+        published for non-Windows platform.
+        Skipping all further actions.
+        ----------------------------------------
+{%- endif %}

From 696d2b178f1354c322b080ce2f86fa0cf44be13a Mon Sep 17 00:00:00 2001
From: Thomas H Jones II <github@xanthia.com>
Date: Mon, 20 Apr 2026 13:13:28 -0400
Subject: [PATCH 36/36] Shoulda nuked this, already

---
 CHANGELOG.template.md | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 CHANGELOG.template.md

diff --git a/CHANGELOG.template.md b/CHANGELOG.template.md
deleted file mode 100644
index c61f573..0000000
--- a/CHANGELOG.template.md
+++ /dev/null
@@ -1,13 +0,0 @@
-## {{ repo-name }}
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
-
-### [{{Major.Minor.Patch}}](https://github.com/plus3it/{{RepoName}}/releases/tag/{{Major.Minor.Patch}})
-
-**Released**: {{ YYYY.MM.DD }}
-
-**Summary**:
-
-*   {{ Bulleted descriptions of enhancements, changes, or fixes }}