zaphyra's git: nixfiles

zaphyra and void's nixfiles

commit e015a162476628782bcb7919e5c66929a4ce41e9
parent 4a2d711140682559a17ffb8a288911804881e177
Author: Hannah Izzie Gesser <hannah@totient.eu>
Date: Mon, 9 Jun 2025 21:48:54 +0200

Add common hm config

Add common hm config

Add common hm config
12 files changed, 374 insertions(+), 217 deletions(-)
A
config/home/common/home.nix
|
10
++++++++++
A
config/home/common/programs/gpg.nix
|
47
+++++++++++++++++++++++++++++++++++++++++++++++
A
config/home/common/programs/ssh.nix
|
23
+++++++++++++++++++++++
A
config/home/common/programs/starship.nix
|
164
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M
config/home/zaphyra/home.nix
|
14
+++++---------
M
config/home/zaphyra/programs/gpg.nix
|
48
++----------------------------------------------
D
config/home/zaphyra/programs/starship.nix
|
161
-------------------------------------------------------------------------------
M
flake.nix
|
10
+++++++++-
A
resources/pgp/2C754046341AB6A0C3F0EF6F23100DF8D68F4FA6.asc
|
0
A
resources/pgp/321EFA52CF155E9FD646279E0FB0CA11985EB5F6.asc
|
52
++++++++++++++++++++++++++++++++++++++++++++++++++++
A
resources/pgp/A9D363EA211BA9CB03D1B773AA59E255A3896073.asc
|
23
+++++++++++++++++++++++
A
resources/pgp/AB27F5D1136B20D3149FBCC00389451731A3ADDD.asc
|
39
+++++++++++++++++++++++++++++++++++++++
diff --git a/config/home/common/home.nix b/config/home/common/home.nix
@@ -0,0 +1,10 @@
+{
+  lib,
+  ...
+}:
+
+{
+
+  home.stateVersion = lib.mkDefault "25.05";
+
+}
diff --git a/config/home/common/programs/gpg.nix b/config/home/common/programs/gpg.nix
@@ -0,0 +1,47 @@
+{
+  inputs,
+  pkgs,
+  ...
+}:
+
+{
+  config = {
+    programs.gpg = {
+      publicKeys = [
+        {
+          # emilyyy@jagudev.net
+          source = inputs.self.resources.pgp."A9D363EA211BA9CB03D1B773AA59E255A3896073";
+        }
+        {
+          # hannah@totient.eu
+          source = inputs.self.resources.pgp."AB27F5D1136B20D3149FBCC00389451731A3ADDD";
+          trust = 4;
+        }
+        {
+          #izzie@haaien.xyz
+          source = inputs.self.resources.pgp."321EFA52CF155E9FD646279E0FB0CA11985EB5F6";
+          trust = 4;
+        }
+        {
+          # katja@ctu.cx
+          source = "${pkgs.zaphyra-website}/gpg_pubkey.asc";
+          trust = 4;
+        }
+        {
+          # kontakt@governikus.com
+          source = (
+            pkgs.fetchurl {
+              url = "https://www.governikus.de/wp-content/uploads/2023/06/governikusPubKey.asc";
+              sha256 = "sha256-eU7g+c2CAYGLxHCRb0qsnL3CvKgK3lWcKcgrS1WFwz0=";
+            }
+          );
+          trust = 3;
+        }
+        {
+          # lmv@lmv.me
+          source = inputs.self.resources.pgp."2C754046341AB6A0C3F0EF6F23100DF8D68F4FA6";
+        }
+      ];
+    };
+  };
+}
diff --git a/config/home/common/programs/ssh.nix b/config/home/common/programs/ssh.nix
@@ -0,0 +1,23 @@
+{
+
+  config = {
+    programs.ssh.matchBlocks =
+      let
+        chaosHost = hostname: {
+          hostname = "${hostname}.cccda.de";
+          user = "chaos";
+          extraOptions = {
+            RemoteCommand = "nix run nixpkgs#fish -- -l";
+            RequestTTY = "yes";
+          };
+        };
+      in
+      {
+        chaos-kitchen = chaosHost "kitchen";
+        chaos-burbon = chaosHost "burbon";
+        chaos-lounge = chaosHost "lounge";
+        chaos-workshop = chaosHost "workshop";
+      };
+  };
+
+}
diff --git a/config/home/common/programs/starship.nix b/config/home/common/programs/starship.nix
@@ -0,0 +1,164 @@
+{
+  lib,
+  ...
+}:
+
+{
+
+  config = {
+    programs.starship = {
+      enable = true;
+
+      settings =
+        let
+          lang = symbol: style: format: { inherit symbol style format; };
+
+        in
+        {
+          format = lib.concatStrings [
+            "[](color_orange)"
+            "$os"
+            "$username"
+            "[](bg:color_yellow fg:color_orange)"
+            "$directory"
+            "[](fg:color_yellow bg:color_aqua)"
+            "$git_branch"
+            "$git_status"
+            "[](fg:color_aqua bg:color_blue)"
+            "$c"
+            "$rust"
+            "$golang"
+            "$nodejs"
+            "$php"
+            "$java"
+            "$kotlin"
+            "$haskell"
+            "$python"
+            "[](fg:color_blue bg:color_bg3)"
+            "$docker_context"
+            "$conda"
+            "[](fg:color_bg3 bg:color_bg1)"
+            "$time"
+            "[ ](fg:color_bg1)"
+            "$line_break$character"
+          ];
+
+          add_newline = false;
+
+          palette = "gruvbox_dark";
+
+          palettes.gruvbox_dark = {
+            color_fg0 = "#fbf1c7";
+            color_bg1 = "#3c3836";
+            color_bg3 = "#665c54";
+            color_blue = "#458588";
+            color_aqua = "#689d6a";
+            color_green = "#98971a";
+            color_orange = "#d65d0e";
+            color_purple = "#b16286";
+            color_red = "#cc241d";
+            color_yellow = "#d79921";
+          };
+
+          os = {
+            disabled = false;
+            style = "bg:color_orange fg:color_fg0";
+
+            symbols = {
+              Windows = "󰍲";
+              Ubuntu = "󰕈";
+              SUSE = "";
+              Raspbian = "󰐿";
+              Mint = "󰣭";
+              Macos = "󰀵";
+              Manjaro = "";
+              Linux = "󰌽";
+              Gentoo = "󰣨";
+              Fedora = "󰣛";
+              Alpine = "";
+              Amazon = "";
+              Android = "";
+              Arch = "󰣇";
+              Artix = "󰣇";
+              CentOS = "";
+              Debian = "󰣚";
+              Redhat = "󱄛";
+              RedHatEnterprise = "󱄛";
+            };
+          };
+
+          username = {
+            show_always = true;
+            style_user = "bg:color_orange fg:color_fg0";
+            style_root = "bg:color_orange fg:color_fg0";
+            format = "[ $user ]($style)";
+          };
+
+          directory = {
+            style = "fg:color_fg0 bg:color_yellow";
+            format = "[ $path ]($style)";
+            truncation_length = 3;
+            truncation_symbol = "…/";
+
+            substitutions = {
+              "Documents" = "󰈙 ";
+              "Downloads" = " ";
+              "Music" = "󰝚 ";
+              "Pictures" = " ";
+              "Developer" = "󰲋 ";
+            };
+          };
+
+          line_break.disabled = false;
+          status.disabled = false;
+
+          git_branch = {
+            symbol = "";
+            style = "bg:color_aqua";
+            format = "[[ $symbol $branch ](fg:color_fg0 bg:color_aqua)]($style)";
+          };
+
+          git_status = {
+            style = "bg:color_aqua";
+            format = "[[($all_status$ahead_behind )](fg:color_fg0 bg:color_aqua)]($style)";
+          };
+
+          conda = {
+            style = "bg:color_bg3";
+            format = "[[ $symbol( $environment) ](fg:#83a598 bg:color_bg3)]($style)";
+          };
+
+          time = {
+            disabled = false;
+            time_format = "%R";
+            style = "bg:color_bg1";
+            format = "[[  $time ](fg:color_fg0 bg:color_bg1)]($style)";
+          };
+
+          character = {
+            disabled = false;
+            success_symbol = "[](bold fg:color_green)";
+            error_symbol = "[](bold fg:color_red)";
+            vimcmd_symbol = "[](bold fg:color_green)";
+            vimcmd_replace_one_symbol = "[](bold fg:color_purple)";
+            vimcmd_replace_symbol = "[](bold fg:color_purple)";
+            vimcmd_visual_symbol = "[](bold fg:color_yellow)";
+          };
+
+          nodejs = lang "" "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
+          c = lang " " "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
+          rust = lang "" "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
+          golang = lang "" "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
+          php = lang "" "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
+          java = lang " " "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
+          kotlin = lang "" "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
+          haskell = lang "" "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
+          python = lang "" "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
+          docker_context =
+            lang "" "bg:color_bg3"
+              "[[ $symbol( $context) ](fg:#83a598 bg:color_bg3)]($style)";
+        };
+    };
+  };
+
+}
diff --git a/config/home/zaphyra/home.nix b/config/home/zaphyra/home.nix
@@ -1,17 +1,13 @@
-{ lib, homeManagerModules, ... }:
-
 {
+  homeManagerModules,
+  ...
+}:
 
-  home = {
-    username = "zaphyra";
-    homeDirectory = "/home/zaphyra";
-
-    stateVersion = lib.mkDefault "24.11";
-  };
+{
 
   imports = with homeManagerModules.zaphyra; [
+    homeManagerModules.common.programs.starship
     programs.fish
-    programs.starship
     programs.mcfly
     programs.zoxide
     programs.eza
diff --git a/config/home/zaphyra/programs/gpg.nix b/config/home/zaphyra/programs/gpg.nix
@@ -1,7 +1,7 @@
 {
-  config,
-  pkgs,
+  inputs,
   lib,
+  pkgs,
   ...
 }:
 

@@ -49,51 +49,7 @@
       enable = true;
       mutableTrust = true;
       mutableKeys = true;
-
-      publicKeys = [
-        # my own key
-        {
-          trust = 5;
-          source = "${pkgs.zaphyra-website}/gpg_pubkey.asc";
-        }
-
-        #izzie@haaien.xyz
-        {
-          trust = 4;
-          source = (
-            pkgs.fetchurl {
-              url = "https://openpgpkey.haaien.xyz/.well-known/openpgpkey/haaien.xyz/hu/jp96shm14rsikewmfdxqyznfr8dpihzu";
-              sha256 = "sha256-D5Y8pxxrqxHTAaoxqehwY5VXvnKkKPp+H3IFZuuwJ8U=";
-            }
-          );
-        }
-
-        #hannah@totient.eu
-        {
-          trust = 4;
-          source = (
-            pkgs.fetchurl {
-              url = "https://keys.openpgp.org/vks/v1/by-fingerprint/AB27F5D1136B20D3149FBCC00389451731A3ADDD";
-              sha256 = "sha256-BjRl0VWET4hmp4VoW3y1hUuin3hcUlyJf+584cFzMdU=";
-            }
-          );
-        }
-
-        # governikus german eid verificaion pubkey
-        {
-          trust = 3;
-          source = (
-            pkgs.fetchurl {
-              url = "https://www.governikus.de/wp-content/uploads/2023/06/governikusPubKey.asc";
-              sha256 = "sha256-eU7g+c2CAYGLxHCRb0qsnL3CvKgK3lWcKcgrS1WFwz0=";
-            }
-          );
-        }
-
-      ];
-
       settings.keyserver = "hkps://keyserver.ubuntu.com:443";
-
       scdaemonSettings.disable-ccid = true;
     };
 
diff --git a/config/home/zaphyra/programs/starship.nix b/config/home/zaphyra/programs/starship.nix
@@ -1,161 +0,0 @@
-{ lib, ... }:
-
-{
-
-  programs.starship = {
-    enable = true;
-    enableFishIntegration = true;
-    enableZshIntegration = true;
-
-    settings =
-      let
-        lang = symbol: style: format: { inherit symbol style format; };
-
-      in
-      {
-        format = lib.concatStrings [
-          "[](color_orange)"
-          "$os"
-          "$username"
-          "[](bg:color_yellow fg:color_orange)"
-          "$directory"
-          "[](fg:color_yellow bg:color_aqua)"
-          "$git_branch"
-          "$git_status"
-          "[](fg:color_aqua bg:color_blue)"
-          "$c"
-          "$rust"
-          "$golang"
-          "$nodejs"
-          "$php"
-          "$java"
-          "$kotlin"
-          "$haskell"
-          "$python"
-          "[](fg:color_blue bg:color_bg3)"
-          "$docker_context"
-          "$conda"
-          "[](fg:color_bg3 bg:color_bg1)"
-          "$time"
-          "[ ](fg:color_bg1)"
-          "$line_break$character"
-        ];
-
-        add_newline = false;
-
-        palette = "gruvbox_dark";
-
-        palettes.gruvbox_dark = {
-          color_fg0 = "#fbf1c7";
-          color_bg1 = "#3c3836";
-          color_bg3 = "#665c54";
-          color_blue = "#458588";
-          color_aqua = "#689d6a";
-          color_green = "#98971a";
-          color_orange = "#d65d0e";
-          color_purple = "#b16286";
-          color_red = "#cc241d";
-          color_yellow = "#d79921";
-        };
-
-        os = {
-          disabled = false;
-          style = "bg:color_orange fg:color_fg0";
-
-          symbols = {
-            Windows = "󰍲";
-            Ubuntu = "󰕈";
-            SUSE = "";
-            Raspbian = "󰐿";
-            Mint = "󰣭";
-            Macos = "󰀵";
-            Manjaro = "";
-            Linux = "󰌽";
-            Gentoo = "󰣨";
-            Fedora = "󰣛";
-            Alpine = "";
-            Amazon = "";
-            Android = "";
-            Arch = "󰣇";
-            Artix = "󰣇";
-            CentOS = "";
-            Debian = "󰣚";
-            Redhat = "󱄛";
-            RedHatEnterprise = "󱄛";
-          };
-        };
-
-        username = {
-          show_always = true;
-          style_user = "bg:color_orange fg:color_fg0";
-          style_root = "bg:color_orange fg:color_fg0";
-          format = "[ $user ]($style)";
-        };
-
-        directory = {
-          style = "fg:color_fg0 bg:color_yellow";
-          format = "[ $path ]($style)";
-          truncation_length = 3;
-          truncation_symbol = "…/";
-
-          substitutions = {
-            "Documents" = "󰈙 ";
-            "Downloads" = " ";
-            "Music" = "󰝚 ";
-            "Pictures" = " ";
-            "Developer" = "󰲋 ";
-          };
-        };
-
-        line_break.disabled = false;
-        status.disabled = false;
-
-        git_branch = {
-          symbol = "";
-          style = "bg:color_aqua";
-          format = "[[ $symbol $branch ](fg:color_fg0 bg:color_aqua)]($style)";
-        };
-
-        git_status = {
-          style = "bg:color_aqua";
-          format = "[[($all_status$ahead_behind )](fg:color_fg0 bg:color_aqua)]($style)";
-        };
-
-        conda = {
-          style = "bg:color_bg3";
-          format = "[[ $symbol( $environment) ](fg:#83a598 bg:color_bg3)]($style)";
-        };
-
-        time = {
-          disabled = false;
-          time_format = "%R";
-          style = "bg:color_bg1";
-          format = "[[  $time ](fg:color_fg0 bg:color_bg1)]($style)";
-        };
-
-        character = {
-          disabled = false;
-          success_symbol = "[](bold fg:color_green)";
-          error_symbol = "[](bold fg:color_red)";
-          vimcmd_symbol = "[](bold fg:color_green)";
-          vimcmd_replace_one_symbol = "[](bold fg:color_purple)";
-          vimcmd_replace_symbol = "[](bold fg:color_purple)";
-          vimcmd_visual_symbol = "[](bold fg:color_yellow)";
-        };
-
-        nodejs = lang "" "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
-        c = lang " " "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
-        rust = lang "" "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
-        golang = lang "" "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
-        php = lang "" "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
-        java = lang " " "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
-        kotlin = lang "" "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
-        haskell = lang "" "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
-        python = lang "" "bg:color_blue" "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)";
-        docker_context =
-          lang "" "bg:color_bg3"
-            "[[ $symbol( $context) ](fg:#83a598 bg:color_bg3)]($style)";
-      };
-  };
-
-}
diff --git a/flake.nix b/flake.nix
@@ -143,6 +143,14 @@
 
               modules = [
                 inputs.self.homeManagerModules."${name}".home
+                inputs.self.homeManagerModules.common.home
+                {
+                  home = {
+                    username = nixpkgsLib.mkDefault name;
+                    homeDirectory = nixpkgsLib.mkDefault "/home/${name}";
+                  };
+                  programs.home-manager.enable = true;
+                }
               ];
 
               extraSpecialArgs = {

@@ -151,7 +159,7 @@
               };
             }
           ))
-        ) (nixpkgsLib.attrNames inputs.self.homeManagerModules)
+        ) (inputs.self.homeManagerModules |> nixpkgsLib.attrNames |> nixpkgsLib.remove "common")
       );
 
       hydraJobs = builtins.listToAttrs (
diff --git a/resources/pgp/2C754046341AB6A0C3F0EF6F23100DF8D68F4FA6.asc b/resources/pgp/2C754046341AB6A0C3F0EF6F23100DF8D68F4FA6.asc  Binary files differ.
diff --git a/resources/pgp/321EFA52CF155E9FD646279E0FB0CA11985EB5F6.asc b/resources/pgp/321EFA52CF155E9FD646279E0FB0CA11985EB5F6.asc
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZZIAgBYJKwYBBAHaRw8BAQdAVWb9Wd3eg4JxJO0GHDADfY3BaGYkDXNOQ4dK
+H2J+OJ+0Jkl6emllIHZhbiBkZSBIYWFpZW4gPGl6emllQGhhYWllbi54eXo+iQJs
+BBMWCgIUAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4FAheABQkDxGFAMBSAAAAAABAA
+F3Byb29mQGFyaWFkbmUuaWRkbnM6dG90aWVudC5ldT90eXBlPVRYVDUUgAAAAAAQ
+ABxwcm9vZkBhcmlhZG5lLmlkZG5zOm5ldmVyc3RhYmxlLm5ldD90eXBlPVRYVDAU
+gAAAAAAQABdwcm9vZkBhcmlhZG5lLmlkZG5zOmhhYWllbi54eXo/dHlwZT1UWFQ2
+FIAAAAAAEAAdcHJvb2ZAYXJpYWRuZS5pZGh0dHBzOi8vdHJhbnNnaXJsLmNhZmUv
+QGl6emllNBSAAAAAABAAG3Byb29mQGFyaWFkbmUuaWRkbnM6dHJhbnNnaXJsLmNh
+ZmU/dHlwZT1UWFSeFIAAAAAAEACFcHJvb2ZAYXJpYWRuZS5pZG1hdHJpeDp1L2l6
+emllOnRyYW5zZ2lybC5jYWZlP29yZy5rZXlveGlkZS5yPWRCZlFaeENvR1ZtU1R1
+amZpdjptYXRyaXgub3JnJm9yZy5rZXlveGlkZS5lPUVGLUx1MXNxVS04cVBqVFhN
+TVltTWo3WXhScjl3eFlnUUhsaTN1WHAzc1UyFIAAAAAAEAAZcHJvb2ZAYXJpYWRu
+ZS5pZGRuczpldWthcnlvdGUuZXU/dHlwZT1UWFQWIQQyHvpSzxVen9ZGJ54PsMoR
+mF619gUCaDrlEgAKCRAPsMoRmF619pwhAP9jeKZMLvPNJGgh+jdGxCA5MFx6/pCY
+hOn56weDnf0ttwEArQ9pesZ18Mryzv5RN978MuKhQKDYgKHg2uHuRGSD1QSIeQQT
+FgoAIRYhBCx1QEY0Gragw/DvbyMQDfjWj0+mBQJnw1uTAwUBeAAKCRAjEA341o9P
+poQ3AQD9YfGV9KBVC2ATy2dnFVmLclXQ5Hq2rygH1J6VOLD3fwD+MW7mwXdQhjTo
+cAuqsCzycIFfpF/fktkZJbUug1pc5wuIeQQTFgoAIRYhBKnTY+ohG6nLA9G3c6pZ
+4lWjiWBzBQJnAwIVAwUBeAAKCRCqWeJVo4lgc/KpAP9tkKKqTGCjH2gP/pu9bTrY
+xIToUMumKUFYYqzQWL+o5QD+KKTeyGh/TT6iMxnRpBlhZ4whlazY3wrDteMuCI8i
+2Q6IdQQQFgoAHRYhBJnDA6W0eb+czy9kOM7HZhYMuKZFBQJlyvJPAAoJEM7HZhYM
+uKZFcKUA/iIcWZLCWteQ/YVq9IQzpgHaevL7Bw7eg6x8YyFYxTknAP95eZkcl+4k
+KYQkOvQJ5qdLc4hUdm5kJodVBrPQsC0eBYkCMwQTAQgAHRYhBFn0bbhQykR/Njcd
+7RRUYiHjWV0MBQJlyvnKAAoJEBRUYiHjWV0M8MUQALxQ74HTHfp05xVe+rnpamwy
+Yt/sLiJjOI3z4MMl4+XBFju4MJYIcvg8JHcW+JSVhWEeHehk0wuTYZrXUzolol8N
+x1Kj5Ay4+ApmhHhPBYo/rzETZDzBAvasbxS+iRbgzuW/RaxqNiVE2SrXxWw19Fo7
+kRcr1e/9Wh+doqZgjR9oWRhmqNEflJT8fkLu4FEkswN9V+yYltAo3jcro4HbuHZl
+5wxfko+zzP2lCO9/KTVUEcH03ori0ICLKPuPCVYFk7Y+7AYUDAiKRN6T3MidDAoK
+J7joqCgJs9rLh1VJ0GSUOrHeoBZPtnYxi/D2sZ8sC7Ebm5q4ytgOWaXQ5aOoJaok
+/Y34WI5xNlq+HLee8UMncM9w9td3CfQVJZMlxM6YDc+0jNHZWr8C6VtbQ3Tft5uu
+upB+NoPB8bT3gaXfF4hkjZcxWrUiiaS7L/SVjfv2UWTpWArKrIerKlj2ztPdOC7V
+cdtwZK5PzOr2jf6VFKwSBHdBZQXpsV/Wv9Px2cJztQV6bnWS+YzvhUjJ1bGppxgr
+zTOMFFIMsxauYPjmyUn09Wd3doPOOhDwpkrJdDe69mVAMB8WEJbkeZYaoj3wwXt/
+L0PkSVCxWCPaqYgEeO5dfQvDaIudW97qKpmZ1F4YRsTUjYCj9zsIIYLznuFSTpkC
+jwvCeBaxAFOrq9d6fQGYiHUEEBYKAB0WIQQtU8/qGrQBe7Mnr+MQpGzDFS1JxQUC
+ZiVakwAKCRAQpGzDFS1JxVHdAQCwbCD5ownKzdFdMWnhvD6D3wGvLJGLSFwXkd0/
+pAfIWgEA7WuSDGVfOa5C+Thvs6GUKbO21jUIeAqEv07RKEhlZgqIlgQTFggAPhYh
+BDIe+lLPFV6f1kYnng+wyhGYXrX2BQJlkgCAAhsDBQkB4y3ABQsJCAcDBRUKCQgL
+BRYCAwEAAh4FAheAAAoJEA+wyhGYXrX2EoEA+QFPODMJN/fNyeeWJW7QTuaYDgG+
+FulX6zvlyEH6f+tzAP43UD2qGyxvHSdU6d86gSoeqQoxCfB7kRP9sQCObXjpCrgz
+BGWSAIAWCSsGAQQB2kcPAQEHQPnNyOCX+PopTHuNrfBwEmPM7FC6oM7nFgW/2tvW
+7ddTiH4EGBYIACYCGyAWIQQyHvpSzxVen9ZGJ54PsMoRmF619gUCZ3SFgAUJA8Rh
+QAAKCRAPsMoRmF619pYqAP9IwD3zncfMHFCyedwxNqzX3Q5eUj9nU3KgFzBC/tkY
+5gD8CFIquZY8FmATxL+Con4i/6JIqX00Fo49u2KgwQGZBg+4OARlkgCAEgorBgEE
+AZdVAQUBAQdAP/k6w669B/Tj0FDvxGoP568i+gaENFsQa7C4BenU7C4DAQgHiH4E
+GBYIACYCGwwWIQQyHvpSzxVen9ZGJ54PsMoRmF619gUCZ3SFgAUJA8RhQAAKCRAP
+sMoRmF619q1bAPwJVpSbK77Kvc6Im7khYW8zd9tTiBETisraGV6T77NCTQEAoBT7
+Jv7Xc6QGKuI3LRGqlQIdkdPaTrB5baYepVA0OgI=
+=Bf2R
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/resources/pgp/A9D363EA211BA9CB03D1B773AA59E255A3896073.asc b/resources/pgp/A9D363EA211BA9CB03D1B773AA59E255A3896073.asc
@@ -0,0 +1,23 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZwKmERYJKwYBBAHaRw8BAQdA47IzcTkQI+Vi2UPkB0xz3yklKjEI3+EBuIEi
+/r+yRse0LmVtaWx5IG9ueXggcmVpYSBpc2hpa2F3YSA8ZW1pbHl5eUBqYWd1ZGV2
+Lm5ldD6ImQQTFgoAQRYhBKnTY+ohG6nLA9G3c6pZ4lWjiWBzBQJnAqYRAhsDBQkB
+4TOABQsJCAcCAiICBhUKCQgLAgQWAgMBAh4HAheAAAoJEKpZ4lWjiWBziT0A/iyd
+6CkFxMj1+iTIBOR9m4YpFeIHVo4tNez4KYpDEb9FAPkBEaj9I2zfN3klTIbSjWxG
+XCoGLXPTO82EiYy0TFCQDIh5BBMWCgAhFiEEMh76Us8VXp/WRieeD7DKEZhetfYF
+AmcC7PMDBQF4AAoJEA+wyhGYXrX2Sz4BAKUEcjMH2p6fMiWcwHVmVGQVjp87q1V6
+flQdWxeGbjokAP4875jxyUs22u+nYfBU5QHrmKGqYAru9Mpk9XmwbREPDYh5BBMW
+CgAhFiEEqyf10RNrINMUn7zAA4lFFzGjrd0FAmhDBIoDBQF4AAoJEAOJRRcxo63d
+24MBALUyqgxBZz767WiqSQ+kQYt+sfy1RFv9rbdw9OFW82x9AQDHZrFl4jSxR/NH
+SrMjd/U+6K5C+J5FIS63SMhowHjADLgzBGcCplYWCSsGAQQB2kcPAQEHQM01MEzR
+GF4IA8MA6cPV7aSeq0wqDy0JI3QdRRzTXdvIiH4EGBYKACYWIQSp02PqIRupywPR
+t3OqWeJVo4lgcwUCZwKmVgIbIAUJAeEzgAAKCRCqWeJVo4lgcyjIAP4wfo9C3/B7
+AsLARRoJj0kyao4111hAjYW7OMoicIt8XwEAnAOatjj8jwFdn/WkVOT3nR1Ei/lm
+hmnNcL/TvFyOGQW4OARnAqZ3EgorBgEEAZdVAQUBAQdAF9Hs+CuVinE5weQqAol7
+Teqj/gSWMVYyaKtP5jYQsHwDAQgHiH4EGBYKACYWIQSp02PqIRupywPRt3OqWeJV
+o4lgcwUCZwKmdwIbDAUJAeEzgAAKCRCqWeJVo4lgc43YAP9mTs1JD1z6Wqk5SbJu
+D5CCug9akc/vjJU/xIm/KmBERgEAyzky/8L5vV2r9BI8isQBQa6Em2daLKdIkLhd
+j1w7CQE=
+=Xef2
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/resources/pgp/AB27F5D1136B20D3149FBCC00389451731A3ADDD.asc b/resources/pgp/AB27F5D1136B20D3149FBCC00389451731A3ADDD.asc
@@ -0,0 +1,39 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=Gwr6
+-----END PGP PUBLIC KEY BLOCK-----