diff --git a/nixos/aws-lightsail-0/atuin/default.nix b/bastions/aws-lightsail-0/atuin/default.nix similarity index 100% rename from nixos/aws-lightsail-0/atuin/default.nix rename to bastions/aws-lightsail-0/atuin/default.nix diff --git a/nixos/aws-lightsail-0/caddy/default.nix b/bastions/aws-lightsail-0/caddy/default.nix similarity index 100% rename from nixos/aws-lightsail-0/caddy/default.nix rename to bastions/aws-lightsail-0/caddy/default.nix diff --git a/nixos/aws-lightsail-0/default.nix b/bastions/aws-lightsail-0/default.nix similarity index 91% rename from nixos/aws-lightsail-0/default.nix rename to bastions/aws-lightsail-0/default.nix index 3972359..dca43f4 100644 --- a/nixos/aws-lightsail-0/default.nix +++ b/bastions/aws-lightsail-0/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ hostName, ... }: { imports = [ ./atuin @@ -19,7 +19,7 @@ virtualisation.docker.enable = true; services.self-hosted.o11y = { - hostName = "aws-lightsail-0"; + inherit hostName; enable = true; }; diff --git a/nixos/aws-lightsail-0/users.nix b/bastions/aws-lightsail-0/users.nix similarity index 100% rename from nixos/aws-lightsail-0/users.nix rename to bastions/aws-lightsail-0/users.nix diff --git a/nixos/aws-lightsail-0/vaultwarden/default.nix b/bastions/aws-lightsail-0/vaultwarden/default.nix similarity index 100% rename from nixos/aws-lightsail-0/vaultwarden/default.nix rename to bastions/aws-lightsail-0/vaultwarden/default.nix diff --git a/nixos/gcp-instance-0/caddy/default.nix b/bastions/gcp-instance-0/caddy/default.nix similarity index 100% rename from nixos/gcp-instance-0/caddy/default.nix rename to bastions/gcp-instance-0/caddy/default.nix diff --git a/nixos/gcp-instance-0/chinadns/default.nix b/bastions/gcp-instance-0/chinadns/default.nix similarity index 100% rename from nixos/gcp-instance-0/chinadns/default.nix rename to bastions/gcp-instance-0/chinadns/default.nix diff --git a/nixos/gcp-instance-0/chinadns/geoip-cn.srs b/bastions/gcp-instance-0/chinadns/geoip-cn.srs similarity index 100% rename from nixos/gcp-instance-0/chinadns/geoip-cn.srs rename to bastions/gcp-instance-0/chinadns/geoip-cn.srs diff --git a/nixos/gcp-instance-0/chinadns/geosite-china-list.srs b/bastions/gcp-instance-0/chinadns/geosite-china-list.srs similarity index 100% rename from nixos/gcp-instance-0/chinadns/geosite-china-list.srs rename to bastions/gcp-instance-0/chinadns/geosite-china-list.srs diff --git a/nixos/gcp-instance-0/chinadns/geosite-geolocation-not-cn.srs b/bastions/gcp-instance-0/chinadns/geosite-geolocation-not-cn.srs similarity index 100% rename from nixos/gcp-instance-0/chinadns/geosite-geolocation-not-cn.srs rename to bastions/gcp-instance-0/chinadns/geosite-geolocation-not-cn.srs diff --git a/nixos/gcp-instance-0/default.nix b/bastions/gcp-instance-0/default.nix similarity index 86% rename from nixos/gcp-instance-0/default.nix rename to bastions/gcp-instance-0/default.nix index aab8fd0..9b53de6 100644 --- a/nixos/gcp-instance-0/default.nix +++ b/bastions/gcp-instance-0/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ hostName, ... }: { imports = [ ./caddy @@ -8,8 +8,8 @@ virtualisation.docker.enable = false; services.self-hosted.o11y = { + inherit hostName; enable = true; - hostName = "gcp-instance-0"; }; services.self-hosted.cloud.sing-box.enable = true; diff --git a/nixos/gcp-instance-0/subgen/default.jsonnet b/bastions/gcp-instance-0/subgen/default.jsonnet similarity index 100% rename from nixos/gcp-instance-0/subgen/default.jsonnet rename to bastions/gcp-instance-0/subgen/default.jsonnet diff --git a/nixos/gcp-instance-0/subgen/default.nix b/bastions/gcp-instance-0/subgen/default.nix similarity index 100% rename from nixos/gcp-instance-0/subgen/default.nix rename to bastions/gcp-instance-0/subgen/default.nix diff --git a/nixos/gcp-instance-0/subgen/overlays/20241012171802.jsonnet b/bastions/gcp-instance-0/subgen/overlays/20241012171802.jsonnet similarity index 100% rename from nixos/gcp-instance-0/subgen/overlays/20241012171802.jsonnet rename to bastions/gcp-instance-0/subgen/overlays/20241012171802.jsonnet diff --git a/nixos/gcp-instance-0/subgen/template.jsonnet b/bastions/gcp-instance-0/subgen/template.jsonnet similarity index 100% rename from nixos/gcp-instance-0/subgen/template.jsonnet rename to bastions/gcp-instance-0/subgen/template.jsonnet diff --git a/nixos/gcp-instance-2/default.nix b/bastions/gcp-instance-2/default.nix similarity index 95% rename from nixos/gcp-instance-2/default.nix rename to bastions/gcp-instance-2/default.nix index e06ad2c..dd88b13 100644 --- a/nixos/gcp-instance-2/default.nix +++ b/bastions/gcp-instance-2/default.nix @@ -1,10 +1,10 @@ -{ config, ... }: +{ config, hostName, ... }: { virtualisation.docker.enable = true; services.self-hosted.o11y = { + inherit hostName; enable = true; - hostName = "gcp-instance-2"; }; services.self-hosted.cloud.sing-box = { diff --git a/bastions/iosmanthus-macmini/aerospace/default.nix b/bastions/iosmanthus-macmini/aerospace/default.nix new file mode 100644 index 0000000..e693b6c --- /dev/null +++ b/bastions/iosmanthus-macmini/aerospace/default.nix @@ -0,0 +1,112 @@ +{ pkgs, ... }: +let + nextAppWin = pkgs.writers.writePython3 "nextAppWin" { + libraries = [ ]; + flakeIgnore = [ "E501" ]; + } (builtins.readFile ./next_app_win.py); + searchWin = pkgs.writers.writePython3 "searchWin" { + libraries = [ ]; + flakeIgnore = [ "E501" ]; + } (builtins.readFile ./search_win.py); +in +{ + services.aerospace = { + enable = true; + settings = { + enable-normalization-flatten-containers = false; + enable-normalization-opposite-orientation-for-nested-containers = false; + default-root-container-layout = "accordion"; + exec = { + inherit-env-vars = true; + }; + on-window-detected = [ + # Termainal + { + "if".app-id = "net.kovidgoyal.kitty"; + run = [ "move-node-to-workspace 1" ]; + } + # Browsers + { + "if".app-id = "org.mozilla.firefox"; + run = [ "move-node-to-workspace 1" ]; + } + # Mail + { + "if".app-id = "com.apple.mail"; + run = [ "move-node-to-workspace 3" ]; + } + # Music + { + "if".app-id = "com.apple.Music"; + run = [ "move-node-to-workspace 4" ]; + } + # IMs + { + "if".app-id = "ru.keepcoder.Telegram"; + run = [ "move-node-to-workspace 2" ]; + } + { + "if".app-id = "com.hnc.Discord"; + run = [ "move-node-to-workspace 2" ]; + } + { + "if".app-id = "com.tencent.xinWeChat"; + run = [ "move-node-to-workspace 2" ]; + } + { + "if".app-id = "com.electron.lark"; + run = [ "move-node-to-workspace 2" ]; + } + # Notes + { + "if".app-id = "com.electron.logseq"; + run = [ "move-node-to-workspace 5" ]; + } + ]; + mode.main.binding = { + alt-s = "layout v_accordion"; # "layout stacking" in i3 + alt-w = "layout h_accordion"; # "layout tabbed" in i3 + alt-e = "layout tiles horizontal vertical"; # "layout toggle split" in i3 + alt-shift-space = "layout floating tiling"; # 'floating toggle' in i3 + + alt-v = "split vertical"; + alt-shift-v = "split horizontal"; + + alt-f = "fullscreen"; + alt-shift-f = "macos-native-fullscreen"; + alt-q = "close --quit-if-last-window"; + + alt-h = "focus left"; + alt-j = "focus down"; + alt-k = "focus up"; + alt-l = "focus right"; + alt-shift-h = "move left"; + alt-shift-j = "move down"; + alt-shift-k = "move up"; + alt-shift-l = "move right"; + + alt-leftSquareBracket = "exec-and-forget ${nextAppWin} prev"; + alt-rightSquareBracket = "exec-and-forget ${nextAppWin} next"; + alt-p = "exec-and-forget ${searchWin}"; + + alt-1 = "workspace 1"; + alt-2 = "workspace 2"; + alt-3 = "workspace 3"; + alt-4 = "workspace 4"; + alt-5 = "workspace 5"; + alt-shift-1 = "move-node-to-workspace 1"; + alt-shift-2 = "move-node-to-workspace 2"; + alt-shift-3 = "move-node-to-workspace 3"; + alt-shift-4 = "move-node-to-workspace 4"; + alt-shift-5 = "move-node-to-workspace 5"; + + alt-tab = "workspace-back-and-forth"; + + alt-b = "exec-and-forget open /Applications/Firefox.app"; + alt-c = "exec-and-forget open ${pkgs.vscode}/Applications/Visual\\ Studio\\ Code.app"; + alt-enter = "exec-and-forget open ${pkgs.kitty}/Applications/kitty.app"; + alt-m = "exec-and-forget open /System/Applications/Music.app"; + }; + }; + }; +} diff --git a/bastions/iosmanthus-macmini/aerospace/next_app_win.py b/bastions/iosmanthus-macmini/aerospace/next_app_win.py new file mode 100644 index 0000000..ac0b8ce --- /dev/null +++ b/bastions/iosmanthus-macmini/aerospace/next_app_win.py @@ -0,0 +1,38 @@ +import subprocess +import sys +import json + + +def get_focused_window(): + return json.loads( + subprocess.check_output( + ["aerospace", "list-windows", "--focused", "--json"] + ).decode("utf-8") + )[0] + + +def get_all_windows_in_workspace(): + return json.loads( + subprocess.check_output( + ["aerospace", "list-windows", "--workspace", "focused", "--json"] + ).decode("utf-8") + ) + + +def move_to_window(window_id): + subprocess.run(["aerospace", "focus", "--window-id", str(window_id)]) + + +if __name__ == "__main__": + direction = 1 + if sys.argv[1] == "prev": + direction = -1 + current_win = get_focused_window() + all_win = get_all_windows_in_workspace() + app_wins = list(filter(lambda w: w["app-name"] == current_win["app-name"], all_win)) + next_idx = 0 + for idx, win in enumerate(app_wins): + if win["window-id"] == current_win["window-id"]: + next_idx = (idx + direction) % len(app_wins) + break + move_to_window(app_wins[next_idx]["window-id"]) diff --git a/bastions/iosmanthus-macmini/aerospace/search_win.py b/bastions/iosmanthus-macmini/aerospace/search_win.py new file mode 100755 index 0000000..7ea8922 --- /dev/null +++ b/bastions/iosmanthus-macmini/aerospace/search_win.py @@ -0,0 +1,20 @@ +import subprocess +import json + +if __name__ == "__main__": + wins = json.loads( + subprocess.check_output( + ["aerospace", "list-windows", "--all", "--json"] + ).decode("utf-8") + ) + output = "" + for idx, win in enumerate(wins): + output += f'{idx} | {win["app-name"]} {win['window-title']}\n' + + choose = subprocess.Popen(["choose"], stdin=subprocess.PIPE, stdout=subprocess.PIPE) + + selected, _ = choose.communicate(bytes(output, "utf-8")) + selected_idx = int(selected.decode("utf-8").split("|")[0].strip()) + subprocess.run( + ["aerospace", "focus", "--window-id", str(wins[selected_idx]["window-id"])] + ) diff --git a/bastions/iosmanthus-macmini/default.nix b/bastions/iosmanthus-macmini/default.nix new file mode 100644 index 0000000..80f51bd --- /dev/null +++ b/bastions/iosmanthus-macmini/default.nix @@ -0,0 +1,75 @@ +{ + config, + pkgs, + hostName, + ... +}: +{ + imports = [ + ./aerospace + ./homebrew + ./system + ]; + + sops.age.keyFile = "${config.admin.home}/.config/sops/age/keys.txt"; + + environment.variables = { + SOPS_AGE_KEY_FILE = config.sops.age.keyFile; + }; + + nixpkgs = { + hostPlatform = "aarch64-darwin"; + config = { + allowUnfree = true; + }; + }; + + networking = { + knownNetworkServices = [ + "Wi-Fi" + "Ethernet Adaptor" + "Thunderbolt Ethernet" + ]; + dns = [ + "223.5.5.5" + "114.114.114.114" + "119.29.29.29" + ]; + }; + + nix = { + package = pkgs.nixVersions.nix_2_22; + extraOptions = '' + experimental-features = nix-command flakes + keep-going = true + download-attempts = 2 + connect-timeout = 5 + ''; + optimise = { + automatic = true; + }; + gc = { + automatic = true; + options = "--delete-older-than 2d"; + }; + }; + + programs.zsh.enable = true; + networking = { + inherit hostName; + computerName = hostName; + }; + + users.users.${config.admin.name} = { + inherit (config.admin) shell home; + description = config.admin.name; + openssh.authorizedKeys.keys = [ config.admin.sshPubKey ]; + }; + + nix.settings.trusted-users = [ config.admin.name ]; + + services.sing-box = { + enable = true; + configPath = config.sops.secrets.sing-box.path; + }; +} diff --git a/bastions/iosmanthus-macmini/homebrew/default.nix b/bastions/iosmanthus-macmini/homebrew/default.nix new file mode 100644 index 0000000..40f0e1a --- /dev/null +++ b/bastions/iosmanthus-macmini/homebrew/default.nix @@ -0,0 +1,33 @@ +{ + config, + lib, + ... +}: +{ + environment.systemPath = lib.optionals config.homebrew.enable [ + config.homebrew.brewPrefix + ]; + + homebrew = { + enable = true; + caskArgs.no_quarantine = true; + global.brewfile = true; + masApps = { }; + brews = [ + "choose-gui" + ]; + casks = [ + "discord" + "feishu" + "firefox" + "jetbrains-toolbox" + "logi-options+" + "logseq" + "maccy" + "sfm" + "squirrel" + "telegram" + "wechat" + ]; + }; +} diff --git a/bastions/iosmanthus-macmini/shortcuts.xml b/bastions/iosmanthus-macmini/shortcuts.xml new file mode 100644 index 0000000..ce15a08 --- /dev/null +++ b/bastions/iosmanthus-macmini/shortcuts.xml @@ -0,0 +1,260 @@ + + + + + AppleSymbolicHotKeys + + 118 + + enabled + + value + + parameters + + 65535 + 18 + 262144 + + type + standard + + + 119 + + enabled + + value + + parameters + + 65535 + 19 + 262144 + + type + standard + + + 120 + + enabled + + value + + parameters + + 65535 + 20 + 262144 + + type + standard + + + 15 + + enabled + + + 16 + + enabled + + + 160 + + enabled + + value + + parameters + + 97 + 0 + 1572864 + + type + standard + + + 164 + + enabled + + value + + parameters + + 262144 + 18446744073709289471 + + type + modifier + + + 17 + + enabled + + + 18 + + enabled + + + 19 + + enabled + + + 20 + + enabled + + + 21 + + enabled + + + 22 + + enabled + + + 23 + + enabled + + + 24 + + enabled + + + 25 + + enabled + + + 26 + + enabled + + + 31 + + enabled + + value + + parameters + + 52 + 21 + 1441792 + + type + standard + + + 60 + + enabled + + value + + parameters + + 65535 + 53 + 393216 + + type + standard + + + 61 + + enabled + + value + + parameters + + 65535 + 53 + 262144 + + type + standard + + + 79 + + enabled + + value + + parameters + + 65535 + 123 + 8650752 + + type + standard + + + 80 + + enabled + + value + + parameters + + 65535 + 123 + 8781824 + + type + standard + + + 81 + + enabled + + value + + parameters + + 65535 + 124 + 8650752 + + type + standard + + + 82 + + enabled + + value + + parameters + + 65535 + 124 + 8781824 + + type + standard + + + + + diff --git a/bastions/iosmanthus-macmini/system/default.nix b/bastions/iosmanthus-macmini/system/default.nix new file mode 100644 index 0000000..25bfd93 --- /dev/null +++ b/bastions/iosmanthus-macmini/system/default.nix @@ -0,0 +1,58 @@ +{ + pkgs, + hostName, + ... +}: +{ + system = { + stateVersion = 5; + # activationScripts are executed every time you boot the system or run `nixos-rebuild` / `darwin-rebuild`. + activationScripts.postUserActivation.text = '' + # activateSettings -u will reload the settings from the database and apply them to the current session, + # so we do not need to logout and login again to make the changes take effect. + /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u + ''; + defaults = { + NSGlobalDomain = { + KeyRepeat = 2; + InitialKeyRepeat = 15; + ApplePressAndHoldEnabled = false; + AppleInterfaceStyle = "Dark"; + + "com.apple.swipescrolldirection" = false; + }; + WindowManager = { + GloballyEnabled = false; + }; + CustomUserPreferences = { + "com.apple.HIToolbox" = { + AppleDictationAutoEnable = false; + }; + "com.apple.assistant.support" = { + "Dictation Enabled" = false; + }; + "com.apple.dock" = { + expose-group-apps = true; + }; + }; + smb = { + NetBIOSName = hostName; + }; + dock = { + autohide = true; + autohide-time-modifier = 0.2; + persistent-apps = [ + "/System/Applications/Launchpad.app" + "/System/Applications/Music.app" + + "/Applications/Firefox.app" + "${pkgs.vscode}/Applications/Visual Studio Code.app" + "/Applications/Telegram.app" + "/Applications/Logseq.app" + "/Applications/SFM.app" + ]; + }; + }; + }; + +} diff --git a/bastions/iosmanthus-macmini/x.sh b/bastions/iosmanthus-macmini/x.sh new file mode 100755 index 0000000..a777695 --- /dev/null +++ b/bastions/iosmanthus-macmini/x.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +case "$1" in + "import") + defaults import com.apple.symbolichotkeys ./shortcuts.xml + /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u ;; + "export") + defaults export com.apple.symbolichotkeys - > ./shortcuts.xml ;; + *) + echo "unknown commands" + exit 1 ;; +esac + diff --git a/nixos/iosmanthus-xps/default.nix b/bastions/iosmanthus-xps/default.nix similarity index 81% rename from nixos/iosmanthus-xps/default.nix rename to bastions/iosmanthus-xps/default.nix index 87924df..e6a6fd1 100644 --- a/nixos/iosmanthus-xps/default.nix +++ b/bastions/iosmanthus-xps/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ hostName, ... }: { imports = [ ./hardware-configuration.nix @@ -6,7 +6,9 @@ ./monitors.nix ]; - networking.hostName = "iosmanthus-xps"; + networking = { + inherit hostName; + }; services.xserver.videoDrivers = [ "nvidia" ]; hardware.nvidia = { diff --git a/nixos/iosmanthus-xps/hardware-configuration.nix b/bastions/iosmanthus-xps/hardware-configuration.nix similarity index 100% rename from nixos/iosmanthus-xps/hardware-configuration.nix rename to bastions/iosmanthus-xps/hardware-configuration.nix diff --git a/nixos/iosmanthus-xps/monitors.nix b/bastions/iosmanthus-xps/monitors.nix similarity index 100% rename from nixos/iosmanthus-xps/monitors.nix rename to bastions/iosmanthus-xps/monitors.nix diff --git a/nixos/lego-router/default.nix b/bastions/lego-router/default.nix similarity index 96% rename from nixos/lego-router/default.nix rename to bastions/lego-router/default.nix index df620f7..4199e11 100644 --- a/nixos/lego-router/default.nix +++ b/bastions/lego-router/default.nix @@ -1,9 +1,11 @@ -{ config, ... }: +{ config, hostName, ... }: { imports = [ ./hardware-configuration.nix ]; - networking.hostName = "lego-router"; + networking = { + inherit hostName; + }; boot = { # Use the systemd-boot EFI boot loader. diff --git a/nixos/lego-router/hardware-configuration.nix b/bastions/lego-router/hardware-configuration.nix similarity index 100% rename from nixos/lego-router/hardware-configuration.nix rename to bastions/lego-router/hardware-configuration.nix diff --git a/nixos/workstation/default.nix b/bastions/workstation/default.nix similarity index 100% rename from nixos/workstation/default.nix rename to bastions/workstation/default.nix diff --git a/nixos/workstation/desktop/default.nix b/bastions/workstation/desktop/default.nix similarity index 100% rename from nixos/workstation/desktop/default.nix rename to bastions/workstation/desktop/default.nix diff --git a/nixos/workstation/desktop/fcitx5.nix b/bastions/workstation/desktop/fcitx5.nix similarity index 100% rename from nixos/workstation/desktop/fcitx5.nix rename to bastions/workstation/desktop/fcitx5.nix diff --git a/nixos/workstation/desktop/fonts.nix b/bastions/workstation/desktop/fonts.nix similarity index 100% rename from nixos/workstation/desktop/fonts.nix rename to bastions/workstation/desktop/fonts.nix diff --git a/nixos/workstation/desktop/monitors.nix b/bastions/workstation/desktop/monitors.nix similarity index 100% rename from nixos/workstation/desktop/monitors.nix rename to bastions/workstation/desktop/monitors.nix diff --git a/nixos/workstation/network.nix b/bastions/workstation/network.nix similarity index 100% rename from nixos/workstation/network.nix rename to bastions/workstation/network.nix diff --git a/nixos/workstation/o11y/default.nix b/bastions/workstation/o11y/default.nix similarity index 100% rename from nixos/workstation/o11y/default.nix rename to bastions/workstation/o11y/default.nix diff --git a/nixos/workstation/o11y/loki-local-config.yaml b/bastions/workstation/o11y/loki-local-config.yaml similarity index 100% rename from nixos/workstation/o11y/loki-local-config.yaml rename to bastions/workstation/o11y/loki-local-config.yaml diff --git a/nixos/workstation/users.nix b/bastions/workstation/users.nix similarity index 100% rename from nixos/workstation/users.nix rename to bastions/workstation/users.nix diff --git a/darwin/iosmanthus-macmini/default.nix b/darwin/iosmanthus-macmini/default.nix deleted file mode 100644 index efafd6d..0000000 --- a/darwin/iosmanthus-macmini/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - config, - pkgs, - ... -}: -let - hostName = "iosmanthus-macmini"; -in -{ - nixpkgs = { - hostPlatform = "aarch64-darwin"; - config = { - allowUnfree = true; - }; - }; - - nix = { - package = pkgs.nixVersions.nix_2_22; - extraOptions = '' - experimental-features = nix-command flakes - keep-going = true - download-attempts = 2 - connect-timeout = 5 - ''; - optimise = { - automatic = true; - }; - gc = { - automatic = true; - options = "--delete-older-than 2d"; - }; - }; - - system = { - stateVersion = 5; - # activationScripts are executed every time you boot the system or run `nixos-rebuild` / `darwin-rebuild`. - activationScripts.postUserActivation.text = '' - # activateSettings -u will reload the settings from the database and apply them to the current session, - # so we do not need to logout and login again to make the changes take effect. - /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u - ''; - defaults = { - NSGlobalDomain = { - KeyRepeat = 2; - ApplePressAndHoldEnabled = false; - AppleInterfaceStyle = "Dark"; - - "com.apple.swipescrolldirection" = false; - }; - smb = { - NetBIOSName = hostName; - }; - }; - }; - - programs.zsh.enable = true; - - networking = rec { - inherit hostName; - computerName = hostName; - }; - - users.users.${config.admin.name} = { - inherit (config.admin) shell home; - description = config.admin.name; - openssh.authorizedKeys.keys = [ config.admin.sshPubKey ]; - }; - - nix.settings.trusted-users = [ config.admin.name ]; -} diff --git a/flake.lock b/flake.lock index b39575f..3da27df 100644 --- a/flake.lock +++ b/flake.lock @@ -253,11 +253,11 @@ ] }, "locked": { - "lastModified": 1732482255, - "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "lastModified": 1732793095, + "narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "rev": "2f7739d01080feb4549524e8f6927669b61c6ee3", "type": "github" }, "original": { @@ -359,15 +359,16 @@ ] }, "locked": { - "lastModified": 1732603785, - "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", - "owner": "LnL7", + "lastModified": 1732811980, + "narHash": "sha256-3ilThyc2VG32ygLGhkaqnrns3TrXn7jHDuXHMacENdk=", + "owner": "iosmanthus", "repo": "nix-darwin", - "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", + "rev": "3dfaf51935301ae4b09bb42a01da297a7151e8a9", "type": "github" }, "original": { - "owner": "LnL7", + "owner": "iosmanthus", + "ref": "aerospace-path", "repo": "nix-darwin", "type": "github" } diff --git a/flake.nix b/flake.nix index d7b2c8d..82e0f88 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,7 @@ vaultwarden.url = "github:iosmanthus/nixpkgs/bump-vaultwarden-20240912141923"; nix-darwin = { - url = "github:LnL7/nix-darwin"; + url = "github:iosmanthus/nix-darwin/aerospace-path"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -74,7 +74,7 @@ this = import ./packages; mkWorkstationModules = system: [ - ./nixos/workstation + ./bastions/workstation ./secrets/workstation self.nixosModules.workstation @@ -104,6 +104,7 @@ ]; extraSpecialArgs = { inherit self; + flakeRoot = ./.; }; useGlobalPkgs = true; verbose = true; @@ -139,6 +140,7 @@ format = "gce"; specialArgs = { inherit self; + flakeRoot = ./.; }; modules = [ self.nixosModules.cloud.gce ]; }; @@ -219,23 +221,22 @@ iosmanthus-xps = nixpkgs.lib.nixosSystem rec { specialArgs = { inherit self; + hostName = "iosmanthus-xps"; + flakeRoot = ./.; }; system = "x86_64-linux"; modules = [ - ./nixos/iosmanthus-xps + ./bastions/iosmanthus-xps nixos-hardware.nixosModules.dell-xps-17-9710-intel ] ++ (mkWorkstationModules system); }; - iosmanthus-legion = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; - modules = [ ./nixos/iosmanthus-legion ] ++ (mkWorkstationModules system); - }; - aws-lightsail-0 = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit self; + hostName = "aws-lightsail-0"; + flakeRoot = ./.; }; modules = [ ./secrets/aws-lightsail-0 @@ -244,7 +245,7 @@ ./secrets/cloud/grafana ./secrets/cloud/sing-box - ./nixos/aws-lightsail-0 + ./bastions/aws-lightsail-0 sops-nix.nixosModules.sops @@ -269,6 +270,8 @@ system = "x86_64-linux"; specialArgs = { inherit self; + hostName = "gcp-instance-0"; + flakeRoot = ./.; }; modules = [ ./secrets/gcp-instance-0 @@ -278,7 +281,7 @@ ./secrets/cloud/endpoints ./secrets/cloud/subgen - ./nixos/gcp-instance-0 + ./bastions/gcp-instance-0 sops-nix.nixosModules.sops @@ -302,6 +305,8 @@ system = "x86_64-linux"; specialArgs = { inherit self; + hostName = "gcp-instance-2"; + flakeRoot = ./.; }; modules = [ ./secrets/gcp-instance-2 @@ -310,7 +315,7 @@ ./secrets/cloud/sing-box ./secrets/cloud/endpoints - ./nixos/gcp-instance-2 + ./bastions/gcp-instance-2 sops-nix.nixosModules.sops @@ -331,9 +336,11 @@ system = "x86_64-linux"; specialArgs = { inherit self; + hostName = "lego-router"; + flakeRoot = ./.; }; modules = [ - ./nixos/lego-router + ./bastions/lego-router ./secrets/lego-router sops-nix.nixosModules.sops @@ -355,11 +362,24 @@ iosmanthus-macmini = nix-darwin.lib.darwinSystem { specialArgs = { inherit self; + hostName = "iosmanthus-macmini"; + flakeRoot = ./.; }; modules = [ - ./darwin/iosmanthus-macmini - home-manager.darwinModules.home-manager + { + nixpkgs.overlays = [ + self.overlays.default + self.overlays.unstable-darwin + ]; + } + ./bastions/iosmanthus-macmini + ./secrets/darwin + self.darwinModules.admin.iosmanthus-darwin + self.darwinModules.sing-box + + sops-nix.darwinModules.sops + home-manager.darwinModules.home-manager mac-app-util.darwinModules.default ( { config, ... }: @@ -382,50 +402,51 @@ ]; extraSpecialArgs = { inherit self; + flakeRoot = ./.; }; useGlobalPkgs = true; verbose = true; }; } ) - { - nixpkgs.overlays = [ - self.overlays.default - self.overlays.unstable-darwin - ]; - } ]; }; }; } - // flake-utils.lib.eachSystem [ "x86_64-linux" ] ( - system: - let - pkgs = import nixpkgs { - inherit system; - config = { - allowUnfree = true; - }; - }; - in - { - devShells.default = pkgs.mkShell { - hardeningDisable = [ "fortify" ]; - buildInputs = with pkgs; [ - fd - gnumake - go_1_22 - google-cloud-sdk - gotools - nix-output-monitor - nixfmt-rfc-style - nodejs - sops - statix - terraform - black - ]; - }; - } - ); + // + flake-utils.lib.eachSystem + [ + "x86_64-linux" + "aarch64-darwin" + ] + ( + system: + let + pkgs = import nixpkgs { + inherit system; + config = { + allowUnfree = true; + }; + }; + in + { + devShells.default = pkgs.mkShell { + hardeningDisable = [ "fortify" ]; + buildInputs = with pkgs; [ + fd + gnumake + go_1_22 + google-cloud-sdk + gotools + nix-output-monitor + nixfmt-rfc-style + nodejs + sops + statix + terraform + black + ]; + }; + } + ); } diff --git a/home/base/firefox/default.nix b/home/base/firefox/default.nix index e9205fe..412f2a3 100644 --- a/home/base/firefox/default.nix +++ b/home/base/firefox/default.nix @@ -1,13 +1,10 @@ { config, - self, - pkgs, ... }: { programs.firefox = { enable = true; - package = self.inputs.firefox.packages.${pkgs.system}.firefox-nightly-bin.unwrapped; profiles.${config.admin.name} = { settings = { "browser.sessionstore.resume_from_crash" = true; @@ -23,7 +20,6 @@ "network.predictor.preresolve-min-confidence" = 10; "network.trr.mode" = 0; "toolkit.legacyUserProfileCustomizations.stylesheets" = true; - "widget.content.gtk-theme-override" = config.gtk.globalTheme.name; "xpinstall.signatures.required" = false; }; userChrome = builtins.readFile ./userChrome.css; diff --git a/home/base/git/default.nix b/home/base/git/default.nix new file mode 100644 index 0000000..ced183b --- /dev/null +++ b/home/base/git/default.nix @@ -0,0 +1,35 @@ +{ + pkgs, + config, + ... +}: +{ + programs.git = { + enable = true; + lfs.enable = true; + userName = config.admin.name; + userEmail = config.admin.email; + extraConfig = { + core = { + editor = "${pkgs.vscode-launcher} --wait"; + fsmonitor = true; + }; + pull = { + rebase = false; + }; + url = { + "ssh://git@github.com/" = { + insteadOf = "https://github.com/"; + }; + }; + }; + signing = { + key = config.admin.gpgPubKey; + signByDefault = true; + }; + ignores = [ + "/bazel-*" + "/.idea" + ]; + }; +} diff --git a/home/nixos/gpg/0xC16B34E00DCD8AE9.gpg b/home/base/gpg/0xC16B34E00DCD8AE9.gpg similarity index 100% rename from home/nixos/gpg/0xC16B34E00DCD8AE9.gpg rename to home/base/gpg/0xC16B34E00DCD8AE9.gpg diff --git a/home/nixos/gpg/0xDEE5BAABFE092169.gpg b/home/base/gpg/0xDEE5BAABFE092169.gpg similarity index 100% rename from home/nixos/gpg/0xDEE5BAABFE092169.gpg rename to home/base/gpg/0xDEE5BAABFE092169.gpg diff --git a/home/base/gpg/default.nix b/home/base/gpg/default.nix new file mode 100644 index 0000000..4537398 --- /dev/null +++ b/home/base/gpg/default.nix @@ -0,0 +1,18 @@ +{ ... }: +{ + programs.gpg = { + enable = true; + mutableKeys = true; + mutableTrust = false; + publicKeys = [ + { + source = ./0xDEE5BAABFE092169.gpg; + trust = "ultimate"; + } + { + source = ./0xC16B34E00DCD8AE9.gpg; + trust = "ultimate"; + } + ]; + }; +} diff --git a/home/base/kitty/default.nix b/home/base/kitty/default.nix new file mode 100644 index 0000000..e250bba --- /dev/null +++ b/home/base/kitty/default.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + programs.kitty = { + enable = true; + font = { + name = "monospace"; + size = 12; + }; + settings = { + include = pkgs.kitty-themes.mkKittyTheme "base16-material-darker"; + }; + }; +} diff --git a/home/base/shell/alias.nix b/home/base/shell/alias.nix index 743ff64..2527bb3 100644 --- a/home/base/shell/alias.nix +++ b/home/base/shell/alias.nix @@ -1,24 +1,9 @@ { pkgs, ... }: -let - ignoreOutput = pkgs.writers.writePython3 "ignore_output" { libraries = [ ]; } '' - import subprocess - import sys - - subprocess.Popen( - sys.argv[1:], - stdout=subprocess.DEVNULL, - stderr=subprocess.DEVNULL - ) - ''; -in { home.packages = with pkgs; [ bat eza - systemd - sudo bind - iptables ]; programs.zsh = { @@ -36,36 +21,8 @@ in py = "python"; py2 = "python2"; - reboot = "sudo systemctl reboot -i"; - poweroff = "sudo systemctl poweroff -i"; - - # TODO: refactor this shit. - connect-xm3 = "repeat 5 { bluetoothctl connect 38:18:4C:F9:98:A9; sleep 2 } 2>&1 > /dev/null &disown"; - connect-xm4 = "repeat 5 { bluetoothctl connect AC:80:0A:0D:E9:47; sleep 2 } 2>&1 > /dev/null &disown"; - connect-xm5 = "repeat 5 { bluetoothctl connect 80:99:E7:5B:45:46; sleep 2 } 2>&1 > /dev/null &disown"; - connect-jbl = "repeat 5 { bluetoothctl connect 70:99:1C:7F:E3:EF; sleep 2 } 2>&1 > /dev/null &disown"; - disconnect-xm3 = "bluetoothctl disconnect 38:18:4C:F9:98:A9"; - disconnect-xm4 = "bluetoothctl disconnect AC:80:0A:0D:E9:47"; - disconnect-xm5 = "bluetoothctl disconnect 80:99:E7:5B:45:46"; - disconnect-jbl = "bluetoothctl disconnect 70:99:1C:7F:E3:EF"; - - jctl = "journalctl"; - juctl = "journalctl --user"; - - i3-logout = "i3-msg exit"; - dig = "dig +ttlunits"; - nat = "sudo iptables -t nat -nvL"; - mangle = "sudo iptables -t mangle -nvL"; - filter = "sudo iptables -nvL"; - - clion = "${ignoreOutput} clion nosplash"; - goland = "${ignoreOutput} goland nosplash"; - idea-ultimate = "${ignoreOutput} idea-ultimate nosplash"; - rr = "${ignoreOutput} rust-rover nosplash"; - webstorm = "${ignoreOutput} webstorm nosplash"; - k = "kubectl"; kx = "kubectx"; diff --git a/home/base/shell/default.nix b/home/base/shell/default.nix index 5c7d3f8..3b324e2 100644 --- a/home/base/shell/default.nix +++ b/home/base/shell/default.nix @@ -9,6 +9,7 @@ ./starship.nix ./alias.nix ]; + programs.direnv = { enable = true; enableZshIntegration = true; @@ -23,6 +24,19 @@ enableBashIntegration = true; }; + programs.atuin = { + enable = true; + flags = [ "--disable-up-arrow" ]; + settings = { + auto_sync = true; + keymap_mode = "vim-normal"; + search_mode = "fuzzy"; + style = "compact"; + sync_address = "https://atuin.iosmanthus.com"; + sync_frequency = "10m"; + }; + }; + programs.zsh = { enable = true; enableCompletion = true; diff --git a/home/base/tmux/default.nix b/home/base/tmux/default.nix index b79cfd5..ef0988f 100644 --- a/home/base/tmux/default.nix +++ b/home/base/tmux/default.nix @@ -1,6 +1,5 @@ { pkgs, config, ... }: { - home.packages = [ pkgs.xsel ]; programs.tmux = { enable = true; disableConfirmationPrompt = true; @@ -22,6 +21,7 @@ extraConfig = '' set -g mouse set -g default-terminal "tmux-256color" + set -g default-command "zsh" set -g escape-time 0 bind c new-window -c "#{pane_current_path}" bind % split-window -h -c "#{pane_current_path}" diff --git a/home/base/vscode/default.nix b/home/base/vscode/default.nix index 15ab18d..8f5ee0c 100644 --- a/home/base/vscode/default.nix +++ b/home/base/vscode/default.nix @@ -1,5 +1,4 @@ { - lib, config, pkgs, ... @@ -192,6 +191,13 @@ ]; commands = [ "actions.find" ]; } + { + before = [ + "\\" + "r" + ]; + commands = [ "editor.action.formatDocument" ]; + } ]; "vim.visualstar" = true; diff --git a/home/base/vscode/extensions.json b/home/base/vscode/extensions.json index ed1aa01..32e18ad 100644 --- a/home/base/vscode/extensions.json +++ b/home/base/vscode/extensions.json @@ -180,12 +180,6 @@ "version": "2024.5.13171011", "sha256": "1c9ss4qs12clv783sxsrs11ayj0h2ymp08czcl72h0p363dlk92q" }, - { - "publisher": "ms-vscode-remote", - "name": "remote-ssh", - "version": "0.116.2024112515", - "sha256": "080rzj3n6bf49cfkhx7rnns45jd4gsvs8yzapnncmp2svwfhkafw" - }, { "publisher": "equinusocio", "name": "vsc-material-theme", diff --git a/home/darwin/default.nix b/home/darwin/default.nix index f993585..4cf8a5b 100644 --- a/home/darwin/default.nix +++ b/home/darwin/default.nix @@ -5,7 +5,15 @@ }: { imports = [ + ../base/tmux + ../base/git + + ./firefox + ./gpg + ./kitty + ./shell ./vscode + ./maccy ]; home.stateVersion = "24.11"; @@ -13,7 +21,29 @@ sops.age.keyFile = "${config.admin.home}/.config/sops/age/keys.txt"; home.packages = with pkgs; [ + ascii + awscli2 + btop + dockutil + fd + fzf + gh git + htop + httpie + k9s + kubectl + kubectx + mycli + neofetch + ripgrep + sops + tldr + tokei tree ]; + + programs.neovim.enable = true; + + programs.go.enable = true; } diff --git a/home/darwin/firefox/default.nix b/home/darwin/firefox/default.nix new file mode 100644 index 0000000..5fb2282 --- /dev/null +++ b/home/darwin/firefox/default.nix @@ -0,0 +1,10 @@ +{ ... }: +{ + imports = [ + ../../base/firefox + ]; + + programs.firefox = { + package = null; + }; +} diff --git a/home/darwin/gpg/default.nix b/home/darwin/gpg/default.nix new file mode 100644 index 0000000..c9e7ee1 --- /dev/null +++ b/home/darwin/gpg/default.nix @@ -0,0 +1,23 @@ +{ + pkgs, + config, + ... +}: +let + importGPGKeys = pkgs.writeShellScript "import_gpg_keys" '' + while [ ! -f "${config.programs.gpg.homedir}/pubring.kbx" ]; do + sleep 1; + done; + mkdir -p "${config.programs.gpg.homedir}/private-keys-v1.d" + ${pkgs.gnupg}/bin/gpg --import ${config.sops.secrets.gpg-private.path} + ''; +in +{ + launchd.agents.import-gpg-keys = { + enable = true; + config = { + ProgramArguments = [ "${importGPGKeys}" ]; + RunAtLoad = true; + }; + }; +} diff --git a/home/darwin/kitty/default.nix b/home/darwin/kitty/default.nix new file mode 100644 index 0000000..b4f6f5c --- /dev/null +++ b/home/darwin/kitty/default.nix @@ -0,0 +1,16 @@ +{ + lib, + ... +}: +{ + imports = [ + ../../base/kitty + ]; + + programs.kitty = { + font = lib.mkForce { + name = "monospace"; + size = 15; + }; + }; +} diff --git a/home/darwin/maccy/default.nix b/home/darwin/maccy/default.nix new file mode 100644 index 0000000..9a3df8a --- /dev/null +++ b/home/darwin/maccy/default.nix @@ -0,0 +1,14 @@ +{ ... }: +{ + launchd.agents.maccy = { + enable = true; + config = { + ProgramArguments = [ + "open" + "-g" + "/Applications/Maccy.app" + ]; + RunAtLoad = true; + }; + }; +} diff --git a/home/darwin/shell/default.nix b/home/darwin/shell/default.nix new file mode 100644 index 0000000..a73b83d --- /dev/null +++ b/home/darwin/shell/default.nix @@ -0,0 +1,15 @@ +{ ... }: +{ + imports = [ + ../../base/shell + ]; + + programs.zsh = { + shellAliases = { + drs = "darwin-rebuild switch --flake ~/nixos-config"; + }; + initExtra = '' + eval "$(/opt/homebrew/bin/brew shellenv)" + ''; + }; +} diff --git a/home/darwin/vscode/default.nix b/home/darwin/vscode/default.nix index 2c71620..689dc95 100644 --- a/home/darwin/vscode/default.nix +++ b/home/darwin/vscode/default.nix @@ -1,8 +1,20 @@ { + pkgs, ... }: { imports = [ - ../base/vscode + ../../base/vscode ]; + + programs.vscode = { + extensions = pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + publisher = "ms-vscode-remote"; + name = "remote-ssh"; + version = "0.115.1"; + sha256 = "11gbam47rjga5ypqj0nm0g69x0v5pa175ap7yf3yj9l0a5y29b6h"; + } + ]; + }; } diff --git a/home/nixos/default.nix b/home/nixos/default.nix index 3f8b116..668645e 100644 --- a/home/nixos/default.nix +++ b/home/nixos/default.nix @@ -6,11 +6,13 @@ }: { imports = [ - ../base/firefox - ../base/shell + ../base/kitty ../base/tmux + ../base/git + ./shell ./desktop + ./firefox ./fcitx5 ./gpg ./neovim @@ -91,6 +93,7 @@ vlc wireguard-tools wmfocus + xsel xfce.xfce4-taskmanager xxd zoom-us @@ -135,35 +138,6 @@ programs.feh.enable = true; - programs.git = { - enable = true; - lfs.enable = true; - userName = config.admin.name; - userEmail = config.admin.email; - extraConfig = { - core = { - editor = "${pkgs.vscode-launcher} --wait"; - fsmonitor = true; - }; - pull = { - rebase = false; - }; - url = { - "ssh://git@github.com/" = { - insteadOf = "https://github.com/"; - }; - }; - }; - signing = { - key = config.admin.gpgPubKey; - signByDefault = true; - }; - ignores = [ - "/bazel-*" - "/.idea" - ]; - }; - home.file = { cargoConfig = { text = '' @@ -190,17 +164,6 @@ goPath = ".go"; }; - programs.kitty = { - enable = true; - font = { - name = "monospace"; - size = 12; - }; - settings = { - include = pkgs.kitty-themes.mkKittyTheme "base16-material-darker"; - }; - }; - services.picom = { package = pkgs.picom-next; enable = true; @@ -234,19 +197,6 @@ # indicator = true; # }; - programs.atuin = { - enable = true; - flags = [ "--disable-up-arrow" ]; - settings = { - auto_sync = true; - keymap_mode = "vim-normal"; - search_mode = "fuzzy"; - style = "compact"; - sync_address = "https://atuin.iosmanthus.com"; - sync_frequency = "10m"; - }; - }; - services.mpris-proxy.enable = true; services.playerctld.enable = true; diff --git a/home/nixos/firefox/default.nix b/home/nixos/firefox/default.nix new file mode 100644 index 0000000..6516a22 --- /dev/null +++ b/home/nixos/firefox/default.nix @@ -0,0 +1,20 @@ +{ + self, + pkgs, + config, + ... +}: +{ + imports = [ + ../../base/firefox + ]; + + programs.firefox = { + package = self.inputs.firefox.packages.${pkgs.system}.firefox-nightly-bin.unwrapped; + profiles.${config.admin.name} = { + settings = { + "widget.content.gtk-theme-override" = config.gtk.globalTheme.name; + }; + }; + }; +} diff --git a/home/nixos/gpg/default.nix b/home/nixos/gpg/default.nix index 0835ffb..89d77b5 100644 --- a/home/nixos/gpg/default.nix +++ b/home/nixos/gpg/default.nix @@ -9,21 +9,9 @@ let ''; in { - programs.gpg = { - enable = true; - mutableKeys = true; - mutableTrust = false; - publicKeys = [ - { - source = ./0xDEE5BAABFE092169.gpg; - trust = "ultimate"; - } - { - source = ./0xC16B34E00DCD8AE9.gpg; - trust = "ultimate"; - } - ]; - }; + imports = [ + ../../base/gpg + ]; systemd.user.services = { import-gpg-keys = { diff --git a/home/nixos/shell/default.nix b/home/nixos/shell/default.nix new file mode 100644 index 0000000..958f494 --- /dev/null +++ b/home/nixos/shell/default.nix @@ -0,0 +1,55 @@ +{ pkgs, ... }: +let + ignoreOutput = pkgs.writers.writePython3 "ignore_output" { libraries = [ ]; } '' + import subprocess + import sys + + subprocess.Popen( + sys.argv[1:], + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL + ) + ''; +in +{ + imports = [ + ../../base/shell + ]; + + home.packages = with pkgs; [ + systemd + sudo + iptables + ]; + + programs.zsh = { + shellAliases = { + reboot = "sudo systemctl reboot -i"; + poweroff = "sudo systemctl poweroff -i"; + + i3-logout = "i3-msg exit"; + + connect-xm3 = "repeat 5 { bluetoothctl connect 38:18:4C:F9:98:A9; sleep 2 } 2>&1 > /dev/null &disown"; + connect-xm4 = "repeat 5 { bluetoothctl connect AC:80:0A:0D:E9:47; sleep 2 } 2>&1 > /dev/null &disown"; + connect-xm5 = "repeat 5 { bluetoothctl connect 80:99:E7:5B:45:46; sleep 2 } 2>&1 > /dev/null &disown"; + connect-jbl = "repeat 5 { bluetoothctl connect 70:99:1C:7F:E3:EF; sleep 2 } 2>&1 > /dev/null &disown"; + disconnect-xm3 = "bluetoothctl disconnect 38:18:4C:F9:98:A9"; + disconnect-xm4 = "bluetoothctl disconnect AC:80:0A:0D:E9:47"; + disconnect-xm5 = "bluetoothctl disconnect 80:99:E7:5B:45:46"; + disconnect-jbl = "bluetoothctl disconnect 70:99:1C:7F:E3:EF"; + + jctl = "journalctl"; + juctl = "journalctl --user"; + + nat = "sudo iptables -t nat -nvL"; + mangle = "sudo iptables -t mangle -nvL"; + filter = "sudo iptables -nvL"; + + clion = "${ignoreOutput} clion nosplash"; + goland = "${ignoreOutput} goland nosplash"; + idea-ultimate = "${ignoreOutput} idea-ultimate nosplash"; + rr = "${ignoreOutput} rust-rover nosplash"; + webstorm = "${ignoreOutput} webstorm nosplash"; + }; + }; +} diff --git a/home/nixos/vscode/default.nix b/home/nixos/vscode/default.nix index 2b41d51..67301d3 100644 --- a/home/nixos/vscode/default.nix +++ b/home/nixos/vscode/default.nix @@ -28,6 +28,14 @@ programs.vscode = { package = pkgs.vscode-insiders; + extensions = pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + publisher = "ms-vscode-remote"; + name = "remote-ssh"; + version = "0.116.2024112515"; + sha256 = "080rzj3n6bf49cfkhx7rnns45jd4gsvs8yzapnncmp2svwfhkafw"; + } + ]; userSettings = { "vim.autoSwitchInputMethod.obtainIMCmd" = "${pkgs.fcitx5}/bin/fcitx5-remote"; "vim.autoSwitchInputMethod.switchIMCmd" = "${pkgs.fcitx5}/bin/fcitx5-remote -t {im}"; diff --git a/modules/base/admin/default.nix b/modules/base/admin/default.nix index 208162d..362be97 100644 --- a/modules/base/admin/default.nix +++ b/modules/base/admin/default.nix @@ -1,6 +1,11 @@ { iosmanthus = - { pkgs, config, ... }: + { + pkgs, + config, + flakeRoot, + ... + }: { imports = [ ./options.nix ]; @@ -11,12 +16,12 @@ home = "/home/iosmanthus"; hashedPasswordFile = config.sops.secrets."${name}/hashed-password".path; gpgPubKey = "0xDEE5BAABFE092169"; - sshPubKey = builtins.readFile ../../../secrets/iosmanthus/id_ecdsa_iosmanthus.pub; + sshPubKey = builtins.readFile (flakeRoot + "/secrets/iosmanthus/id_ecdsa_iosmanthus.pub"); }; }; iosmanthus-darwin = - { pkgs, ... }: + { pkgs, flakeRoot, ... }: { imports = [ ./options.nix ]; @@ -26,7 +31,7 @@ shell = pkgs.zsh; home = "/Users/iosmanthus"; gpgPubKey = "0xDEE5BAABFE092169"; - sshPubKey = builtins.readFile ../../../secrets/iosmanthus/id_ecdsa_iosmanthus.pub; + sshPubKey = builtins.readFile (flakeRoot + "/secrets/iosmanthus/id_ecdsa_iosmanthus.pub"); }; }; } diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index 60e473f..ea6102a 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -7,4 +7,5 @@ ../base/base16 ]; }; + sing-box = import ../darwin/sing-box; } diff --git a/modules/darwin/sing-box/default.nix b/modules/darwin/sing-box/default.nix new file mode 100644 index 0000000..18a7be0 --- /dev/null +++ b/modules/darwin/sing-box/default.nix @@ -0,0 +1,47 @@ +{ + lib, + pkgs, + config, + ... +}: +with lib; +let + cfg = config.services.sing-box; +in +{ + options = { + services.sing-box = { + enable = mkEnableOption "Enable sing-box daemon"; + package = mkOption { + type = types.package; + default = pkgs.sing-box; + }; + configPath = mkOption { + type = types.path; + description = '' + Path to the sing-box configuration file. + ''; + }; + }; + }; + config = mkIf cfg.enable { + launchd.daemons.sing-box = { + script = '' + if [ ! -d /tmp/sing-box ]; then + mkdir -p /tmp/sing-box + fi + if [ ! -d /var/lib/sing-box ]; then + mkdir -p /var/lib/sing-box + fi + ${pkgs.sing-box}/bin/sing-box run -c ${cfg.configPath} -D /var/lib/sing-box --disable-color + ''; + serviceConfig = { + KeepAlive = true; + RunAtLoad = true; + + StandardOutPath = "/tmp/sing-box/stdout.log"; + StandardErrorPath = "/tmp/sing-box/stderr.log"; + }; + }; + }; +} diff --git a/modules/nixos/cloud/sing-box/default.nix b/modules/nixos/cloud/sing-box/default.nix index 3ddda86..716d43b 100644 --- a/modules/nixos/cloud/sing-box/default.nix +++ b/modules/nixos/cloud/sing-box/default.nix @@ -214,7 +214,7 @@ in systemd.services.sing-box.restartTriggers = [ config.sops.templates."sing-box.json".content - ../../../secrets/cloud/sing-box/secrets.json + ../../../../secrets/cloud/sing-box/secrets.json ]; sops.templates."sing-box.json" = { diff --git a/modules/nixos/nixbuild/default.nix b/modules/nixos/nixbuild/default.nix index 73be3dc..d08663b 100644 --- a/modules/nixos/nixbuild/default.nix +++ b/modules/nixos/nixbuild/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, flakeRoot, ... }: { security.sudo.wheelNeedsPassword = false; @@ -14,7 +14,7 @@ extraGroups = [ "wheel" ] ++ (if config.virtualisation.docker.enable then [ "docker" ] else [ ]); openssh.authorizedKeys.keys = [ - (builtins.readFile ../../secrets/iosmanthus/id_ecdsa_iosmanthus.pub) + (builtins.readFile (flakeRoot + "/secrets/iosmanthus/id_ecdsa_iosmanthus.pub")) ]; }; diff --git a/nixos/iosmanthus-legion/default.nix b/nixos/iosmanthus-legion/default.nix deleted file mode 100644 index 8018ebb..0000000 --- a/nixos/iosmanthus-legion/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, ... }: -{ - imports = [ - ./hardware-configuration.nix - ./monitors.nix - ]; - - networking.hostName = "iosmanthus-legion"; - services.throttled = { - enable = true; - }; - hardware.firmware = [ pkgs.firmwareLinuxNonfree ]; - # video driver - hardware.opengl.extraPackages = with pkgs; [ - vaapiIntel - vaapiVdpau - libvdpau-va-gl - intel-media-driver - ]; -} diff --git a/nixos/iosmanthus-legion/hardware-configuration.nix b/nixos/iosmanthus-legion/hardware-configuration.nix deleted file mode 100644 index bf2adcc..0000000 --- a/nixos/iosmanthus-legion/hardware-configuration.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, modulesPath, ... }: - -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot.initrd.availableKernelModules = [ - "xhci_pci" - "nvme" - "usbhid" - "usb_storage" - "sd_mod" - "rtsx_pci_sdmmc" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ - "kvm-intel" - "coretemp" - "cpuid" - ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/nvme1n1p2"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; - - fileSystems."/home" = { - neededForBoot = true; - device = "/dev/nvme1n1p2"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; - - fileSystems."/vbox" = { - device = "/dev/nvme1n1p2"; - fsType = "btrfs"; - options = [ "subvol=vbox" ]; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/23D3-8DE0"; - fsType = "vfat"; - }; - - swapDevices = [ { device = "/dev/disk/by-uuid/9f505500-071c-48b1-9561-467ee3657124"; } ]; - - powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; -} diff --git a/nixos/iosmanthus-legion/monitors.nix b/nixos/iosmanthus-legion/monitors.nix deleted file mode 100644 index eda4276..0000000 --- a/nixos/iosmanthus-legion/monitors.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ ... }: -let - name = "eDP-1"; - fingerprint = "00ffffffffffff0009e59c0800000000161d0104b523137802df50a35435b5260f50540000000101010101010101010101010101010150d000a0f0703e803020350058c21000001a00000000000000000000000000000000001a000000fe00424f452048460a202020202020000000fe004e4531353651554d2d4e36360a01bf02030f00e3058000e606050160602800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aa"; -in -{ - monitors = { - builtin = { - inherit name fingerprint; - ports = builtins.map (p: "DP-" + (builtins.toString p)) [ - 1 - 2 - ]; - }; - }; - services.autorandr = { - enable = true; - profiles = { - default = { - fingerprint = { - "${name}" = fingerprint; - }; - config = { - "${name}" = { - enable = true; - mode = "3840x2160"; - }; - }; - }; - }; - }; -} diff --git a/packages/rime-data-cantonia/rime-data/default.yaml b/packages/rime-data-cantonia/rime-data/default.yaml index 601f050..f1741cf 100644 --- a/packages/rime-data-cantonia/rime-data/default.yaml +++ b/packages/rime-data-cantonia/rime-data/default.yaml @@ -59,8 +59,8 @@ ascii_composer: good_old_caps_lock: true # true | false switch_key: Caps_Lock: clear # commit_code | commit_text | clear - Shift_L: commit_code # commit_code | commit_text | inline_ascii | clear | noop - Shift_R: noop # commit_code | commit_text | inline_ascii | clear | noop + Shift_L: noop # commit_code | commit_text | inline_ascii | clear | noop + Shift_R: commit_code # commit_code | commit_text | inline_ascii | clear | noop Control_L: noop # commit_code | commit_text | inline_ascii | clear | noop Control_R: noop # commit_code | commit_text | inline_ascii | clear | noop diff --git a/secrets/aws-lightsail-0/secrets.yaml b/secrets/aws-lightsail-0/secrets.yaml index 884743b..62e4554 100644 --- a/secrets/aws-lightsail-0/secrets.yaml +++ b/secrets/aws-lightsail-0/secrets.yaml @@ -1,16 +1,16 @@ atuin: - db-uri: ENC[AES256_GCM,data:60yDAS/+wHhbaShYA3C6lem3Yf7RpJGtHKrx4ZpHIH4dyJQdu1OcKrDNO5KEPZPX1XO0d0TiBqS/Kt6ZoggVskZmrCl93C3id8wBiX8Q2JYKdSjYYwMCNFnZLva5SJfiJxFePKTGP5Q6ytxEW8TEZC4K8A==,iv:tNQBAzyWf1cEZJ/h693/XRJW7C3P60nP4/+y0t2ISaw=,tag:5UUGAVMt9nj/xAi71GOfeQ==,type:str] + db-uri: ENC[AES256_GCM,data:Nc+Rm1i/j89XPkHHTZmA4zkDhLeJSMhWPHj8BnjUJ0cfNdpAv2LcsyHr4hAlA14j6QbyTfGcufsg5erQzGOpWNmqC7FA5LOaXCEjSWZ4FiJAzF3GXXZ5jmvWiTjCltUiaAnN5K+3pg63EH8C+JibctOccg==,iv:Z3257FxY9byO31u9MctWGJQTEVxpJ7VU4CNS+ZndC6w=,tag:a1anpZoSVL90xmrx9L/gMg==,type:str] cloudflare: warp: - access_token: ENC[AES256_GCM,data:noJ3htBOavguIXnfnQSrWze6JENaV2ZYUOK/oshtcL6uegj9,iv:YadNkLO8pphf75Yacw9y++2ctx2lKL7UWEtF7sqZR2E=,tag:i293dORUJd4ik3NcdUaIHA==,type:str] - device_id: ENC[AES256_GCM,data:0F9XhZwJyARTiLuSR/5V+QRNHIs+VGTpc+Fkn5lb9bUcLYzR,iv:XuRG+JAuCDPxLm422fV9Q/1C9LhzMTniAY3RGR4K1es=,tag:MYefRDgFiiQqzBxk7bM3gw==,type:str] - license_key: ENC[AES256_GCM,data:WUjA+rq1jW7d6C0UxsBdOCZh4H5cRJhAE5k=,iv:0BDdfkQt3cRlEhqlrU6icAaG9dEcKWa1H6KrEi/gdeg=,tag:pHngTLT3PWB+H4NlzkcFsQ==,type:str] - local_address_v4: ENC[AES256_GCM,data:5ViaV1ZUQ0isya3+DQ==,iv:LP/PzB10mFnKJaGetUJaT0r8HGInlGlBOXJ+LMdBP7E=,tag:T3nrQLaBvXkbvW6v/YmnAQ==,type:str] - local_address_v6: ENC[AES256_GCM,data:8EaHLrKB9K8BqcbMewI3fpbUwODVwt5QPeJTQNs7aN7MkH7X4RFbdbvv,iv:a2/KZqzY9TVIih2uTNT1dtp4kgtPKcNR8xvbNGQqHx4=,tag:qELbjCNNpWO3h+iHe3ItGw==,type:str] - peer_public_key: ENC[AES256_GCM,data:Qe3gxFz4Ul5AJLVzTCk02swW70DpEfUDrlnTN2111+hua3wEHttVqFKW9J0=,iv:qq+tt4PbBT4S/WW3TSMxPqq/ugK0YohAz9rMRaYSITs=,tag:mEGhKiBly26S+hUjS5FbFg==,type:str] - private_key: ENC[AES256_GCM,data:0WQ3gdsAM8l04/2uOFdaQIRafPo4O8bWd1WYFwPyjpREWEDWMIQTUOSYRr0=,iv:rlMSjTVlydum5EvR5bOw7TwOUNMszSPuOt8Vq/mEreI=,tag:T+zhShSe/l7nDj4ZkGIvjw==,type:str] + access_token: ENC[AES256_GCM,data:0QAquxQwamiGt6F3E29rXpZyf7lyiC5DLHB/RX2nIyy4P0Zz,iv:1wNbtYZBxPwZv4K9baRKmO+I66gTCLKkvLtk7GZm0BA=,tag:lNJpggrVLgcNzXF8R8HQ+g==,type:str] + device_id: ENC[AES256_GCM,data:sYqnExnW3LsuVRzX/gKHWloDWe36a6/92bSWjoIyItAOwFNT,iv:elJTSEltojeIz1LjgiWO9emqJp3XpOZFuoiitRerWAY=,tag:SuKbB0WE4YrC1UKKhG3foQ==,type:str] + license_key: ENC[AES256_GCM,data:15jYFB7jDCvcawrfFzZR+F4cq8BBJdQKjVk=,iv:ngruzbZW3WkBLO3Bs2NKgPI5+/2w4y4hSXWJ7nfNyeE=,tag:tsMGePfRasB2BO9BZ9KhAQ==,type:str] + local_address_v4: ENC[AES256_GCM,data:FIIsT3OA3ZaDupStQw==,iv:7PKHnRYaye9qhFpDfCrB8pHwcLfyVdeP5LRH94yuEwQ=,tag:Uyez5jgYPDV8X0/DuspE1g==,type:str] + local_address_v6: ENC[AES256_GCM,data:ZW1ljmZ+8vpPE8+2p/kGp6EUrT6Du4T7xYmUaFgFczxhZATyLOqN8QF0,iv:td+ljOR8hyyKxoef9VaV0efUZVDtQIwRxN8JI/b/syo=,tag:HZvYWhMUhobdSig7z8WAPg==,type:str] + peer_public_key: ENC[AES256_GCM,data:8AfrPD7Bfzm52grSB3kdJQnzPRPbUS7j6rEJDmzgFDLVGn6rskJmz4GNgtI=,iv:l7wS8U80Jeql4MYhNBIuEQirwnOkM/mC2H4w48soxfg=,tag:AFU4YeTd5+nt99PhmFlVFg==,type:str] + private_key: ENC[AES256_GCM,data:6vwEPx+tHPv34gZwmVVpc0Cs4XACpkw3vUw5Zykt8A4REdSNg/Bg2p5yEH8=,iv:6RLOfTl/kHvsjnvUxry9Ctnn84wBFOqMpv56HJLKAQQ=,tag:KFLnhXqhzngVvXFxPkFoZg==,type:str] vaultwarden: - env: ENC[AES256_GCM,data:OVe/qMIevJcW6HlKcVMslxjhB9Qex5bhI+kz9QqBLIHXcRloVx7KWXvTY+fi4kSSKEjBsHhIw6LV7QA2+a9ILzThhFQiEK4VCmBpLS1bnAzFOMUOGbqEgdAjHUmQH2RnnhxdQDLmUdoWG0tvj38Wfq58BUTis+UjrSEzkHT4qUycYk+ZQSv4TBm9/XZuAiMuXhxOo5+RqkhZlWObkjyPM1DfsnH8PHAsHJDjxWAadAqSgJw6T9fwa035WpawoptZ4/uE24RBWE8G4X2ij4gQri8Bpn4X7Zzeb3OGRcQ+Pq36joGcIgGv56oH7YIS9nkeKjBanvY2gI77O2cAkpuumwHEFW/naZORlFmMN1TfNSySr5nPCUx4LrC9dWBIY7AwL58FS3EU7wVxI3QhhYb0BTYXMi8n/1y5Ky3HJl03i54616FPF+I831oXU8OohHmDQ2bJ7KVpybi2X0Sldt0zaAchlkPGJ+scwKbtclpLXQu/QCSfKQI6biVEf6BCyOhcgSYEN5e+oUyqBduAtC5D9wZnn3ArcQ8jzZzCaFyWEaN++34NGDBLlp0fy8mWiWOgzi03zGLLxa1CpSvIis0NeG5j0Myait5XFkjAyZFjff0BFQDmLmq/1K6ge8/HL+6erRPfhOukLnMMXGgYk0yTV5koYxEBn4TXZbb75lBPpdbxfzv96Dz4w8c9GVJ58iBAMA4XSw/Yvkcs7BNpo45AFUrgTkp2/NM01oZg7YS9yyKOYm4Kce7+3Gr+uweRntNM/YAtRK6V6dRvDEixraBYcbBZnehsH9/ww0FMC2a8aXNBMxHOFeYyVNZ50l0lJ3xq6yRprZ3trSYP3g/PY7gGMzsjo7QrT4cAlDyietuHVIjyFncM1/p+BZOHVVEyjBCp,iv:XyFpQSxIVkArvoqkFHNKZJ3P8UC/tNGMzM2vdry/mRw=,tag:CnKIUg2QRqCcNFItk2Zbog==,type:str] + env: ENC[AES256_GCM,data:1QevvQuq0xyiRHq/fPCtMH5Inwe5QcaLiozpi/onEqFMlsyRwuU/Oq/jxIc1OOuiwW6LmB2c7u9cBnDvhytHh+lFLwF/HkVGTi03rG0o4tsLXTJkeAArICV9jpwe+14Ddeqx7ZjvvUObCChN4ETFBih2Pku8eNMhfUyzgnJtvNBw+6qn6u2RjkGJmB/CFjeEVZFrcPBWN9NyBqRIQ1jjpH+ybLRwDuGO7DU2Ms0zQ9xJzqWHIUidWIxu0xXxspSbcteZswEivarnm79NgrHm+O2qjLH3riYQ2zMxWQNCjaT0ndKAT5/XjKBJwMA2cRJ3eP65dy+V7UMBjIwpnqFZJMspzfUtJYU5CNzkLQj8O6WFU8O5eLPhqeS4j4woepV/W7t3ugil6UH+8OcQXHUcK9njJxPM9o/iq4De2fNoYOd5LkTIDm82nMufowaMfcfSFAIG164FooyiTqTsAKa5wGDFswAiFXC83rBfsvrNrJGaSYzy96EeTXHNHhcykJ0ohRjUV5E0l2oPMsxQPjglMz3f1f4obEsblfwI26YLfN8x9xGVAajOYz7qG1bfNkUXgR75VWOfdKeEvp6gtR9hVLDG6A/xhykwe73B/knyuGVF9z37eFccR0JKYu7CUNb5dwuDajOY9InWwYP9DKW6THmFZV+Lxej1rQ4aezPbxs8u+6OuRsHjGYDBqQUVBOmiYkZH3+CvEKrpk9adRU4A0wXknKLJXNBNDIwiAaZlg3t1Ubff38AAARZZtiPCKG0pgf/7dUcY6DOYi+bgDOUowseSK1qEoFHTFHEDfXyzRUDOuiwPGSFErSSr2xAjv37vSG1O5f1UuWtawvxzkBt8RDJTWvulWgeaEjo3nL4BxxW8hv0Ece0bfXTwI8DCYT8W,iv:1g0AtQIn3q4dOiGhN7HlJRUOQulWmwQedn1p+gNgsIA=,tag:T/FNiIXdwJkLyq8Wrx+FNA==,type:str] sops: kms: [] gcp_kms: [] @@ -20,23 +20,23 @@ sops: - recipient: age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDcmJSMjFEQ3hxTm92dTJJ - bi9hSUlUZlc1UURnS3VTb1dqL09aTnRPZlJnCjZ5dWsxOWQ4R3NLRlVadXk4UERH - WER1bjl6Q3RicHNjU0lucDdKYlRkWWMKLS0tIGdFd3piL1c2MGlWT3NSNGw2eWJS - ZE16c3VWcGV2ME4wU2U5dHVpZGEzSXcKVRXderrc3Psf1RRAEvPmagBOR2aVlxAN - 6N7pEZPLl3UdAK9hN+pdW7rP82YdAzULe+A4bzRRLdYdi6eUGn9h9Q== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1ZDVlZFlmNGlLYjdpQ0w2 + dnRjWGFWNFEvUlBMSHhadU9rTDM1MmFVTEIwCjFmOXBweWo1cS9zRkpkMU5SY2RP + TmpxdjJvekR5YnJrSG5GN0JyUDA5NTAKLS0tIEZwSEVldUZvRE1CdXVMcWo3VEsy + a05ER0Z6VUt0eHJqek0vODFoeFVqMUkKqZ88AFwgCDNnnIl8L0MScphl/tCLZUJo + kZSGd9cR13yShNeQJ1Bo0Y0saVx1/rUWly8kVVoYuA4vKklPjEbK8w== -----END AGE ENCRYPTED FILE----- - recipient: age1hzjj23k8ckesm7aqvelndn2hkywts84892tp0xhl0vj7kz7kugcsr9fepp enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWeTRZbEJITitiT0dJZzBU - QlVQTi9VcnhHanFKc2wvR0lSTzc4RUVSWkNzClc1ci90L01HQXBMUElYZ1VQOEND - dkQySlRtUVhITDkxNFB5V1ZDU1BoVEUKLS0tIFpGaXA5L3pkeXg5dGpVckQzNjFr - MHFDYjZsYlUxcDhQOENlV0NtZ0M0YlUKjHop8jwA7sP5KtqjEVi7OCuQtmyFcP5V - lrac5sIrayFBZKx3TQcCc/BY7sX+Ew+BY143E+NA0OfdevtQnDs4hQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrRmZqR2FmY0ZrSW5GRjY3 + eTg1TEcwcGNiQ00zcUZoSjg5UnJqcFgrejFRClFkT0lGRTRvd2lqdGlrVHEzK3du + WG56L3lRU1NoNTYrblBzZEozbTVBYWcKLS0tIFNvOWdibW93cmhnVWlMYTErYU5V + blp3QXhEUk93SWlaNk92bklINnNwQVkKK88TBMoTYYLWLEJjTJPNxyIPDxC3emKN + gxZZIfjYcmpRmJzYWAED8hVX7bdHSommu/tmwpSbaVQsIKLIXaWo6w== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-09-14T06:26:16Z" - mac: ENC[AES256_GCM,data:+05Yn0KnJA3/5Kyu4JK3YHgFGfyCM4sQfc+DrrWZ6MMC+gv6YpSN3cSToL2VKduPlqz9BeJ/etacAlTl3kDNfgmtC0dwMaS12z5IJQsCyrSHFnPQJJakJWDvTLeWYi1Dv7ZIutylmP4Wy5XxYZ3pDhGfiqPqxlU8TVsPvDKbEiE=,iv:QyqdWz3ffMor9zg2ULk/rf0L3PvnEvXbEwQFMBpkO6Y=,tag:m53LcrRcebTuOqyHGwjlvw==,type:str] + lastmodified: "2024-11-29T09:05:22Z" + mac: ENC[AES256_GCM,data:C2a3DX+cLxZ+9Kd+1bIqPC3q/I8BFrO31qrSYl49WDOhHwXi2iXscYUQJjUytvBnSiv1KQuKgtxaB9bHpDNgLGOVHpFuVawW1A6DAYnHYoI9aRRXraELMw5BS4osb3/7xj7rqDzvsGPXJJ7soTH3IMSOEudPSj0iVpS5EL3NpIc=,iv:ZIavmgvTNKyfxO2gLPAEcjgd437rYFdUYqetBckritU=,tag:AbMDQJ3znKSh7nlhFBXGMA==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.0 + version: 3.9.1 diff --git a/secrets/cloud/cloudflare/secrets.yaml b/secrets/cloud/cloudflare/secrets.yaml index 2edf38f..862fe5a 100644 --- a/secrets/cloud/cloudflare/secrets.yaml +++ b/secrets/cloud/cloudflare/secrets.yaml @@ -1,5 +1,5 @@ cloudflare: - api-token: ENC[AES256_GCM,data:HKokJJMWO3phQ5Sg87AbLNxtdisYtwHi/g4tB3Q77l+Uat1GVSjbvw==,iv:9kJQTijVPWNnwZAnWw2wO934QrtyNMBKDqS9QZIB+rM=,tag:Eo5XeNBZt1x/O7UvMIjmsg==,type:str] + api-token: ENC[AES256_GCM,data:UzcyAniMxG2VV35rCftB3u49+t4rruEg2pgw2AdSqMIxW7IVOZGbLQ==,iv:U4KuAFlotS9vie/1BXoFaUsBprfo0Z38nwSkoEZ8qoY=,tag://6U/S3tGBfxM2ppCgOLbA==,type:str] sops: kms: [] gcp_kms: [] @@ -9,41 +9,41 @@ sops: - recipient: age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiY3dmZlJGbWFMOUxwOHdO - ZVFVNlkrcDQyMTE1QWExQk9XU2dJVER3MkUwCmFWdGRkRVd4Qm95UEZRUVR5WjRn - YnBoVjF1QUhobUdxWUpneW0wT0lDRUEKLS0tIGN5WDlXSlJLcGw1KzBaUlFzY0lI - ODJnU28rVklMei9mWG5qQ1YrV0VnVFkKF+mg19xGlG3ZSDiZfZo1/r7xSIrrQwO+ - WUw9IiKetMKFIGZLCBuhN2NiyZcMDCS8FD+tz8qxUUYbiwcxcC2Ewg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2MkZicjErVi9oNkplYkZz + cjczdHZMRGVhZm5jeFMzdUJBM2hZeXJMdWlBCmZQclhGZG8wWlJJZXhHWkV2Qktk + NUdnK1F5L2o4NmlyVzBYRnRuNnQwdEUKLS0tIEdwNFpLMmE5RW1LcTBLWjRkemRt + MHgxR2dZd2JvRWZVMkhJY0hhVmJwM2sKhtBvyHIo/c2Sxmm9+/hSSKgwDe58AZam + y625yoqtBr3G/baE993gnL47YqKWHW/tMhfQjY8cnjWMw0k3HpV6lQ== -----END AGE ENCRYPTED FILE----- - recipient: age1hzjj23k8ckesm7aqvelndn2hkywts84892tp0xhl0vj7kz7kugcsr9fepp enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKQWpoMTNWTlljMit0eE5l - SktOeTk2dzJ0V1pxNWFUT3Ivd1hxKzhIVXc0CnlvSXVTRGtCUUdKanptNXpMM2xz - WmVwR1VQMjBtR1grTk9UcmFNVEo5TFUKLS0tIG9zVWVuU2dXTUdyZkZRSmY3R1B5 - c1hNVGovb2c1eEEzbHRWOXpDZnBWQk0KbRFxJHmqjigkDVQ0DLdOvvX6Bb/wYvZA - sybvOJ+MZmQNj06eYv+Ae10rTeQsISTVtMxAjPM6y+Q8M8MfsTElBQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxWk1uWmdKT1dYN3hqcFdX + SEFDQUdCa04wRm55Nlp4NDNneDNkODFzeGprCmRUbUJxRFJNT2xvUmVMTDh0Znkz + c0ZUSTZqSDViVDJ0QTRVMTdnNlJUbUEKLS0tIHdwQ0N0NGVrSy94NzIzZUtJR1lt + MnozbDR4dHUxak9QR3dZbGpyVVNNdmcKOo8g2MEM2C6uC8RnztImR03Mr7RJjjXO + jkua6znW8pay4MqjHTCMj3s487L9EXjaJr5Ouetdo0n6e9BiJvFlsA== -----END AGE ENCRYPTED FILE----- - recipient: age1ycgzpgz4vscwfknf2tyvr65c6t95xeffx3qp50r00u83xlpfmgpsx4gyr5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDb2N5V281Nncxb1ZjcElC - TWl5SVU4UCtwTlFCdnhCa2dsQ2FSbjhZQlRFCm5vWVl4MzVPcHdBMDJYUThkOVJX - ais0NEhQSVErSEh1OExjNlZOdy9vVlkKLS0tIDlJRVlNZ1FWKzNCSFNHSWxzVk1Z - Tm52QXh4T1JkeFhWVjdpUUxKN05HZFkKjk5Fp0JEE7URwFY7Wp/hDQb/a7ySgdKV - NGc7g8mALV5JmINF6M306MinYhTjo749vAlFOjGEuuPjoJXm8+3U8A== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOWSs5ZHFlZi9qNUdRZzYz + QnhsOERGQVBDZ2ljWTl3MktVb3pWRG16NEdJCmJvemRDYVpUb3gvU0RtRnFEeE82 + M0Qyd2ZzeVNuL0VsaW9oQWZSOXdhT3cKLS0tIDdGQzJTZTU2NmVrdGZrSEozUGRj + ZitlT2ZNM29lRkQ5ZytFRUZIS1Q2a1kK5g3IpELPtF0PWmSr+66YDe+QzjGZVcMV + 3qs4nD+HhxTnQwORZATmI2Jxw7Tjm4ejx4BDrc5CYfgsGoXbHMdJYw== -----END AGE ENCRYPTED FILE----- - recipient: age10zmaa6d5pwsqlxhc23e5ytz66k5nfxhry7fxvtayn0t5jfnl5yws4qe7pt enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQcEhpRE8rUFR1SURHYU4v - QVltSzBEd3BsZ0lhTTFCWTh2UFpTSXYzdXpjCk1UeWRBMnRtd013YlFjVDQ2Ukhk - YjErVDhycTEzUzF3NlRxcGFtOTh1U0kKLS0tIHdKRUViNVBENTNpdWdJWStjdWhI - aTZ6dWRBNlFxYjFQbFNJeklkQ0tucXcKeJyF48FzzqyNgiXYeiUCY+311t8rgdN4 - ESNJvaiS8cp4xasmOSweKsv/8gg44ftTHXE9cT9BVjgRom7Uj+bhJQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBURGQwMDY4TmdnV05LLzAx + Y3hJWFdpR1JwU2NRODh6akNjTDlzb0dBeGtNCnpnRGxNck1nNlNkLy91eHRldUVK + Y3J0aXdVaVh2SzlkSGI0TkwzRG4rRmsKLS0tIGRodUlsL01qTDI1Q3dMZWdhWlZ2 + c1NqQ1FXcVV0TkdUMkFPRWszSDdaRkUKEPsLO5gKOgmLQ5iu4FqpubrsArsUT6d/ + VPt1U5cHtuWFZe3WldmQsr/Sc+gPdvz7OT1psmUgc+sJD9TXRlwp+Q== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-09-14T06:26:16Z" - mac: ENC[AES256_GCM,data:1eIf7L/chvGFsmHou+t8y4C8xivWUrx7506KEQfHlQBtrd0XwlPFLAcJ/0H/jA1oQbhEYVS1ZUSTZmblGxDT80zqP93hYsoP5eOjBGUgRzD1C0AI56jcFJOUD46x3LIbWewZI1Q4AzjECHu3QotDrnijhRsVW9qke2x/+mIwusY=,iv:uye62oizmJ8fGdQ+8u5ceLf6lbDrNGO1IXqXHjwmiGU=,tag:6RCT3AfjsuiIhj4HiHlVqQ==,type:str] + lastmodified: "2024-11-29T09:05:22Z" + mac: ENC[AES256_GCM,data:qqd6ZwC5pY+Ba0BdnJoq3mRYz7udhk8X0I2hbpaMGcW577v2+syYRmGxWWPk6OhYKJrh6n0cnJss6CrC07cubjhgII7a3zAi1ZIU+MOGhC5tASrpYzJIqYi3DHBZGOnHOQWjfqbNFGXX6AUWWItyHuskhU4QweB9EQB636ih5KU=,iv:CeX69BKOm71vryVd6qnc2l5tVABf1Qqkh/RXIHeut7A=,tag:55dZT/jDLCfpRQaT0ecw1A==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.0 + version: 3.9.1 diff --git a/secrets/cloud/endpoints/secrets.yaml b/secrets/cloud/endpoints/secrets.yaml index 970069e..b1d3b56 100644 --- a/secrets/cloud/endpoints/secrets.yaml +++ b/secrets/cloud/endpoints/secrets.yaml @@ -1,9 +1,9 @@ aws-lightsail-0: - external-address-v4: ENC[AES256_GCM,data:zLEgqYDOv9MYQVvjpiBJKf8LdOq1pBvSVDIdUMxPP8I6hlE=,iv:r7yFzhX6L2BcqRCi7IvHr/cjrrDluLn7MIFQttrdry4=,tag:f3lDVZ0n26/RXOs7WTGQyw==,type:str] + external-address-v4: ENC[AES256_GCM,data:+jE3Y/ywHqEnWCv1KuBXZd+GgNdR9scuD+lxwZt4XSr9X7I=,iv:lNOWX1T6z5ZSfqvOD3bSrLcJkVgA02qicW5eJOuHvuM=,tag:Si/M7gK2bMMZehRj78wvqA==,type:str] gcp-instance-0: - external-address-v4: ENC[AES256_GCM,data:VEBDOLrDEuqz6RbYYtwqMDCBJIPkc97HdBfXPRubwTk=,iv:tiG2qRJkwdvGOSh+mRnCng5M28Jl5RbdQB0uurDu36k=,tag:rTNBe1Tx83axr9IqGLZAAQ==,type:str] + external-address-v4: ENC[AES256_GCM,data:GbETOuU9fziB2c+HxIr4yX3o43CvgzmReE0W/l6Xlkk=,iv:nKXdZrh6ix7ELQLpcgjr5nNf+hjceaxbkK+k3x+ymC4=,tag:pQNMYcZgE/n3qRHO77YNTw==,type:str] gcp-instance-2: - external-address-v4: ENC[AES256_GCM,data:xeUPvTB/mCdvFldfXL4t/GEr6WB03rJRLujkzU+vNnk=,iv:kkX4sTXImQq5uBJdGoNgGbHTBeWqiwFP6eotYbodwhw=,tag:PDTiR7RNWx5kod3dfFtQ7g==,type:str] + external-address-v4: ENC[AES256_GCM,data:FmEAQT+O9AddS1Pm848b6YeoyvZk650FZXCX38Rzbx8=,iv:K5SC0dBSwNQmYRGqY4dcbilZyvv24oQ4nkJ+sPOqWhU=,tag:p0W0zz1FUD8PH0VhJ05Dzw==,type:str] sops: kms: [] gcp_kms: [] @@ -13,41 +13,41 @@ sops: - recipient: age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqanZsaE11MjRnOXpveFpT - Mk9zWlY4cnd2YXZ4MGd2Vjk4cExxdklBKzI0Cm1xRTRSNEVYRmRkb25KaFRMam1n - OUEvcUhvN3ZtVmpUTkF3aUFXU1BjK0EKLS0tIDVzRDAvSERlTjhUTlVnTnRGcWhy - anhvd082N0t3Zk84T0k2dEFCR2s0M2sKF+l4KJ+qSrjB5bUvurMLLgnMM/8O8HJj - pRNZ3m8xT6sls4+c3r4FMTJOkMvQjA8pM8F0AhGt8LPelSUDXvgE0g== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRMXE0a0ZIMVp4cFdJY2wv + NXcyRFpERDZLcWdJRlB6UENpZTNiWkVxSUFNCmZuY1crSVlUYmJ5eFBMOTJ0RzB4 + a0FhL1JFY2pPaUs0NVJ2dTVtZ3dqRE0KLS0tIGJmbEJ4VVlrTUh0YnJzY09yUXgx + VUU2YUZPaXgvWUNrSWFaVGJ2RTdpa0kKp8Yu0JNQmFGlo17TY82VCRDjR07k9B56 + GjfYwZpn8nhS4caa8i++YPR+TPw0a67QFN/gS44scFn+zZ3Wh+Vwvg== -----END AGE ENCRYPTED FILE----- - recipient: age1hzjj23k8ckesm7aqvelndn2hkywts84892tp0xhl0vj7kz7kugcsr9fepp enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJZk42QTFFOUs4VndueWtS - UTVEWjRGaUNLcGhlQjFCWFFHUnNjaEtqVDNZCkViV0hJM3hrSGNTUHIvYWcxb3h2 - Nno3Y2RjNW82MWJDU3VBbzZrNml3MjgKLS0tIGVVWG1TMjRXeEh3OWtGRzRzRU5w - c2lKeWRFcld4WjNEM3NtZWdOT2NralkKlkYHlGecUOviDENtjk+udLP/48lu00rz - BBU8RJwfflweCs32jmCGAaA0vu3kRf/e25akzU51BZcoy+dQ19252g== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGSWpyZ0Vucy9NMm4zMEZD + WnlGbW9GZUJaVXlQQ2cyYjhwRDkwaXl0UG40CnUraml3THE2a2cwazhEQThKeEFw + RzJGdVRWZXlUN1ZQSmZCTStZaTcySDgKLS0tIHdmWHQ1d1BDcm5VK2xaVkxjeXFK + R29od3RLY3RyeGkyem02ZlU1clMzYUkKrWcNfk80cuX2cEpnQdMALO9rnwiacnhW + 1siH8q6PmiNaSCKkMXTz4Qq9Y1YcC2aytC4h2T6Nlqc0QtXrJsFm0g== -----END AGE ENCRYPTED FILE----- - recipient: age1ycgzpgz4vscwfknf2tyvr65c6t95xeffx3qp50r00u83xlpfmgpsx4gyr5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2Vjc2K1IrSzQ2MWJZVFlU - T0kvVGM4cmxUQzgwZm1sUjVPZlpNOU9Fb2hjCmEraFZXbGJEQWVtYm1ncVlkeTMx - dVJBYXRTem5kbG9Vb3BuNWNMbFZVRWMKLS0tIENDeVY2YVZRT1dNWDZ0ZTZ3M1hn - blBsZENFK2c5UVQrbUZFb2Q0SWxmRlEKKxvPwzLnXJWTanmtmyNdblwJSwnYNNPA - l2ZIyBFnjWjcmW9pAWm+lUFZL5D2h/oF3+ev2OL3Urk8N5SVpJuRNA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4V3Z4VkNIeVdwTk91SmxB + dnI3Qm9ZV1o4ZHdPWmxjR0NDNllibTBJdGdnCldEaTBSVGdGdCs0NVlnL1FDREwr + RnFSeEZGZW9CUUV2MEhwSTlLdDhrczgKLS0tIEJWamNoSENMT0NxT2tZa2NFWmgx + RnZlNU5lVVVXYWQ3UTJvZDJxbS84bDQK/YuwLmBdNBQi5wAD4mRWPABUV9PTyLOC + b8a3HxsBCfMnPRhaejUO1zbqtsr1KB4WAukTRKyQP1pL2/X8L5NMPQ== -----END AGE ENCRYPTED FILE----- - recipient: age10zmaa6d5pwsqlxhc23e5ytz66k5nfxhry7fxvtayn0t5jfnl5yws4qe7pt enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByM1ROU2ZNM3ZYZVhPNlJ3 - d1d0a1ZESzNhQzhKRExadEZZaGwvNmpITFNFCk5seElGQ2hoVmV1dmUxM3FTajRM - cmJROE9FUUczbUphZm81U2ZKR3JPSmcKLS0tIHlXdzY3cUN4MHNzR1ZqeDdWbUJz - ZTlqTWFzNVdISHk1K3lxZ3V6ZGhtbEkKl1QlCJs2Lz6kdcJHgJjb34MkiSYmDyx/ - FTfFiFjeVRN6dRbIc+gk67XgLJJiCM0a1W7W9eqfPOoakYnZfZUu2w== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLWGlEZlB3QXJUT1RRRHZ6 + N0thSHNnTkg0eEJtdUJHNjJoa0Z4VWRLTkJ3ClRDZ2J0M1NDcUFwejQ1cjJ1bFI2 + VWNRS1JuWmx1NkNtTm9hcVVVWnZJQm8KLS0tIGdtRno5Yk5nK3NFdnVHaEF5N25C + bCtSQWZaOFREZnF6QmpQUnJrMEZFNGsKdZbGhPaEYN0gb29t2wu5t7A2pPtTQ2/n + LplGIw3p/PU8j3IPIOYnF2B8c9JSO7kBveWmwcaZ9KLMUN0VUFvLfg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-09-14T06:26:16Z" - mac: ENC[AES256_GCM,data:wVLRG/jeSToSh7iJLAoUyNIi91pjPA6/wKcK5qMgCmXt8qAzsfA3D0mIm1/WykCwCkkGKty+LwatBPWop0NjI0GZpKNZo6c2kQhwhBlLHDCI2JzvSgNjW7UH7vhfXC+AczGJHdUri/nHTlqeDAOjI30dxMTgB2KrxqAJwyBM7Rk=,iv:xUvyGJFaJ/aLaGkrmLYsjGY05RgwOq6BNkEvn73BF4A=,tag:wVSJdBjQzbm3LGIrJCyuUA==,type:str] + lastmodified: "2024-11-29T09:05:22Z" + mac: ENC[AES256_GCM,data:YVcp/+K819SGmqCvm3Oq0y4jnssps335KjDpQl2l9h9F6SH7Boo+Hc7r0oMDBPmtfQdQoM7mbNx+AGy6R92xn1tw/hR+nZlDBbSXzba7qa7BZREeG5Wt0PaAbYuPsNB750oXRT0OCEZuFbSbFv4+65sp+ys17VK7DopEmksJVCw=,iv:npkjepRIDhIrmAwIVx4Ib5mGjKWIsCJEnUS6hVM8vag=,tag:U4oJdV5Lrg0L40oQ9S9iUw==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.0 + version: 3.9.1 diff --git a/secrets/cloud/grafana/secrets.yaml b/secrets/cloud/grafana/secrets.yaml index 7a9d641..848000e 100644 --- a/secrets/cloud/grafana/secrets.yaml +++ b/secrets/cloud/grafana/secrets.yaml @@ -1,6 +1,6 @@ grafana: - prometheus-basic-auth: ENC[AES256_GCM,data:bVtQ5ccGEplICT1L/KYrmNyqbzDvxbHQ8gmZmTVjizOt8skB+vilTCP+VFiHBylklzDTtib2thbFjmVj8LR15M2CZLRVxa97bOU6vGeiDGhwguHMJTo98I9hlztnK1P/MHnSS0OtWmYAjIQlPosULiFrNosb4lf6sY8nTC8NSOOr+2JFVX/ueDjEGJx1mjboOj14wFY7MVCwCLzX6wnQHVnvmD+4T1QXI2dLW78wBpB6QzcjVycU/yt7AX9pKuhxU0aZhcRyOKqgeB5SBEGSopJqrR6WwrfniTx19FWRYQGNekdLsuTP2N5kLcI=,iv:BniSgOV3LDfZPIfQD0szBBY2Hxsn4XebGXZHU/YnPXI=,tag:JzdQ0DBnIwTXHyNimLYNNg==,type:str] - promtail-basic-auth: ENC[AES256_GCM,data:ZUB6iOdsbygK7wzkeeNOIzfNU85rjQZjzhLBcCZi16ShBuiDJE9D8PMOOLtHNOf6tHlFsJWSuLADT/91xzflw9oiEuNHbF9xoGVzOgSjNF6Xo9GjuRn9D+yCf5quzkR55PMAz8Xpjd8/KklEIVuKElNIJz+LDiXWzSENaTmAsHPMHD0fgwx1ldRWxoW9E0ypEomzCsxFloSpLjYETGrAik6V9OxVm16JQ6yLsSds4oA5q4nZlOxByqNnCWtV3fwAsAm0rkQV2P7ZRJzDe/VmRSKKoniTHIViC9G06KHMtVrkYIYs5oiBTBw0F1s=,iv:omyGSguY/dfeWIPrbbCVHKMtg1WdNJgqwILiTz1WDQ4=,tag:3kEnuZw7XQoPxf6pKsBhQw==,type:str] + prometheus-basic-auth: ENC[AES256_GCM,data:r71b9/dk0smjLxqUXVSuRZONcehb9OZpWu6OrpUr/3zxYNQCcv3AX4QiUySDi1VKLSej/o2Zk7aB/8T6wHpJEvn2iPGAvGc0UZUgnOzlVxL6DxI8PAZR1kbYm5U+z5aKLrNr5Pv4YO2PVx6HUnSdaqKaSjt2HtpgNXBVPCeFN0LL65u/nYFycBene0iw6VeFHa344ETTvlTQKDI4rS1KbaQczg0L9JMKyYn9RikXotaGMZ6UJ+WvkVDcstjos7cJtcIKeL48QCChSeLJKrU9v1yv9uMrCldawzJyaC0aEAJT3WE9trN6rRqemuM=,iv:MRsQ9C1kCklp7Ux1vQtqKE1DA/POq1AdElQmoNIsYYI=,tag:7ehrYySnZQQU4zL1MeMo6A==,type:str] + promtail-basic-auth: ENC[AES256_GCM,data:N8r7KcisgIDJVGERakTyoLg6W4KhyK+x1pUnGnfw8iWbq+K1bEi99EsV6rkPzhsrHHKGDlpJgZDHlMLtyQ4DpGGGpENwGsl2UqgR38o40YdAwH+dj4PTnSvg1zdpvZDPi20dkVFr6X+sdCKZyYgh6xdoubOAy7wsC044gKnXqURjMZMfmE1FArK36kpmYtW5C7QVFjHHX+rMiBECdCLbbRxzXZcMsNXGucBpHTboSVaA1k3uGp3p0Hy/p3T4Mit6i/pwcDZYRAgDhWTPh4D9tzk8drqHcDODfI+AZQnS5msY7TMku0slKyTFaDc=,iv:HErqSi3VixqbhrQ6MO0xpBey9fku7+STvV+JUrZwlSo=,tag:TpAzzgy7SkP083Dz3dCFDw==,type:str] sops: kms: [] gcp_kms: [] @@ -10,41 +10,41 @@ sops: - recipient: age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnT3ZFT0l5Q3NUV2pyaTNN - U01QYUN0S2lRdURzQ1dkTXJVdTcxM3B3clhNClR0dXFVbWpzWlM3SzhuQThOaEtR - Vk1iRkJvd2VhVEU0V1pYNXA4Mk0wWU0KLS0tIGlieDlCSzk4VXZWNFNTTW9RNng2 - UlpDL1pZZ2N6ZmkycXVaZXJYMjB4ZjQKVpYNSA5Xyck1nE7+BWOs4oipx8F+gzB0 - 0/Bq5u2aa3RBQy82oRkynetUq3xZ1oAqppLTzEReL/QKPMJyIt3ePg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0b0JQR1hCSmErOG4walNR + ZytqUWR5VW1saU5DVnJUb2IxaGYwa29PajF3CkhUNy9YN0ZYRXQ2STAvRG5ETit6 + NXdzM0VVREphSnY3UkQyc3crZ2lFUEkKLS0tIHQyUWUzaUIvQXgrWk8yMmpzZ1M5 + ZG93dkRDNG4wRnRWalI1dUVhbEs5U0UKgCqHAFnHCvNad41Vv1x8v8bY9+xetKNm + sfRl3yX4sCY9qnFbrsnlZfyGi86Ks1jjqo3GibzzHuGQxpRR2q8v1A== -----END AGE ENCRYPTED FILE----- - recipient: age1hzjj23k8ckesm7aqvelndn2hkywts84892tp0xhl0vj7kz7kugcsr9fepp enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoKzlEVnV5bnUzRzFmd3k1 - a01RQUswSzJRbkpHWUVmY0Vray9BeFBWSERNCjFWa3ZCZWNoS0N0bEQwRVpQeG5F - K1Y2cXA5VzRtWUdackJBTFhXeklhLzQKLS0tIDhwTE1OKzkrZnRZbit0VDdMZ2Qz - Qmdyb0RRMzZaVURtQWRiU2N1VXV4MVkKq6MHTWwDbS6/SAV0F3Z3MZ2un5rF+2Qv - jruz7XeMlSM4bBFzOVYbTD/JeJvMO4m5ZDhJBnuMQjFhYbAftLe94A== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjZ21hdFJDWjRpcnVUeXJt + SzUrVExNUHVFRWVRZWRkcUJiTTdBZlBBNXhBCjQxRFlCUlpnVW5aVnZBeGU3RjJC + WlhJZjRpNWgxMld4aUJmN0l5VEwwdXMKLS0tIFJMQUdJamJWeUlORGpOTU1qYmdU + SzFoOFRCT1VyU0N4REVqdlZqZUJDVkEKm/pRiwm9usRqc8KamUsWellAXredGTAg + 76urAjErWFh+m+1xz8revawGxGVt0NKFqVIbHWB5PYkT3iA0SoyRkQ== -----END AGE ENCRYPTED FILE----- - recipient: age1ycgzpgz4vscwfknf2tyvr65c6t95xeffx3qp50r00u83xlpfmgpsx4gyr5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSa3o1T0ZBc2RaandpSnBF - U3kzMUduZWxWWVlOOHRFY1o1RFF1N1VNQndFCmUrelM0Q1Q4TEY3a1FqRlozQ0ta - M1NsYnhBNUpPM2kwcXkzQU13OTVJcFEKLS0tIDVhSEVFNG5yUTNyWmk0UUs5aGN5 - UWdOM3ZtU0FZZWNZNng0ZkROQW9MOUkK/5GtfHR8oR3nZXnNmJa9FLU4KWiFJ5Rz - xyEswDQvj9e+Jd3IGcGJUWVJjWNgwqSeb+XyjR8Iu5t0Jex2FPddxA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArbmtsNVFzWlB6VkpqTDFv + TGlVaXRGZkZJMGlNSHlZUWFJMnZROUE3b0ZJCnJ2VC9TZmtpYzhvcjNUUlhVblhO + SDdDQ0Z0cFdsT1Y3QWl6OEQxNDVrL3cKLS0tIGtQc0prRmtiUVFjbm5KUlZGeDJH + Z2tPMFpMc25wUStrazUwcGc1L1g5K1EKU9O4mFxFtvLPTUrjfjJ36XmxjfjtPoPg + /3+d0Qiy8tk3gjOcHW2VFmzGLK64PZNN+aYLdM59GVVNv4eUa9x6fw== -----END AGE ENCRYPTED FILE----- - recipient: age10zmaa6d5pwsqlxhc23e5ytz66k5nfxhry7fxvtayn0t5jfnl5yws4qe7pt enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKUkJ0akU5TGZBVko0SFU3 - VkRaaVVSNmQ1eEszK2VEZ0tGK0YrVnA3TUIwCkRIT0NFWW5wak9PSTZFOXFFalZD - MVV4VnBWcHVDNEVqUUFTSE5tVWpKNHMKLS0tIDZ6Qnp0UHBXNjF0L1grUjdDdEh4 - WDlzL28xUTQ4aDk5TDRYOUp4aU9WWVUKP5yJk8ZCv/o7JDEQk0J37oRbGOGISIZ+ - u1AZImr2sNcC7gYdAiMLy6dcQYJAy6UH8pm5NN2voQMVjLNEKDFRZA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVNmNNRHVOMnpOdndMM1JH + YXN4NlcvaWFvVzFzU2YyMkU3Q283ZWtHaXdRClVxRkRVempBSW1EQWlJZktuQlc5 + SVk2MUg3NGY2Q3cwU1IzVGRycVJNNE0KLS0tIFR0REZVN0lVN0xaaXNPZFFOSURs + RlJIRTg0L0J2Si9vbDhKZkdaUGVHdWMKfxYaHgFkSvnuGAGMVfMxvhLSw6eb6EVK + GUvVoR8LYO0O5X7xZZmURI+M0bVuAqKCzwzVADosglqgMTi7ALx4ig== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-09-14T06:26:16Z" - mac: ENC[AES256_GCM,data:T9OvzSm+VJ8pkc2hLITQO5THjsncgu0QN8TQ7puxEqK8GAwcz6dEvatxOsdNgE47SIQBhtz2Gt4dibZbzk2kfX1jpyzRAGxXfcyA8qjcUf8j0L5ukFlhxEqp7PEHb3c5bF3lU69szjTFglcCtq9mz4cve4NNwjS+Rhv5GddDtY4=,iv:FfDq1867FImgDPArZVLuQAjmPtVF819l7SlrGKzZq4g=,tag:v9paZ2Tke//czxVt9s06Pw==,type:str] + lastmodified: "2024-11-29T09:05:22Z" + mac: ENC[AES256_GCM,data:OPsqdaxC/q3k6DDYGz52pIJwZE1yYt+jmMGbXOmcjz2J+COdsdUvklaom29hMKs5nuGfjPrqiHSCQkxMI+r1X+W4m2pV/GTzH2v2x2/4M0id1oj0I1I9IW/qpU9BU8ZhpD+QSxvZP22zBHASsnXi95m/kcUk8Ptpd/7vT19/i0k=,iv:VyGJwEl7HAZVTCF1lzzNmpiuEMdR7A+3Xg1mG9G9FD4=,tag:0slwrpBjG6KM98f3D+SbvQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.0 + version: 3.9.1 diff --git a/secrets/cloud/sing-box/secrets.json b/secrets/cloud/sing-box/secrets.json index ae24f33..7f40d77 100644 --- a/secrets/cloud/sing-box/secrets.json +++ b/secrets/cloud/sing-box/secrets.json @@ -1,50 +1,50 @@ { "sing-box": { "shadowtls": { - "username": "ENC[AES256_GCM,data:ZjHs+unB+g==,iv:ZKOqfQNTdvn2d46E/a1EvXhzOnbZ6X/Or8uHszdIYKU=,tag:Fwa4BFxhqLKEx1FKwvD8tQ==,type:str]", - "password": "ENC[AES256_GCM,data:KZJRzHxv+tM8G1WRhBlUDKEpewiByu8JP6e+pXN7d/LnyVPEVhEUPLJvTV4=,iv:/acl10JwGSTSgIHsdflRrbm+ow88Ot5rdNEQmJfIRPA=,tag:7hcTwZQrgwQSMp3zdiucmQ==,type:str]", - "server-name": "ENC[AES256_GCM,data:pSfbM9Qqa/yoSvyP0+Ly9jVNO5ZOKvQ=,iv:uUb9UOfozW8IoM6wvLj575/FG8521kUj+mZRbQ5HhbQ=,tag:sHEny0ooJ3RANjdd6+5urQ==,type:str]" + "username": "ENC[AES256_GCM,data:8BYbotzzLg==,iv:oy125PaWgZln6s1uAcUn8G43z8jI3Xu8CSAcSRW3Ou8=,tag:enlsBkGUULIFFwUc0FXVPw==,type:str]", + "password": "ENC[AES256_GCM,data:baTj2uDjCf/hpMGLfZdIPqCTPh5qsGpjwkGVks9XWKzUZwKbLPplPYTUoZc=,iv:igEvbRI53gjXFIzh21vJwtp9J9v8g8C1ZlRFRuvku2g=,tag:081uMAS+R6cfIhe8Bx+n8w==,type:str]", + "server-name": "ENC[AES256_GCM,data:lHl321VAvTh7N36DiXZciSTYGL5WYvA=,iv:i8KLjTZCQmYriFKH1gIbeyl3twsv784PVRKWmSXYq6w=,tag:f3XG9+gMpO51gnbN0gATmQ==,type:str]" }, "shadowsocks": { - "method": "ENC[AES256_GCM,data:69owG6tULv9jY/T9kr2wKzTP/E6CLoU=,iv:zjMVaE0+EDbq77D8Hf3s3qNwx/53CR6MfDRQBIaqPwU=,tag:yPOi+Kfas8W5vVnI692ANA==,type:str]", - "server-password": "ENC[AES256_GCM,data:+BamZEnjrL+D+wdOFcOInMB0XbLrGJ5GSm8VjR0Hmr7gIFxGJYHfqZaoTY0=,iv:Zv7s3pof3AFS3RkFy3fG9poCvBE3IGOz/zCiK5gcVx0=,tag:f/vgdQCvemu/CkqmWysS7Q==,type:str]", - "default-user": "ENC[AES256_GCM,data:C4TB5Q6v6RWwmxYrioAU7cZfLOmVWWQhpgXz8ywvdOUD7T9ZZA+LCGgbh5M=,iv:9jiK+yg1bNEMiojzX4j6/kK6nClLtAQak/M5yyWXGRc=,tag:7GGAUbhhODRwMLywMz/Wvg==,type:str]", + "method": "ENC[AES256_GCM,data:Fl3IJ9Yc9+732fZvzrvMijvRoRo2dbg=,iv:9fZ2FiHGuYFWUp+SjBpWxxrEoPcrfrc0wkccDZQ0zNA=,tag:cn8PdZCfyzsBQdy7MkapNg==,type:str]", + "server-password": "ENC[AES256_GCM,data:tiihnHPUozfoyYw9zX2tzWBxZYx6zAnMW+hhlqmx17a/T1qYeQ3dBWBK9Ls=,iv:VETF9hnmuF+awLOWJDHrhxAQyugmwhQK0bvP81R4G2U=,tag:LLZh3pkRMN4jGpWDNPW4qg==,type:str]", + "default-user": "ENC[AES256_GCM,data:I5GotAHCELVxbY0pJXDOZKAWUHbfxJRpRwVBGCHhvUfFblLK9ug2DncwxM0=,iv:lG5F0cUyI9ldTPDfHsLzmWNvQwUQCWAsXV2ThmprP1k=,tag:nuvTGWal8sOAryPO/o66mQ==,type:str]", "users": [ { - "name": "ENC[AES256_GCM,data:AJICetvl,iv:gPzKzTaKaRzYJS5kaIVGyBKx3g3lJ07eCmz3/LdqAVk=,tag:a2B3y0X+CxFQVtwIIQrSUg==,type:str]", - "password": "ENC[AES256_GCM,data:qIsJNfTEfBVBOtwLp1K7v0vtOyzstaKbkQ6xGKWRmTGpT5cNQ0xvBdTqazk=,iv:4qA6MDQ5BTW7Ie6/bPiTR4HSd5wLz46I0DsL5odrqzc=,tag:jkPgAL9CODcdM0443Pc+xA==,type:str]" + "name": "ENC[AES256_GCM,data:FY/BHlNK,iv:lAHJBb9fCdqaP9N4pLK1hMhAEUGBeK584qbiN718Nwg=,tag:iebgImYKN1QFNBVkZSAMow==,type:str]", + "password": "ENC[AES256_GCM,data:HvjAHugs+cWCI/FMaSFZTeiTOwSua9HKd6e1nGAVhJYNxO9q23v2p9xaIow=,iv:owPv+thm880gFkRijhNZ/mo5fDIAuW2uxPJXU1wRpiw=,tag:K+zMtp/+N3OJeeu51Tdirw==,type:str]" }, { - "name": "ENC[AES256_GCM,data:rU6hwSY=,iv:IkZL0RoSWfLyoiFNpbfmEfnIdi9i3da64rJYK5jB/0U=,tag:H6vAUHjnFgjd4foveAx/rQ==,type:str]", - "password": "ENC[AES256_GCM,data:sGlZDB+dk8nguy1dMQ1l4RG8QdViGsy9Jsy/HB9UiSWOBp8jgW3/sMa4fIM=,iv:4E5Ox+WuhGDOLiix8+KCTixTNPnWExEtXEuUOWMORZg=,tag:1tc97Ws/3aUOglzX8DudTA==,type:str]" + "name": "ENC[AES256_GCM,data:bKmFpjk=,iv:L7S+NKavsckkgvRug4naFYrO+AjFJehCfG5pKNxHdIQ=,tag:MxUawTzdFAriKXNHEsmpYw==,type:str]", + "password": "ENC[AES256_GCM,data:R4UiQG69k6FKeDlrYYLEGDAxGzl51W6teNrSNYhm0mCLrPPVGwTIVNFfmXQ=,iv:QZJ0GgnV5NT1zb2r8E/U/FAmmtZYfY+afdQqrTchPSg=,tag:jUgXP40ZXdPGi/JJNuutrw==,type:str]" }, { - "name": "ENC[AES256_GCM,data:qDP+,iv:qzxshRIb6B8ME6y+LBI1J5XddlljPGqIXk9O07+JGJ4=,tag:7OwnASnZtXPHZLbGm6dRpw==,type:str]", - "password": "ENC[AES256_GCM,data:YoTgdP1IrdnPflivlir0w56wvPjnATumqwwUpCrYmuFLEBCHjWUFgQ2FYrQ=,iv:d1I0xNYJefJ6utr3vNw6/aFsTmd/CsW0zaJ1Yd4DdGg=,tag:RAIaC/W4Qw/rRs9JPV52cw==,type:str]" + "name": "ENC[AES256_GCM,data:eB5P,iv:fZJfraIFaDtmkP/7pFLBvJzZmecJh6AnrMgOPYogvR0=,tag:bY519u5FTkc6RCSUjwfL1Q==,type:str]", + "password": "ENC[AES256_GCM,data:5eOdSColRcUejm/1H3/NnHr/7oct08wac+Zt0llsSNmYYeQmIbKTHUq6aoA=,iv:F/pVPOEzQaXFsutEcqXY/coWGpThl+cz+WfWf+QeXpo=,tag:oIVX5Tva9P+FBopl1vc+wQ==,type:str]" }, { - "name": "ENC[AES256_GCM,data:JTTUrA==,iv:5zo23ZUcwj+BRFmHWv48xSbYwx9AeW+R5PNuvsngOyY=,tag:uUWKtQ9idqqJsfKnyz3EQg==,type:str]", - "password": "ENC[AES256_GCM,data:I4VX8ZgnbPo2Gd01ctLGDuDFqtunG42jvihX1NlQ7g2lVFvBLZmvbWCSdmc=,iv:uBGO/JI1vyLXElPyZa0aojf39MXLS1MaCk5MGSRI1Qs=,tag:rQBaGs60c3khsTxNwJ47Vg==,type:str]" + "name": "ENC[AES256_GCM,data:rA4MUQ==,iv:qDezNVADyBbPmTLSvAoKpETjkSv74Us8rmhCKHOfg6A=,tag:MJWoWidaL3oFCdgTKFHyRw==,type:str]", + "password": "ENC[AES256_GCM,data:/chygmjCSeQHZRpAboNnBlm2FODKdPC4BGg1o5iCLk3JjDJjn+mFccoibEc=,iv:q89xyrvXf/pFm3Bx3AlFb7uzwrogpDj7J2uHaXbMySE=,tag:znqnwkOajHasCx34ENsLYg==,type:str]" }, { - "name": "ENC[AES256_GCM,data:g1SNnAzcyRNbUA==,iv:LgQrOfguo3NgHS1A9CVJCLUUyotp3ABJKm665BY615c=,tag:Km4AJCMiIJiKoOadHtUUVg==,type:str]", - "password": "ENC[AES256_GCM,data:dAi4M6qKFZuxdS5+eONFBw7um0bKoQNxK3jiEPfqi8Eh/RZOGVefkaXjmS4=,iv:KBBsTtsJ0LT/ujYBxKvU5iLD17i7AHELAi07qwM8kcA=,tag:ju5/Pte7nMGq7QMCvfKNjQ==,type:str]" + "name": "ENC[AES256_GCM,data:Z7s/gkeTU7lo2A==,iv:3tT8PgvKfC7pda/RxYQ9n5lQ9bDhiI+8ZTvhuuW6axE=,tag:ILNnyk4Wed3VnUIUKB4a8A==,type:str]", + "password": "ENC[AES256_GCM,data:GYLogCQPkOjrBszPGMhA4F0mG+576NoDu2IbnhhYzrwYk9tSH7Lpi3Nl3+E=,iv:4smeAmeCY89/FNbiAy5tIWN30boyarH5vHu9J8ykeK0=,tag:YKBJ5IabpOXN0e4ASbNB/Q==,type:str]" }, { - "name": "ENC[AES256_GCM,data:u4JmJA==,iv:sq60oDwGsL9dBvEGnYweOSPIcQH1LhdpJ2FPpRAFYLc=,tag:IC4AINNlGDnhZqGyvam0Jw==,type:str]", - "password": "ENC[AES256_GCM,data:80ekNEjWz2jYBiPHvQTiT1UHUP54yLRYDbTpwZ5bQibAsFXV2iqABD/hPMQ=,iv:ORRBAFZ+WNXtrVEj5iTNqtrStSGBhp8jvNtEeHNqXPY=,tag:9Tq4bKHLir+2hnz7HXeSVg==,type:str]" + "name": "ENC[AES256_GCM,data:Apx5tA==,iv:ld6bsXQrLQ/f8ynRlG8K99UYseJ4OAloBfHwTgQCxRQ=,tag:P1KPVlq/yqd7o1FlYUuTQA==,type:str]", + "password": "ENC[AES256_GCM,data:EXrqJPe3BDoDAkYiHHa6PZd7mOKLjCUqNl+FRlfG2o9A/ZXi9lBuHAAXUIc=,iv:fUm7QAU2f0Vv/eoCyevOq/v5FyPXy3OKy7Z0cfZcbuA=,tag:VnrKxXTdaRhaibqu79WN7Q==,type:str]" }, { - "name": "ENC[AES256_GCM,data:qOPu8ijUxII=,iv:2I5weVX7/7i8JzmqiAinAlU+boiV2x2HnhLRZFJe+SM=,tag:nj5u6g/4ztbFb2XVuxCLGQ==,type:str]", - "password": "ENC[AES256_GCM,data:v07iGkIZkuX8HGyKLSK2Onl7XumiDEO8bPm3MklOp1osBF7zbv3VOkik0F8=,iv:sWD/6k86FlDqdu7pQ1cwFtKvHztjBNOQwRvV61+ewgg=,tag:rCEwPFl/WxKuW/ROHWVJDA==,type:str]" + "name": "ENC[AES256_GCM,data:cRESJY1h9iU=,iv:3BE6Xzfb/1camtkPaKos/LxiPyBeGtR5BMNsLCInT0U=,tag:CGwuSxu7tpyGBbEpRHzYGg==,type:str]", + "password": "ENC[AES256_GCM,data:kFnOasqSDzzCIUrkpCEjzYehMmsvGCEovjNwLY2CvvPQe0iZn3do0NkSttw=,iv:rsBIl+frjjSOx+7sKORpVVQAV/Ko1wwyO5+1OioFuc8=,tag:WDed7VQy7vB+sTQwh3MapA==,type:str]" }, { - "name": "ENC[AES256_GCM,data:nUVU,iv:7cv7Sbwtw2QtYmavOYefIIrhJT9kv6/Aked2YTUFwDE=,tag:5iplJY/VS2ZEufRy+fUduA==,type:str]", - "password": "ENC[AES256_GCM,data:Marv2ofvZK2sFN7CXJYtlnmm1FjgBch8KoEpT4n/Y8SQQaCYLRXYrS/KMXg=,iv:7vJdrzZI7A1zRPKGx6DWK5U3Ps1qxC+oz9AReanTZm0=,tag:33rCRUu7+Y17/iVIY3BV6A==,type:str]" + "name": "ENC[AES256_GCM,data:kDHa,iv:+HGkcVN/Juk8U8T6VQyBkrnj2PWY2d9I+4L8TX6kH8E=,tag:jEBjK2I0/gRGPk8OnFoXsA==,type:str]", + "password": "ENC[AES256_GCM,data:HsehkKOtf4vg7ny745p8+H1D5aJyUsF/CXrDkEihiBZCx2Ty6ayUkvcK7Js=,iv:9ei19yg+2xQ575yC/F13irT08TJOyaAdZ50HA1FvJ8o=,tag:cApfvVVg9pyu1K1FGOsS6Q==,type:str]" }, { - "name": "ENC[AES256_GCM,data:yXq2DBj0Nw==,iv:wD6b4dSUylbz+xgwbYopmJAFACZnzBZc02R4870P+x8=,tag:h1Qj19xVNsLJN2KplltQ2w==,type:str]", - "password": "ENC[AES256_GCM,data:QmuudlZmCdRTHdVMT4ZHY8F3jpOfaAO8Lwt2roZftZp/16eeGZdjR8FzTjw=,iv:k4jQbEo0r34Ye5917eOHyLTO7dvx9bd7g44Y09rYy2U=,tag:jKCL2R5gDE2JhgIVwwBqYg==,type:str]" + "name": "ENC[AES256_GCM,data:E22FsYlD1A==,iv:PLCOZelEZxbH4hWplaf6ISNy1dd9ywoBxhH7LEcGYJU=,tag:yBoXm0T1gI+0brDG9742Mg==,type:str]", + "password": "ENC[AES256_GCM,data:aBmYLhb4E1lfabWhyuoE2fiUkvxfU2Z7QIHREz4abBytlkQk3EANYJSr7vU=,iv:OAEj1N0sYHZV7V9cQ+Fo30dhHWUcskCCVAwfFTEZD9A=,tag:IopnZ42dPTqL1Ggjt39oAA==,type:str]" } ] } @@ -57,25 +57,25 @@ "age": [ { "recipient": "age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEQnJFTkEyaG93V3JhRUZX\nT0Q2dm1DMXNmeTY4bWJzTGZpN2V6MHI1aWgwCis1WnBsN2dqU1hrbFNOeGp5UzRT\najQzOHdiT0F4ZXFUMTdmLzRFa210QTAKLS0tIFJDUVVIZGVzSjBYb05xQUFkcnBU\nMFJOdEFhSmgySXMrSXlka1hMcStwVHcKrNrRT+ILHV+VQKRGfGlGuzuoND9A9tkq\nRIq6UheUgztWC8Zb+N1c57ot9kBb+Cc0McKjIAfKwQc5Dhs1vgm9ew==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQUWdIak9xTUw0QWN0QjJC\nSUVGUGh2Vy9xSWRCUXhHeFB2S2wrZExIbG1nCmd4Z3MyVms3dyt4VE5KSzN6UjhW\nYXg1dUxTNWFnc2lBL1J1VFowNTdhcTgKLS0tIGMyazdTNjlPUGxLbFhTOEQ5U1VG\ndXdlQjdoYkpsVFBUbHZ6TzBUb2wyQlEKx5Mbmtf0vqQbpiI6LFbcZ7A4Coev2lMc\n7VuDRo0AzGFsNmftMHu+EHQfr6+JBDrYJTleTZT8zDvZHmoOaMhwDQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1hzjj23k8ckesm7aqvelndn2hkywts84892tp0xhl0vj7kz7kugcsr9fepp", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjeWloekFtTkxJVGpSa2Vi\nSUdhSFJKc2wyK2ZSVnZzRkpRYjIxak9hUVZNCjVqMWMzOVcyUkVJSEVVbGVEWE5I\ncTFZTU9PalpEaTlxN0FBb0E3K3RPeFkKLS0tIHlYK0NOU21hS3VndENHRHgwSG9t\nc243MXNab3ZQOVJhcUhYZkJCeWJoVnMKCTiEAxCObN1I2GyJa5woOa/yV9CcrN4F\ndXD4KSDz/FezcfkDn//MuqJqNzA2pcs6YqWL6heo+DfCMFs0gWC8Gg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzeUV6eGVVbWlmRllpaG9H\nOGlsMS9BSUp5REtSYitJSmU5WWhOc1RxVG5nCkRwYUs4bGNzbEJqeUNHVDV5cnFS\nT2l5Q0NVQ1VGM3hKWnIra3RLNU5GeFUKLS0tIG1WVGFRL0JZcXd0UEUzWkd5QzQz\nY29nUHdBZmdzdTFzTzRMNHZrWDBEZk0KTAW8iUPbDLfaBkjjyHGh5BL99v8PD8Mb\ncR828QxBW/zZrLUMjFdHo9UJiiJpaZNRhaclTzNqHDsVupgyJcKNmQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1ycgzpgz4vscwfknf2tyvr65c6t95xeffx3qp50r00u83xlpfmgpsx4gyr5", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJWU9zZHBJUTBmdVNkVEZa\nM3RFcGdCRkxZTCtsSlM1MXo2VjI2elo5SzBzCmE0NzBmdTBKaGdmSHkrVTB3eTIw\ndmRWQUJiUmNwSWhhd1RCOWFNSFVkcEEKLS0tIDd5ckZOeklIWWtMbTJWbk5iOTdl\nUHVJWG1KWTI0aUJORFVNbXo3YmRpd3MKe2azhrMtCG2l4zQsnN18LuhLe+yE11Ln\n7U8iEA9C5M2jlM8heFsVY6rNCr2jM1B7CkDbbZD5+OZidrH/RwagBw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzeTZxUm92QlE3eE96WnZw\nRjhvc0NndERpbEtzSmR1QnFnWWVMNmNxbDAwCmczWEJjaGZEZnpsL1JDNHVDOG53\nMVFwc1MyUVArNWdkc0lRNHRiZy8zVnMKLS0tIGNJVzJUN2RnYldtSGhPZUVMR2N4\nZ1NXdkllVU5laW5YSWVxUzViZVptREUKFzRZ16CdqnK/CowEGGcBWr7WDo5l0Lkx\nc2qxpF/6yJnJenci5mBmodJ1oeAzbq3z7TPf441kyQMJXt1CVzpaOA==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age10zmaa6d5pwsqlxhc23e5ytz66k5nfxhry7fxvtayn0t5jfnl5yws4qe7pt", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2SzFPenllTHNDZTJZRFJW\nbWhqUG40bFBFWjF2NitpK25wUWRpWFMxL3dZCnlhWXJ6Nis5TnRCbm1TTlUwOUNW\nV21RcHF2eWFSRlpTcEQya2tMUGlUbW8KLS0tIDRUSXpHQVJQbHMwdkkvVmR3bnpH\ndno2U3JvNzNNMHlvRHFENjNMa1JINGMKGZarZaqubJkG8ktix7RpoQ4NpM7SqB1T\nUOez47+daSxpFnVr1oik19/SyU+HNLvWu8tom8C3vac44ATI+mc6uA==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoOVllbUV4YkpucWFwazlK\nQ3ZlbFpjNjBkM0ZDZjdDZ1ZZRllWRjdFMHg0CkdFYXRKekI2M1QrQzhzdDZEWWFx\nSFdvOXd4WU41T1B0TC8yRkVYVEl5ZEEKLS0tIFBGNkZScmhKRWdaUGVxVyt2NlF6\nQkppVU02V2V2MkhSN0VwaXpsRm92YzAKyujtxk1HeuYS5jjy3KhPo5cDWF2RAV+Q\nIsp+6VnKUOz/7W0SrBUuBTGBf8X87ScOuPhB6ulivyJjYKSyawM++Q==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-09-14T06:26:16Z", - "mac": "ENC[AES256_GCM,data:ni7sZlbJhxBMkp4Us1MYeybxLSF7BkE4mvBZ0sX8ag7ZJg49wNIrqY6BihwHPQPJZ1Aj2/frGB4mIF8dMPKkHzT0Vtsoig1gSBuNAcHWmH93+Y/nPqmcSaS8Z4b3sFzSX9m5l7ma/a3j4GYYu/y02lJKe3Z5zxRVPRCO1La9Xdw=,iv:F3Xdyjqc0YKLysiAl0jW/S2Zky+iIIF/2HuO9Uguwis=,tag:ogO7GYF4ZZ9gNdKZ0zWSeA==,type:str]", + "lastmodified": "2024-11-29T09:05:22Z", + "mac": "ENC[AES256_GCM,data:NVjHY0fr0M23dhu8OtTP9UoY3WL4k3lW0z9USsTg9Y1OO+0PTxRUK5OrIp5O1bs0vqLLph8L/vIPTt+6j6tmRcc35bIB1K2UePr6ctmc/aG51DE5piyDGZWXoXHjcjb65FqX2GswoliTm/yw592CLRGe8U6ch/VL4PQPqr0DUFQ=,iv:fv0BN72jjU9Ukk2MJi9Zoo9KE78B7JirZgCyHGnD634=,tag:DD+3cMwdLi6k+uuaxnso1Q==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", - "version": "3.9.0" + "version": "3.9.1" } } \ No newline at end of file diff --git a/secrets/cloud/subgen/secrets.json b/secrets/cloud/subgen/secrets.json index 07dfa90..d055e2b 100644 --- a/secrets/cloud/subgen/secrets.json +++ b/secrets/cloud/subgen/secrets.json @@ -1,44 +1,44 @@ { "subgen": { - "relay-subscription-url": "ENC[AES256_GCM,data:IO3FTW9vkwQuJRsogg7y29zkHD44OM/ZT3GMtKWBTr47CdXEKsCMZHVjMs6oXShjkXXjDhUrPkukcGbrrPw6KvTcBYV659Zfqs83kt2mzjmgYH8TXVG7RxL+kTdex/rOX8qoXHLlcIVoYoonY4KVHCQLmtlYhtAD8Qp79Cqa+6BiquXm40g=,iv:PfLrnRaxH1rQhPjCPnRXUMRX1F1liX/3lWh98gAPKjs=,tag:oVxu/r5FKKLWjPzJNXiE0w==,type:str]", + "relay-subscription-url": "ENC[AES256_GCM,data:gshsK4jJolkDvIWNjLRjS05rmgHz1moxy+CWBCrQcdiijdKhlQtC+ti0hIuN05QbdJzn/fg6/tLY3mCfcMYd5zOCAsxWCa4wYpMbi2aidFo2hdZ2q0BvQP9+iPqEBHkMsZ3hdQLGRTjFrQ1PumnOVRwVU1VfPB2xLtr8bhVk0w3yHG9BgKk=,iv:nwt8fvaGFxhtqQPKdhHZeEv+YKptZHbqyvlxthVfuYY=,tag:VO2sJQnD2ndvzqL3LBTeww==,type:str]", "overlays": [ { - "user": "ENC[AES256_GCM,data:h0rD,iv:fE9Q0BHC66xpu+HRVCSU1Sm/Mrb7BOqX3fKZubETB6k=,tag:rPrzgC9hLbKyDIxiqMEoPg==,type:str]", - "path": "ENC[AES256_GCM,data:a0X8OMTPJhmXtHgaNFO4ZQi3yukXe1jnxuUxYuFZzaae,iv:RkEJW81r9RY7SlmlMS2gNQK2JNYEQCpOQaLpNGaZigA=,tag:NU8TYF2xW6umEnECI4tbWA==,type:str]" + "user": "ENC[AES256_GCM,data:U40d,iv:QdT2fHMlVvTULTv/RqbJiPR62n6Idvl9GtNYQauABQk=,tag:HS1SKfw+C8spz2Korz/iYw==,type:str]", + "path": "ENC[AES256_GCM,data:nHklWgIJT/IffiG1cpWu70IyiRdQzva/G85/r1I4DjyA,iv:cKPsdcTHIgIaYYbzG5wwtqTmCHKQk/TfQeoqPqJ1cHg=,tag:ePTwHh5nqon1fTRQx3aB+g==,type:str]" } ], "users": [ { - "name": "ENC[AES256_GCM,data:4DNb,iv:RXpFRHExc//6DdStR/AXI7f7QU7HE6p1hkxZqWg1x9g=,tag:SmiT3cgst5BCH0hyVXA20g==,type:str]", - "hashedPassword": "ENC[AES256_GCM,data:NaxWP0U+R2FSfzQmu0furu97X4wANIRlp4lQ9JBNNsdYfZTiHc5sjKMiMfyprHR+hRgOuDpNLLf7JQY=,iv:pNbwyBcKZKSCTqgAP3IwgsjyGkRoyk3metKfIDHLYg0=,tag:dVha/fmiE9mtM42DCU2UdQ==,type:str]" + "name": "ENC[AES256_GCM,data:Rru+,iv:9jDvGNWPgCX8aifQk7B3p3llfKNAiJqXT0wZu7tYAj8=,tag:C6a6oilaYxYgdW/mojz7RQ==,type:str]", + "hashedPassword": "ENC[AES256_GCM,data:p1Y5X2CrgdInZFlbjaYmMe+BVfID/A/g7h6G5QqzMyj5kabn+A20/Erv826pmy6wpYxRH4mQzto65Rc=,iv:R2FPh+fKwTlmcqHWICxKx+WlOvae6OPuRVnyGjRXtlE=,tag:qLu/+zWnya4y8A+4AtrL/Q==,type:str]" }, { - "name": "ENC[AES256_GCM,data:MdY2gw==,iv:EUpKCEdRFs7UnJiaf0i4+eGVsLWh0I6dtpmMPZbGiQg=,tag:IHTGzaLeyhdXRMJHjLDj1w==,type:str]", - "hashedPassword": "ENC[AES256_GCM,data:S92O9UGKK9Vc88A1yT9Y6pga+a2W1Ibn4HndoDCoOl6wgsKWY+dDwTq0z2PK75uHr80AuaTPyBy2a+w=,iv:l/n7iJ8PXFwy6uPdwJmj30llhnQxVVus6s+CcLhJ4EM=,tag:YqvLX1RPNbgsAuAvROoTdw==,type:str]" + "name": "ENC[AES256_GCM,data:JX0UPQ==,iv:z3mkLBV4ezkT8sHIRd1Vr67M2mOujWqcsSYDKuZzRY0=,tag:jlEm9vQwkrL2leyyrIHO4Q==,type:str]", + "hashedPassword": "ENC[AES256_GCM,data:2xRDxXlQDlegcqNk0Atdg7e3hKkl8mAnCqpT+6QqUO7pTW6KEs9ipDlw80+kzt7Fqn2BZbojTPo6vWg=,iv:a7kBu4LTcODwa1nvrGBFUKRpX1+dHlYPc3yzYg5Gp+8=,tag:050VxwGiZLDTkmTQue6LgQ==,type:str]" }, { - "name": "ENC[AES256_GCM,data:7NfPGpR1R8RDdQ==,iv:bTQAe7+9+loXld0Go6OT0ACmmc8tuDxsAyCQUJMG9Ko=,tag:AudKr1f21CysHTpNp+z3rQ==,type:str]", - "hashedPassword": "ENC[AES256_GCM,data:cAtGxUzOSKNz4JtITfWVYQDg7AO0R7VApwqhMQhZJm7mTSpO2em3n/iC9UMmLcJ9ypbKC0Z0XFzLRV8=,iv:oYjqpCP9SqHOHlPnzV02ktpPHCvYXYCNFB1YqHhwprU=,tag:O5lUQebUHVA1xdQxVx9oRw==,type:str]" + "name": "ENC[AES256_GCM,data:DucYXbJoIxXvpA==,iv:ZK000JmJQRa02y/D512Lblz/qVF7/enY/N1GZ+ILPj8=,tag:lfwa/iiiqojMA3ffcUYbUw==,type:str]", + "hashedPassword": "ENC[AES256_GCM,data:vKYQcTK6zySU7TruseSQI2+TgqmoTMi+4C8bME1yp36kiw7MPHO72RbVPjBESDSmesMPUuygazlEf/0=,iv:sc8ikyqkwCHWMcnAShn+Tk0oeVbxiXFTYRD8SH0v1X0=,tag:6o0XRSJoTM4QstD3vUv+pA==,type:str]" }, { - "name": "ENC[AES256_GCM,data:HFFMLw==,iv:WTl32BUk+dMLXFQz5VTzYFZEEnGTCpf7SXY3whfFyWc=,tag:pNK4a/r02ZIgMCryKxyFaQ==,type:str]", - "hashedPassword": "ENC[AES256_GCM,data:1WXInRUtd1h+0HTC497hxk7ZjNSDEpyV898RkesQ+M93WuwRgWq47S01ke+L25z03ctRBFKUocVqcKU=,iv:fOuqN2/Cbuk/c8ayJ32sh/kKqSZ3Y7+xn/FYVq846yQ=,tag:ojOkOWZVBQEQHZ5ut2ENKg==,type:str]" + "name": "ENC[AES256_GCM,data:3Z+/IA==,iv:uTOyy2IDyMgLu1tpM65ujwxf34gkbqJ9RdvTZmDdxAU=,tag:mnUT2X5ZddilGBvAPg7EEg==,type:str]", + "hashedPassword": "ENC[AES256_GCM,data:0Kd6t3lpfR6uBgKrO0L92PrC1rbLzUh0PCVUnI5G0UqdQXuyvMyCqJ/CxVT2WYOzfGHJu9sLfzqTaIg=,iv:3pbTLkGPYEVfEbScDa62YcPXgemm4urrrjZVy3LwA14=,tag:v4uuzrIysNmP81gcVqZTYA==,type:str]" }, { - "name": "ENC[AES256_GCM,data:jwGbScFiue8=,iv:DuEvwIAM6F+vz6RmskRkL8jJ4tN5F8YEJCckq4ILLsE=,tag:4YD5Tt/gACUCJNjvDhnWAQ==,type:str]", - "hashedPassword": "ENC[AES256_GCM,data:AwPOm7T0LIcKSC44lAgB9Ina7Ki+m6P0+e0XqeScyhWcZlu+1AO2fVZOWTIKvyMYnHZbPBOQ4QTKTfQ=,iv:IwpIXWujnknYbT/ccRSJGWeNsPXNjyZxjyYf3SW1u3Y=,tag:aw7LV3T2BM6CJWz4pl2PzA==,type:str]" + "name": "ENC[AES256_GCM,data:+VSq8mPMEYE=,iv:ig2NRu3/Q0oW6C7KXTso/U7UDxj25bOwmySudVIST7c=,tag:BN9tvp0d7Uh/S1FAtejHog==,type:str]", + "hashedPassword": "ENC[AES256_GCM,data:nBV0qwMTq66bzptkRZw5gxRJmR0vf+OgVPsCqNAipcaC5LSp4RyQPapigpNdOYL5m4waCI6onjhRAWk=,iv:sFuu7kqkQPfsk03RAhbkc2vnhdyu0EDsVMGUBTpnNc4=,tag:TZ/ixQfLE764yhS5BSJPPQ==,type:str]" }, { - "name": "ENC[AES256_GCM,data:qrMM9/c=,iv:B4xeo4qRedwxsAFB90leH2uTQiCSa919k0QSt8qC1n8=,tag:woiG5swo2gdurr0WYP24oA==,type:str]", - "hashedPassword": "ENC[AES256_GCM,data:MoER7p9jsxAdz9jLGa9EXEeFyWPuMkRxc9bqCVq8ycUJcMsDr1zH1YDVS8G4qqJAqhJ9SHyeyU3DWfw=,iv:9sOMf2azZtlS7xlqe3w668sxM7obX/rqvcnfIyBTJ00=,tag:UP90n3EatjO5PrgnpuDRjw==,type:str]" + "name": "ENC[AES256_GCM,data:UosaKiM=,iv:VomoBaEK3E9tBnvZRT71baUzwkKR8wnT19qSTkf5RB8=,tag:E8ZWBQE1RPJJ+i1+SeVYxA==,type:str]", + "hashedPassword": "ENC[AES256_GCM,data:7xO9z3lkCLa5tXkL7sHZXiwPgkPR/hQHI3xeOt99qpv01g2wZ9e2Hg6DzhrhkYbpx0TfehZ4MNNTjU0=,iv:xEhkZwCgB8P+jEBkmbnENJChFLWs9nuP3SMbErvGKsQ=,tag:mJaJ5uLrObuOafl9fb+8rQ==,type:str]" }, { - "name": "ENC[AES256_GCM,data:pD0rSb03,iv:2QHNk8UyKioUxwJs3/ipvpvJ0vs0beg08fEjylsxnGY=,tag:lmTO4ekYhrlPgspS+AHfTQ==,type:str]", - "hashedPassword": "ENC[AES256_GCM,data:T8BjR+QID3LwVeSe/22r3XKs1NljpaQIR4E8aChOZoteGgPXZBO8TWetIAwu673pjkYi9Z4QnvbO7Kg=,iv:4EmzNHPki2bSGRukVolHHkzedRwvIlUxOuyivaOonfc=,tag:QZ/2ilhjtvQw/o7uR+yLcA==,type:str]" + "name": "ENC[AES256_GCM,data:Kyap1JxN,iv:8hQM11vJHNuFSA9YPJFJfXPlXbxfz9lDX6oUU6HUF1M=,tag:g/UGKJ0le8hC2ruPb/QuxQ==,type:str]", + "hashedPassword": "ENC[AES256_GCM,data:RsdYZUfwqbmgXfmcTF8IWbLyZTNTgLLfSghFOfAc27R9DZISRSkewv6DGuJnnQOx2XNUgXISSJO1DZE=,iv:20822Vm271kYjfRg1/FXxLEDYjG8Wplgas37OuUdwuw=,tag:0fVJErSwxqBSEseAfbNf4g==,type:str]" }, { - "name": "ENC[AES256_GCM,data:PkyU,iv:lO10RKVIFdv3yIpipX9J0xdXprXO6enSxLlkU0iS1k4=,tag:U8UulMsMzZgkHO6GiMMJog==,type:str]", - "hashedPassword": "ENC[AES256_GCM,data:k+yRYqZZE2O1Cz3sE9LV/YcShYptI4HqcmHQYHYafarEEL0E0LJO7B8ZaDEfJ1IkbC2bVCq7mjqG4RRs,iv:hR4COQJw5e4BFBRib+umMfIndS7of7ypCYuQxZTlhVc=,tag:swxyHUkP/uaNlP+DG1odlg==,type:str]" + "name": "ENC[AES256_GCM,data:Q3Wt,iv:7rBq2F6LDVokH5v3PTsRZjih/nmfMRXI65V6rMRe05g=,tag:wzyFveMmhE2aYXTJ/vIU8Q==,type:str]", + "hashedPassword": "ENC[AES256_GCM,data:zma/X0CinT6P5CQm3yTzEfyCC4vfJDzM6ZOrHBp2ANOkXz9O1iwp0T99hMByWiioFZ+5jUigDWUeLziP,iv:CHaKSHqxtymy9JJly/pJYrmqe4CYN2aCaEGcz0o5zVs=,tag:4Gsj3c6OokBo/e5jQYInhQ==,type:str]" } ] }, @@ -50,23 +50,23 @@ "age": [ { "recipient": "age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtYWpoK2hCa0dvbDIybjZM\naHBWdDZTL0JSNUJxZFRlc3FUSjBkV09rU3lJClBLQnRjNFZ3M2lHNFFMZWhacytv\nUmM0NG1zdVhRcnVqM0s1SlB6VC95eTgKLS0tIE9IdFU5S1A5YXBTcXN3MkZLVGJr\nMUFNZ21PeXNkR29JdWxDUDRMdDFCeDAKRGnWkkLt3awXCsRcEgO3zuJyanm42oAF\n0t2jGJ/4vDv7fHyU3GDhQh1BY36Y8kQ92VqWEm/Akfnw4/mYk1XxKQ==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsdVFvSnN4a3NJdUxBSE1o\nbHFHMW1MZnQ2clMzNDNIVXVlSW5HNDhkcVhvClRVMU9YOVY0cGUzVlY1bW1KZVpZ\nUTNYMEFRSnQ3Q1VPTFNsTjRQMXR2dVUKLS0tIE9tR2hHRVQvWnN2NTRrWUcwa0I5\nRUlnT21rZUVzMFhma1hkamdYSzEzaGcK74ruMNXzrkdkWIv2atlFaSCDg4T6yzQX\n7t8RYZij6gPUKrl4dv+MzjZqPZW9Up9WFR+jmFvRqR6WeWK8xZa3Fg==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1hzjj23k8ckesm7aqvelndn2hkywts84892tp0xhl0vj7kz7kugcsr9fepp", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaSWNYOXFRRHBkSVl4Q2Qw\naHRIdWNERTZKOFMydHV0M1hDeFFUSXRvWjFVCkh2Qm9yY3Rqdkgxa29IZlY0OTRn\ncEwrQWpQTjRPa0V0MHY1aE5xK1N4ZkkKLS0tIGRmNDAwdU96YUZnc1JiNFVXejh2\nUUZqR09BaDBkRFU5MElGKzlHWXVxRWsKplRT2V3piykc2Ox4Zh+hydHtIx64m48T\nkVTEW7nOq93yk5H0NqbU+7988S7qc2WcFzm2k91xlydHLv0OSi0iPA==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYTjJuSHFESW5RQTNydU02\nMmNHYXovdDlRWkx2bVBhN2thRk52NVNoakc4ClhSSGE2cjVyTEdBaEZ0V0lWSW1k\nM0hsV3JIZjc2QXlnc0lnd1ptQ05YNlkKLS0tIDVZQ1BVdUtMNWMvOW14cGU0cXJi\nV0pGNWZjYk5oRmpkYjR1UUQ4aUVDYVUKF8PypAihhpNuC7xTk7DBeHbCXVUg9ZL0\nLx0zHsVnxJGcuJH46sWWE1PzCUeBfiSjRxbqMJsjkE+HAVXdwoJcVw==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1ycgzpgz4vscwfknf2tyvr65c6t95xeffx3qp50r00u83xlpfmgpsx4gyr5", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSWXhyT1Qrei9nT3hLUy9G\nQXp6aHZ2WkY1Uzh3aGQ1ekNYYmwwSmdkSVdnClZtdURzM1c3ZXhNNnpTbW5hVXVB\naFpobHUwZFFpaHR4L1RwdEhqVWdYK2cKLS0tIFR0ZFI1dFArMTkrMTVUV2N2cDRk\neVdQK0JkNjYzVkRwekNCTjgwNzhqS3MKltcWDFZTv5+YLPuCFCoChQMf+BG+yyfc\nFHB1FJ5faIxs6tF9ZiQVO13hxgyhYJvghSs580SnER/EIef1tOR8lg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoSE42ZXdVVTNhNWZvL2Fz\nVDh4c2xCTkhHbXNzOHpsYWJvZmhOcHBFYmljCkhiaG9XMHdsLytVdkdrUUV4dkVl\nYjd3TWRhMkthMGpGWlRwVU01S2trTzQKLS0tIHBPaXQvanpid1plM1B1aHpjZ0Z4\nY2cxcWZWaERNZXMvajhNSVlDWHN6dWsKB29+7zcS5YrlIViyqsbwxJMYq2Q2Y+sH\nWx5lJhcRNMFv5QNPE9zLwOwal+QvYC4o4exKamY08df7lj5GHKdR0w==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age10zmaa6d5pwsqlxhc23e5ytz66k5nfxhry7fxvtayn0t5jfnl5yws4qe7pt", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjVWViKzJpRDBwd0E0ZWdn\nZVlLd25Dbyt5SzFaa3VzN1M1aEFzQmxmV0VZCmRTSjQwREhHTEVZS1JJN3lrU1RC\nZnk2eGNKaVZlY0sxUlZtcmExTGZFd0UKLS0tIERieG9sR0FZSlpTdS9YVlgwT0xa\nS1BnS0g5ejM2L1VweWNFWFNUSEViSW8KB/NFsimGVxWSfksdEzUCUfoMKiTODW6u\nr/qoLbh+ye3CmT5xnnmH7lU8BcxfLQFtfCPOTqncglTFefaQOotTlQ==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHNnJoeGI4ZDQzeDg4YjJy\nMVU4NmZJT0RHNVozaUhPT1NuSHlZdktOZzJRCmcveStiQkRiUExNZGpSeXFhNlNV\nWWVYUVNBZEZ3Y1FrS0RZK3ZqYnBJbEkKLS0tIC9FWC93NTlTMFZFVjAva2F5MUtW\nTWNPZE1ieXZtUld4ei9oeGZWZ3lpcjQKQd8rWgGqmxL48DBcc1aTuC55H42be4PY\nX5ynwrvqLO7YE+U1rkfRX3KiBgR5jRpD2KVZ9iU6du6JcD9qijDm+Q==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-10-12T09:18:27Z", - "mac": "ENC[AES256_GCM,data:5+M9pXg9GBb5iF9QkzBs+GFU49jrA5L4e1ZZ+FHFg83vZar+TK+vFNEXBcRfo9lDoJlGDFq7KqRV28BEuRXF/shStdGo4nrHRcndlO7V3Nw98+s74Y8HjJv3F7fBM2akDO5PKFhRSQDIVZvDvFR4lnNDvyv7Gltapggiy7F6Uf4=,iv:MYP9t5aZF09sv5I9B+7QIOc7cieCQvQxVYK/S7SpUt0=,tag:T6VxMLdgoBX7nZm5lwldtw==,type:str]", + "lastmodified": "2024-11-29T09:05:22Z", + "mac": "ENC[AES256_GCM,data:9TdXrYKK4/mNLhSWPcx5bx8mNbNasq6+FZ8ZuKvkU0M+Sn23HhDxiC5S2qsZDGVwIxxW92clP4a12rTGTTGR7ESXGX0ka2YJzH1zNAhLcCgENxq0kKVFl5bQt1I2ZDhsRnRv2Uf0hl+ZxMdvHRYOI7Sn1VlbdeOcxSkOkeqlEuU=,iv:7m4XCc532JufpjjSE89//lHQR/E2u9tomsqCh8FU/SA=,tag:r/Yyd+TJ/yUA8C6dkVEEUg==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.9.1" diff --git a/secrets/darwin/.sops.yaml b/secrets/darwin/.sops.yaml new file mode 120000 index 0000000..2dfa991 --- /dev/null +++ b/secrets/darwin/.sops.yaml @@ -0,0 +1 @@ +../workstation/.sops.yaml \ No newline at end of file diff --git a/secrets/darwin/default.nix b/secrets/darwin/default.nix new file mode 100644 index 0000000..91e066b --- /dev/null +++ b/secrets/darwin/default.nix @@ -0,0 +1,11 @@ +{ ... }: +{ + sops = { + secrets = { + sing-box = { + format = "binary"; + sopsFile = ./sing-box; + }; + }; + }; +} diff --git a/secrets/darwin/sing-box b/secrets/darwin/sing-box new file mode 120000 index 0000000..33b7246 --- /dev/null +++ b/secrets/darwin/sing-box @@ -0,0 +1 @@ +../workstation/sing-box \ No newline at end of file diff --git a/secrets/gcp-instance-0/secrets.yaml b/secrets/gcp-instance-0/secrets.yaml index aa1a8ae..ae6c8f3 100644 --- a/secrets/gcp-instance-0/secrets.yaml +++ b/secrets/gcp-instance-0/secrets.yaml @@ -1,12 +1,12 @@ cloudflare: warp: - access_token: ENC[AES256_GCM,data:dhOeoEQn9GSYID5OYIC7vLLU3+FbRlHL/2IGDBQcgzt+Gmyf,iv:25deBg5Y882bWYDf6FlyofBNMdqoYvBEReolswNgqKY=,tag:CAz666hrsT01Ex6yqgyJag==,type:str] - device_id: ENC[AES256_GCM,data:PKtwBr1Z+WuvMlXF4g+qUJ/5RsFlGqgTi0KvDjJiT+U3bYo6,iv:Fbwxrj7AUNXxqPtdy4MxEw23Z/UNKmFFcWf866K4x6U=,tag:U25kRtYJ38Jlv6JUVN1IWw==,type:str] - license_key: ENC[AES256_GCM,data:0mbZeJm92UDTA7kbo5o+VuGv5w33kfNQLqE=,iv:pD7EBJgivA6mSkLRbSR9d0hj9PSJWOKigGFk7ILicCU=,tag:WnkaY3YkDULDitdclI9h8w==,type:str] - local_address_v4: ENC[AES256_GCM,data:wRsmW2ihIwKUjpnG9A==,iv:hNyhps0vAixYw2VGctuk7xA9jmMz7mg4Qktq8G1Z2e0=,tag:PeSHP2WGOkuRRXgnB8M2Pg==,type:str] - local_address_v6: ENC[AES256_GCM,data:04XGUocMpb4sMIjqlm1ciYrtLNNBKTBy2Pn+s+9ahtiH2rkkFZuWCZmi,iv:hdEDj012d2CvYwRKIbUw1+727+ZoAchqGoeGvWK8nc4=,tag:jOUDYkj3/1MdN0qV19ze9w==,type:str] - peer_public_key: ENC[AES256_GCM,data:PlOm51RSfpULhpvfzggjZA/GWR4f61Id6T4kqtGU9T3lp2Xi4FywoqN94Vc=,iv:AdbfQQoA6u0u5VTCCqPCBwTCG5kkwwcPbFW9uR7PVTs=,tag:/dRiywJQr8waDmYeXugUEQ==,type:str] - private_key: ENC[AES256_GCM,data:R8SxwmAMn8SBajU2D2W7Y49JKYugE/HyjBVx5yH+Qay+a4tfQyh5+88PCiU=,iv:z/47sa8HBo5wrh6PqDc0d1TxKxknArrZcxXtoAcnphA=,tag:lMbjCqtmFSu7t2Y+dLAjRg==,type:str] + access_token: ENC[AES256_GCM,data:6LTS59lKkHEe87h1C8xpsTl/k9OL9BzJq9SfSytIkaND8YPo,iv:mYppoxmCWYD1E0Er3ePkn6OUy81JwMqBsfrSmOsF61o=,tag:P0p9fqoLY0uCdPfnQS1Dhg==,type:str] + device_id: ENC[AES256_GCM,data:TotFPs1vHzaHJPgf0srFZtW19uQ7N5oTOJ7GreUjarfRb8mb,iv:2Ke68cwh3v1qMujgNzOmcS0i//KxLcTnrjfLOff9jwc=,tag:MKOsjztZU/e+MmsG3ep7mg==,type:str] + license_key: ENC[AES256_GCM,data:rCYC0lLSOuovcI6EHRtTgrR6U/d2ibjhCp4=,iv:RHYvoJih8gwcq4CaiUfUwDDftqgzGkm3ATAzQ3HvKxU=,tag:N9ANFy6x5Qi19qVLDDmd8Q==,type:str] + local_address_v4: ENC[AES256_GCM,data:RLgCJCzwG4rkY4a8kg==,iv:LZ6jOTrmFM6+AhJVnfMpLDTDiY+JQgeXevjlFJ2J7WU=,tag:aGds1xUu8J+NBq8rdvL7wQ==,type:str] + local_address_v6: ENC[AES256_GCM,data:svX13rr/7SZpMTGkq58Vnxrx94BvF48y+NrNabqJ8q3ztGoM5XU8tr6+,iv:ppMTg1IdnwCrlsh4e6IsZgVZwwEInMVKLjtGqoNlQ7s=,tag:qzIFOCTTNR+kEDqpCP3LQQ==,type:str] + peer_public_key: ENC[AES256_GCM,data:cTWrjHFyehZpyKK1kwGq13UDPmsj2aAs4gLUpdEzEDxTC3Yud8B593rp2OQ=,iv:lz+xGVFKDbjXP2CN9vSdaSeyvVZViNqRHWyHgrb+MEQ=,tag:HHQ6LjHl0dmaHijpqgxc6Q==,type:str] + private_key: ENC[AES256_GCM,data:p7Jk9xaBrpqTYwYD4kX9/RE92onvmH5LGEgO8OCWeYGijELm/rsTwNWB+1Y=,iv:Z8huVqYPoZysKcZzTYXlWuKKa7+OY2p8Ah1bGpThW/I=,tag:fTZdWRc+o2GBmwERQIzjTg==,type:str] sops: kms: [] gcp_kms: [] @@ -16,23 +16,23 @@ sops: - recipient: age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSbDN6UXVIN3lQRXNMQ1I5 - OU5CY2tuWjBhYlM1NWZ0OEpoZWwrUGtpSWhZCjVuaTF6MTVraXlmcEw1NmpwNzhj - cjJHbnc4YnZ1Y1BQYVNmaDRyMUlWcFEKLS0tIE5yL1M4RDdzS0NBTGJZR2NXc1Ji - VmdIYi9VQWhJNzRLbGdaL0REL1JENjgKeguHn1X4Yh2iOf4vPw0M4UKuwIy0Wl58 - F1sDtRPrsH6vC+3MQwyeNK7UuOCTTRQClhNODE+amXe0/qpvUvSc7A== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWZlQyM1F5T2tram9lTGhy + QTJQY015aWdBZHptNkpoSUtmRU96eTlqZmpzCnlaNnpkdzQwOERMT01vd244aW9S + S0p0YWhjVElGTFNDMjJvanpDOWx0a28KLS0tIGZ2T0VTanoyMzhlWVFsL1pYQjJZ + Ym1POWNhTHFrcjZWdGpkaXZlZFF2eXcKcXDyFtSjCUpIms6Bd/FkY4XEeOYQauK+ + zxSdQCTyRAhVzXeJD1l7vMBXFQqfI0Hv5A0/UdSQvTXuhACoa9pniw== -----END AGE ENCRYPTED FILE----- - recipient: age1ycgzpgz4vscwfknf2tyvr65c6t95xeffx3qp50r00u83xlpfmgpsx4gyr5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJdUphejBIckhheVRkSGpq - U0Z2bzJqeEtoNzZ3R1REbWlrdlJYb0l6RGpvCnRUQVV4dnJtNWpVQ1lIb0plZG4v - ZkE0NUl4SVFINStVSzZLaWdFNDA2QVUKLS0tIHpqSGlTUnJmMFA0eHRPV1hjYy9x - MnpqU0F5cHozVDUxQlVVSXNXL1c4NWsKKARgYlhW6WStxvb7TicsQNM75NipjWbH - dd+mCBxhC5WmI9bHIdG5oOL/CI48N+jt3RfldRMpJVc2hcEjmzucZQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuYWlIdnhoWk5YRm5iWHBX + aGU2YXI0anZ0Rjlzbm5pKzlJZDJNMHJsQlNJClZUWVV2K05OVEpydE5JR0N4ZFdu + K25zVUo4MjZFOStsaEFVRlFHalBlN2sKLS0tIHNWVnZwa0ZEZkV2Z2s5SEZBZTNh + QmlVVmtkV3pYOVYrVHZNZmpjd3haTW8KUtTjkzCVb7sXYTm9btgdQnU9DLZeLQXD + uLmnLZiEhFyemdZ5oV6LvrYJQ5wfv9yW3uJNUEgmDwkeTuXwURC9KQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-09-14T06:26:16Z" - mac: ENC[AES256_GCM,data:ZMEJHj+l9c41fesubR/AIkfG0qt5TTBArq76ogdGX6Pqk5FL9ueHrYavYzkfCD70/vbzjIKCdz3xLPiQFKSFzvZc6KFNQv3b1sQx/WREZkTFIdlAdItwj2/eTb9DHAyURdu50BI9wcIzc9ha1oWZuac7vziP7uNGVSXHCqt2fys=,iv:VrExH5SMbANOGVU6/+ehK0+mIrR6HA+0q+VboP6PA/I=,tag:pI6XJcx7j3sPiOBulbXxzw==,type:str] + lastmodified: "2024-11-29T09:05:22Z" + mac: ENC[AES256_GCM,data:O97PHTxeq4IU3w1On91hJ98zIkZEzJNS21xLUHlfK+xUtvo1+r+Jh4H6VH10yCfBhMgsUEn6zGf1VshJewcuSjLScjY8V3TbnUGUN0zfTkNW+/BP/f64XQwZzIEsjbu54EwyNGsyFmW+NQFfURSUf7fTSzM9YmNxP3fE8CqLYdA=,iv:pdUM6ru+FdoniuKMwbD6qRh9oK6xcKfX7zEVLwa13GU=,tag:XDyq2cvRfyu0peUaQn3hbA==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.0 + version: 3.9.1 diff --git a/secrets/gcp-instance-2/secrets.yaml b/secrets/gcp-instance-2/secrets.yaml index f22858c..8e63a9c 100644 --- a/secrets/gcp-instance-2/secrets.yaml +++ b/secrets/gcp-instance-2/secrets.yaml @@ -1,12 +1,12 @@ cloudflare: warp: - access_token: ENC[AES256_GCM,data:7g5pEdNXuuPfIu4PmtpYpgUUKuj2fGjfqL7W/LzEylb7gaYU,iv:KAFzKX5NOJEGaQmQw7bqQl7Qs80mLJTZ9qkjaH5r1wA=,tag:wchyoG7yNbOWlCf6WbTZxw==,type:str] - device_id: ENC[AES256_GCM,data:ivqqhWmAiAHvKHIQkB8ZqUyhp6uMKK95tMlcemGFJZrHHMhl,iv:l74ayRR2LE22zdcVHKQh1LIcyICqsreN0GomxWQvOQw=,tag:WZFRP+4GC2+/8//fqhyqsg==,type:str] - license_key: ENC[AES256_GCM,data:6TPCBj6rpyv8XjD7tAqj6m8DDht/ZUKdRcc=,iv:2DAP2M2LhUmuAbeVQ0/xvd3BuSa9cNvEvxfTTsNmKzM=,tag:zokz0/Xhe7UaSvqB5Xjv6g==,type:str] - local_address_v4: ENC[AES256_GCM,data:aWicYRUCLsmjjBux4w==,iv:UJlH1pXJ/AfET6csHZHwoxA12RaYeuJ/tv+KiOBFstg=,tag:ce4LE9O3//OYzaNAbhZ6uQ==,type:str] - local_address_v6: ENC[AES256_GCM,data:SLSgAOgNwXDF8RT5pUOCCtcoMelCm24HvxCtWvjc2xvvHF6ErPKVeWYY,iv:PFG75oCVvh77N6cU8+zg+ikFAIQDYwCEL1qZLFmcez0=,tag:imOTkOcRIbqjHK7KTx5LUg==,type:str] - peer_public_key: ENC[AES256_GCM,data:cDJu7BwQZpp+IiyD72KEiXK3FMhXg9pa+fGrsPb5s5HSP5e0MmVt7ouCIXU=,iv:oSmKHFa7E6AczNYmyVwW5BiPWcbwHlSQAyluAnLyJ+s=,tag:snK0sy55GmOKV5k+OXcJag==,type:str] - private_key: ENC[AES256_GCM,data:aqJr1xP0dcDS8vmhtyGd0JxmOLszAIowKbntBIz88D6ETG1HFKEaSQb1lFI=,iv:glw02ftWPRf5HXjooHcypsCLbxoXF7t2QlTqawQtVQE=,tag:h9O2UZm7elffYcLtDlS7kw==,type:str] + access_token: ENC[AES256_GCM,data:o4BURZB1ZTSW7hcsBbxMRkISbiMse/A4+7dTLRprebBUuiNp,iv:w+S4+jjI5ZizDJWuWbP6pgqdmgJL4+jhMQnutTE4GtQ=,tag:PwoAtfz4RfYuufGj/zNv7A==,type:str] + device_id: ENC[AES256_GCM,data:aOG2e/JKthbdXW+Qr9VywsdMpc6HNwWO6kWAr4g31CiC8BbK,iv:3rb+EQIrbCnNmGhX2SCorloaapuHvtUT8WNDBv3pu6M=,tag:wmBAx8jVkYLzN1BGLEkbzQ==,type:str] + license_key: ENC[AES256_GCM,data:rXWUuJ0u6oIpE85zVauI6S91vGPSNiEu/yQ=,iv:jKrTJYiiNxPKAsGCwMQjbul6YM0T/Ns6V/iaPoXMLQA=,tag:X6SJfKl/wW0FMSU7VXRM8A==,type:str] + local_address_v4: ENC[AES256_GCM,data:EiTyRaeSvyN6vFVl3g==,iv:UngMPvl2G81byt5jdImMuvgyDUcFotGEnhmFJ6k9Iro=,tag:BC1xNLNmhA0peMZWPGGA6g==,type:str] + local_address_v6: ENC[AES256_GCM,data:2EHcedgYKzzyzic4QYisaZYlqK3InlOYe85HOfwLrpOKRwumXAeE2+wM,iv:4G7TZzyLNlTdN0GMe/dNOGWJ37TqrwOrm6RTkeQQevw=,tag:SEonfnA29fs7fUbVQd7KOg==,type:str] + peer_public_key: ENC[AES256_GCM,data:OZ3JH2YamRCjFtR1guiLvmudAh/a1DwaGEaVXTUULv3KbCwApHd+MTRuhGI=,iv:XvEb1bEFWcDHlAA1meaje/ZM2oys5LCRdBdmObNjTYM=,tag:BlPXGdFkDjUGZv0GKSSeCQ==,type:str] + private_key: ENC[AES256_GCM,data:HfDyO6NIOfP6BAFkCQdYq6yIQ8yw8Swd4uL+EheTBFbPLQGPhKo+tzXUs+w=,iv:3uF2DdxPtH4EEOJws8qfCixIG3rH3cg0i1kjSItakzQ=,tag:FUMdmaOFQG3XOJa8Qf7JHQ==,type:str] sops: kms: [] gcp_kms: [] @@ -16,23 +16,23 @@ sops: - recipient: age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMbG53WXp1V0doSDduRjNp - bkF0Yk1ONGJPbU9PZnpXSUNMamZXdUUxTEF3ClVsN1JzVGlmZFBTQncwWklzWE92 - K0grQUFWSHhoQnZyaG9GWjlrdnNzdGsKLS0tIHJ6ektJNUtGRHBaNE5ORVRuVGpI - TjRXSmxtNG1hSjI5Zm85YkpxQUdmQlkKkPtzStjDFXPHaiovmxtnoGXEuxElEEsk - XEOxYVSHm/vSif+ZgcSJWgPgX6zZ6j4u34rI6kY362DP0ggmakL9Cw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYa2pIaWhVYkFKSlVTNWhR + aVBUeCtHeFpuTFc2OU9CeElRT0k1NkI0bEgwCk91eEptNTJabDA3VmlvL0FrYlU1 + RHVxczczK0NISlZZM3JPL2xOTmZPakkKLS0tIEtWRlEvZEpzL09wa21zeGhyLzFC + Y21NaUVjREZKY20wOUpCWWd2S0VrS28K/5dFL+sueBCqeaCMD41KfqUPy3FQM/N9 + +I4pWJwIweiWW3/MdW6e4pwLCWpg/5+8Kw/rG/ah1mZXwx0rzOcq/w== -----END AGE ENCRYPTED FILE----- - recipient: age10zmaa6d5pwsqlxhc23e5ytz66k5nfxhry7fxvtayn0t5jfnl5yws4qe7pt enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxcEYrU0Z6TzNrdkc2N0ZS - Y21odVpyVVJwemZpNDArOGNncEhqM3lzWkRrCm1jNU5VSTJaQlFFRjZJc2FKeGxT - K0pITWRrWXJ0NzRNY0loZjl2Ync1c3cKLS0tIGJNWmRUYTE0MVkyOWdHbUtmUzM2 - c1puenBOaGw4NVdSc2xEeklIVHJ0cVkKmqIbeJXaNfiRQuxExwEBQIO8Cc33aQFl - MqY+FtQpM/wmU3QJyRT2dypZ32KuvMh92607GkE8b3nETKNJe6u16A== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVa29YRTM5Q2dYaGtpZmNY + TC9UZVNLS2tTMjdpMXdZdnVlTUkrdHR4b1J3CnR2NWtxQU5VdkVsd1E1UEFHRDcr + Mk5OdnFaZ2ZOeUVRYTRXd0UyaWxHdncKLS0tIG5yNEpEUmNQODh3R2Fkb3hTWmcw + OGxSVERFMWt6VWFqOWNLUVlSa1dsN1kKrzDaITJjnryZ14iXVWxrLUeMAWWni+YI + J1Ahg2ARBpNPiqaW0QAQQkxwlG6S4JGKLhy3+GCJemY98yzEdvy/pw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-09-14T06:26:16Z" - mac: ENC[AES256_GCM,data:k0S9VG/08z+rpnhHcXRBf35fMqFOTj1ResHaXEhAp+STH69nBies1wgPdLk7S01FzrHx4E6lELJMGxG+ax0DlGBWhaFdbPzzKbBCbjw3Y0svw3sPsd8E1MMqnELslXXT6ODpHjNYqmJRZLqQIfhhL0SPO8Kpkn2bPOMzb1W35Rs=,iv:wk14518AjXe2KSQJ55V7FDNHYAzpPii+48A5Kf2cK8w=,tag:nDmUL0PsHQza2JhlD6stbg==,type:str] + lastmodified: "2024-11-29T09:05:22Z" + mac: ENC[AES256_GCM,data:HYd7lBilYWRH29taq3fGipI4Cz7yudqKZFrWum3waZ+DN/abnDdE7QOh31pfP5fRWJY+lPU7iX2Z+5sR6F8eFf8i8PvEsBWneyzfRnXuhBk6Wr23S7jsaF5OwsT333wAaWlLFDvKAyqvhX4xaDII7BgWYq7CXZeIJf47Pu+Kmy4=,iv:kyqI5oHESoh5pVLrW0x8xZ3yvc1kavLevFcOe+ajXn4=,tag:3TdmVpANp0dPnCX/cCO0Qg==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.0 + version: 3.9.1 diff --git a/secrets/iosmanthus/atuin_key b/secrets/iosmanthus/atuin_key index 21e9fa0..cb214a7 100644 --- a/secrets/iosmanthus/atuin_key +++ b/secrets/iosmanthus/atuin_key @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data:1CrnuRz5kFzqytayUXJNNbDC8jzzQwS5QtWkgyNoRa0t6Dy/Tm5jx4rBChNcnXw6S0IzcuOAuOuyip75DMAV3DwVmFw=,iv:ip5BJ+sr7t0R/dG6QeCMgCVxU13YMHKRKYtPgM2qxSM=,tag:m9M0UvVpB5+t/8PHAag/8Q==,type:str]", + "data": "ENC[AES256_GCM,data:uW++i9wKB6W9ClaUhSiLgCEQAOedu9ouBW2cBrEfRAgrIMLwQ7LSshOCUTq68WomWhxplbyJ9dgxFqFg4IGwcbF21uA=,iv:HILKawXjRT0UC8hy9uegjf48pDBVgBbtNcUe96fW8uE=,tag:8X1IYsoSg8OjAV3CjkwF2A==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -8,13 +8,13 @@ "age": [ { "recipient": "age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0VWw2YjFYRERsd3JiWkRJ\nMHRuWVljZ0lYcjR4dGE0NDNvSTIvZnI4SEZvCmNTV3N4dUJ0T2RxS0JMRUR3ZlpY\nUUtEZEkveVBuSkZJeGdtNVcyZEJwTW8KLS0tIFYybyt3NXF1UTNkd3A4eXhpUmlE\nN3k2ZHk3dTBkdzQ4UUozSlpnWGE4WUUKxOe4H+9I7PRglF8tAMWO3u+9zAqsbpbx\nevzS/dBDu3Pwo5Ot9YnGLQcZYWm2fHuWiVA/PIo6+9/Qf/EF7TFRRg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4OWdqMlk3UGN1d3RmcUcr\nQ3VOUVNkbm1nd1ZzamFSZ0o1dysvcWlaSlRvClEwWXRMazV1L3hXY295SDNCOFdG\ncGZ3Z3U5Umx6YXdKaWNkVHkrNW1SMGMKLS0tIC9zQ05wbGhrVndXb3dMelJDR28w\nWEJrcnZVUFNFa3dweEtFdERCV2JURjgKCSpBUoSA+TmLb8dTEeLBvBvQCuuRoqEi\nUp1XKk+ygYXE4EDzQ1BKqd0UaSBKSJu0l/pUozLZSeQnURXI4hNJcw==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-09-14T06:26:16Z", - "mac": "ENC[AES256_GCM,data:9tNNFSf4NsiVAMWy29f35vh0sF/sFY1zSlz0EMO6WF2UCIWL1sGWakf5xrn7+AE9S0UP5yKhnI/fLO3A4Exg6boXfVMm8F6ssWehlvyxEEijK+gyP+21wxkJ16AuRfKFCPJfwSladpUlHU9bfsRV6MTsxQEGvvwMZkpt2leSofI=,iv:puBmMflH282jeYtnEb6n4JUDEf4dQNCtPLZo5ezNsrk=,tag:X00EVztwPwGr5qnN04Al5A==,type:str]", + "lastmodified": "2024-11-29T09:05:22Z", + "mac": "ENC[AES256_GCM,data:npx1jP/4tcYGEvJcPni9Ht5ncc53Edlx1aSOhqkLWRAT/7p6ZUIoNKSSd8C6PN+hoBBxIH/eFyXsZuWXS0grzYFUMDYjSMF8yYe0e41dcvd+gGZqeDsN52PYHhB8WrH+JCyHGF/xMSlgM5svLakVCMyFQoZwjtLcGB2g7Yp10/0=,iv:DJwo6gfdzKWhgSO+liOX1HiwC+yLFtXom31CV5fnkv8=,tag:ugnFYbg/13bk/QCYFjPvDw==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", - "version": "3.9.0" + "version": "3.9.1" } } \ No newline at end of file diff --git a/secrets/iosmanthus/gpg_private_keys.asc b/secrets/iosmanthus/gpg_private_keys.asc index 2a1b724..47f5dec 100644 --- a/secrets/iosmanthus/gpg_private_keys.asc +++ b/secrets/iosmanthus/gpg_private_keys.asc @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data:9v0BgdGUhXwLAQUsp6mU26e/ovzbEV/yvEdG0/66EV2FBUsU5k+pJKIEHNLapccno/3B+nZEPbOZotmh+rHN9xSRCi3Rg0z3GFyhgMkVL4URQk9MmHZfKbb504HABBFp14rgS3e0z86y813uJBWxV5ZDcZ9jEYHAklTdQ+acK5pcY2fj7m83TZ6pcd4CbCLSWTQXUS+EShqbGc0hExA1AT35kf5y79PZK46TgZqBlqLnKICBju4VY0P71jV7Z7MPlKK03wa1gnh2rq6qdOSnV9qHcT6aWajse9L8UUP/ywjqG7F//5SOvSgsJ/2TGJ9Fk/JbjODwJJ+syq/du6uVITRj2BB3DVzVtmVDvALuwskWYKdYZhtuLmgA9pOVg48Dn3WboP7iN3yNjsVWK32VwyB/6LlsNADxfe1Db1ylHC2Hqy6WJeGu5xCg6s5P46OlkKDldX01HV5GAvsAzNwNGt0kZnTHjSRIKLm8iM49NnNNtiOHqZ3FsCdARcqavo4e+8pnavzhV0V8l9eDxFmgLS3LZTTxkpNazJzmeOnE4IVH7v2xEK3s+ot97dwxtdXbs/NNx63L5in9YqGI4/wR/oLJ4hynPEAIcZ718zPvJcqjVQEifIqhB8yc8hWz+0TTupKbtgraKARTYxWF/to40Zyt2OcF8DUCrVSf+wEngitwBLSmup6cGtEo7CA1+QFSznus0+lJL5GHHFDWeU8oBz4FJxFHKU7WSsx5GAOhVe68dhLm75+jhX8yhaUtbOhi7AZ/ySaH59cJd7S8oJy9OgaadpbUEH+hjhSciLmy5u2LCvkpYmFuTVx0XGMEzLrgrTK9JLr9SZjtzendSSUjJidkmAYBkKeTcRyd5R6RRDmVx68l47HtSsE+usF9391YD3DkoLsDnmn35Zi8TiXa8RBBxFa5bdIIQ2DuQHYxfh+SBZxHBfuRQq8B5HTnJQWdYj+DK9E4xiKxAY3qav6shbMZCenakmPzNC5rCVM0FEC1q0pmiqHirsS1py0hiec/l+yTF1QSB/qwphf2Qccnlzhk3wXgBzsGdnQYttO2ypYR3zRejCthjZ0du29FM50d6M5E5OoQ6hmrYwQkU3PNWAm8s/RwmFz2/wetaiRl7v/VKu0I86pGvaxfPlGSnIJbChbTXBMbWPVMTuUItOREVE9S8fqCHL5uqbMcQVlsIwrawuq5fH7FybIwnag9sFIxA2ysQc1qvWSE4ktku273K+abl7jOBELF+FtxnMxIWDOk7SlOK9qAm3CzCUdLvX4KZzjNzhz59h1fd4QSjhktLbfS7oVCx5v9l7A3c8Hy3xBFdn1j3gu/LuzQf8G2dQZMWVSOEB251NVu8+vNS1HIGiFmQM7nvLR2AHfUxth6q6m1zO2k7M6ejCbvMa/mWbfqFO7NKyIKHlc7/qj6p35yvMvGUwlwoi9I5nph66DNMfUu03zOZnBKa2XHT7TCr7AXxnc//4p+a6cxZPMPAXI9TC1wkTnPE9PrtYyw7gqTBDbHuj8Do+au9B3D1en9l4ZZNIA8qsbExqA2A0xFMOH2pEVnjeNJNtbCF9QiEcKEFzjsm7zbpdM0tu8WHjKUIZ1HTDKMG1x8sYWB0lGvEtKvR3phqZYRYnhWbmAAsVE5xXzhkrh9eLRgTLRTw74KIjxy4KNK04AhArM0dU258vVVZ5etpSkZ3XzqaieySDArg4pk4Na5RW1SXLs22iVg288qQTQPoEcYhXNWociIq7/y1sIrMl6BdnafBzbvAiDLSQ0AUmJdeT90XHvJEZ8+6ZcmzqRmokr/2qFk6h0yYfat+JY2LwNegKoXG9ucQ4od6Z5IGXuGyDAn0IL45Il20QJBiwu7v/LtWYb6QyFk71G5Cyb1wZbr3UzpjRt9CQNaGsQxbFfa2lsk/HwW8BKSzVBbes4=,iv:4jm0yWEFfyQyx+YJkYcSaNBrYHiwIxNFXaJwU9DdcnU=,tag:BtXy6KXKoP7vr5mgbeOMYQ==,type:str]", + "data": "ENC[AES256_GCM,data:AWwzNmqiyvlZpIV5SdtYz7cMUk9E9Z9oJu++hzTIM/95dNQ3gO9Ji1ZdNIOX3Bd2nn53G7G6a+M+DSqL8HYpXMzywu0EsbmMo4nSk+3Y3QMDXhyzMX+a/g80yjivPmXDXXQlhZBjgOW3KbWSwt1IE7XMXJkLrMARATCGtG4W1g3bsW4FwhJlouIS4kLbJg/4afCFGpnIYiGgj3df9+ck84cb/cTbFYPen2XXaDb0xrgSavE2hbgT9SFGEtR4OoSyun0qBw6ye2YBsKyduruBTST3NAFOWTOEndKvpXeWPEkU+83du43kQB8GivzP9TtqclICLuV39V4xaW272FTcUisLg8tWzwUejOj/7SURRTmqcirVRwxVWRa9lAjZJyDdFpOLmQ8s7n4RbTX4GiNjrzBjrqMPHOFCkmcp3ZCMsJXSKaKN13UTh9fmfz6iMCxcxZ3WWjm+Ytk3NOn3mWPATLb2vdvPjdJTf9GOBZc85GY8XVcfR6NF6i3+F9UwAGAMzIBxGaQRWh5g5q1qYTUML2T4X300kbbBESmpp2okgNrHyPM7okTeaJ0jTIOBLNmIV/CCI0/pEElpjH77nKssvVZVjGg96IYAV5CVOoUZL4NPsSMvK5WNY1+d6pfqU/xYAjOMAPPRFBlhLOt1iLKDJ1Z2O23J6VT8J6x+uPKB8i7oVJukGBfrpBVj5pudlI+gL9ihF+Blw10Uldq+ng5UakZm9+tmzxWBAT4F+q94XtGP/2WRXou5Wn0hEtkq8UfVm2z1QbfOd+50msJEdTjrLvSkVxothayV/ovnBDOfo7W3ZcAKVTbhsBO6zrJM6Ircn+qg4omeHB/EpE0fcNgUZezdSGpG777BofHncfI2bWH36WTh/xfId8Y1QGuzsTrVTPyLEHohfyLkHpYHvW59HwzjXWklZvDVUVtYtQAtFyKeccb+TJg/H2s+CxBOlkGTrg4CYfVqe68FGziBSMNSEGWqNWQJHucbDRADcINT6tqk/qqT1HY8A5mGsuhvmbZCUtmdmUBnJSQ1QTNBL/RzA7uNlP46AXJ3m63WBoC7IWyzRLhO5OqpPveOA98THqXaeSHeLqgOc3vK1aTuHToXIxUTbmh9r78B8nIFIV4fSe3uNMT27pPw0t4vQA2elC7tFJmGUHA6877mXqSJaWZzeK7nnoYDxo/DE6mtLxWFf2IiUZgApJeMxHCFXCMS/YS/qWvpfAep6hfMTRX8zPGvdzjwjAnAiKkaoGzMTLpw604ABPSBTFPSe/5pHLOKLwEwEk0R3Fknv+RNCzD6VqeB7HAafolKsYxk3yTP3MXJnT93IwRBVHiFFYicvnOZ+obb8H5wSVSZMiHwdA9WYwlsKEHPXJ80sEybxwtBuk/QM+U6dFIq77Rs5hdyK50HuaaHWSIEwzWTNCsGUE1LgyOmH8Zmk7R1oCOJK+1iV/0iEW8qRqVA2w/tX7+7ly7R4rf1QIAgTpueZqQpprwWt21NF6DBX5BYXi1folZGdkSJbDcNVFLVyjtX5p4WvEEvwb1wOjnBZOQIvG0zB0NsBCPyDxjPPdhSVuXIFqVVsnu1bJj7e6arujvvBsH1x5l0jZFUCi1N/jv+NtbyKkon+VtDj28l19m6clCehusRQX43OMu46LpDPq3HlBJTyTElk601EKw177Evk/34vJr3J+5NcY+Mmb3amZSNa4gHFKlBx6itI2no/P/iuNiv9UQV/EhRkxNApyF8ctYSOklbgzG4hDJJL4sPOmb8oevydmr3sp4Dz77gLckIDIXMTnUNS39QTp6CAJUMCqk6x1gHrGYDM9bEI4eCIrBAk8JYcxzHiZo3ULIHQQrp/awj1kgdVCijFbAW4gbqgY57VoWX6fSxN8YLKI6riu1ZQlFEzcv1a0lWZ4YyzW1Pn/4mMRhnTsgsxPI=,iv:Yvn3Zc4mEDVYgcE0PhTmlExCU8e/S3nBa4lu+H9Mr6o=,tag:LFAHWADLE5yxTJ4lYlyuGg==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -8,13 +8,13 @@ "age": [ { "recipient": "age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkT2R4ZmlueVRPeWp0eXhv\nTHk0TUNHcmFCUHE4UXlBWlRURFJyVkVMRUhzCkdHNVE4TFpIK2g4TUJiSkZaaDlM\ndWNrbXNRT1FCb3BjbG9HOXgwVy9GaDQKLS0tIG1vQ3hCRDIwRzNFczdkUkd2Tzdk\ndjcvcnRvdWV1RTBqVmxsZXNKNGdtY1EKUZIGQ1Lh3P8jV9Js7VFS7xC5djkZ04hP\njhDCUxDqqEIFnOjzl0IcjETQqYvyojcri7jXXCl7xGxk2xKlfvOt1g==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4MjdGRHRwNmtza1pOY2M1\ncmxoK21RYjJZaVlvQzhuQzhQVkxBKzJUNWhVCjZwMVdmVmMyQStDL3NpSmNwRjl6\nMnJFdEhQc0RNZVlqZThOcWZlT0tZUDQKLS0tIFhHbERtRldkK0lYbEVQenRpUG9K\ndUl5c2JUWEhFeFpkN2dYZGZnd1gvSTgKJEYnspevFRvml0OgxIeScZgvBYTcszhu\nsYEOyaxRE74+8dhQQ3wgiw3p67JT5puRO0ip8n0FaWs9/Wr54B1ncg==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-09-14T06:26:16Z", - "mac": "ENC[AES256_GCM,data:9IIdtxxmM3RhSv9iwC8qcXyHjQIVsIRWKQ4s9s6He/ESSGp076FdiIFhiE9xcMf9bMaa/qnrPMtOIFyQvJYO1XgMSCcLZGl5lcSaIx8FP+NiByqge0NibESPeqhqGbWlmXd8gp7cWbjo6xqlEXTM7FEC7vfSiyULGEAa4H1eRKo=,iv:CuuuOPrQ78o7l2Ba1Rx2Csxs/YWxQygdVuECUCnlC+w=,tag:44wM+vw8zxI9ZOzBzgztCA==,type:str]", + "lastmodified": "2024-11-29T09:05:22Z", + "mac": "ENC[AES256_GCM,data:cS1aj19YLs8EHI3ESF3Re9RTiWClbtko/bRsX/0vBAhyhkEpxyrS+53mE6s7MNj+/CgBlbd2n8YjU2fW8VQ4dmNTCmPdw9GmUaeOUXd+UVXUA+oN2JXwhFa+4fFexEkTDkufa03ywkPig6i1vO7opxhXIYQTs/AM7NUf+wie+Vw=,iv:gg+ZmNzQBta/BiE2zOG1wi8utytEGTw/uzXLuohKogc=,tag:H8adUucZUInC6qzYaS3GmA==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", - "version": "3.9.0" + "version": "3.9.1" } } \ No newline at end of file diff --git a/secrets/iosmanthus/id_ecdsa_iosmanthus b/secrets/iosmanthus/id_ecdsa_iosmanthus index 48d1ad0..52b6303 100644 --- a/secrets/iosmanthus/id_ecdsa_iosmanthus +++ b/secrets/iosmanthus/id_ecdsa_iosmanthus @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data:u1fbO52AFMLmNVEtXt2+1g+DTzqMgOQxPtB6ZU+eEBSBuNLlXZVcW7E/Wwp1gyPlnX7aJ2jO7r8av8O37KhJPBQgptQoE9jNAwZ20VDp1m2e61fddGIKyrKYrPnvyruCQrEbdtQ25kF+ax2PU558mwRDig+KKbukr/ZTAKiWOA5ygysi2SaU0wTjCoVQH50E/zMEJDBVTX7SV8fv4O8jyRI4Kwl9Mo5vvIM3GQW6ZAIsEjMIwG+y9jh6/rjmaJPNrz9aqt7G4mgkQPJTvmFj8b+F8lHS42tNnqjHnKqKCAY+vD9OfpY8ejSvuM/aew1pby7zhUPy2pPHCaYddrAG1m6qEuHn8mDd1LtH5r+Xae9IIpEZwwVwjgqMkqGPJsF90x8DKARVZdLSXTNcIR/3+Hr/W/v0N8tRRV6JzA5qzePivs57aIcKfZfosph8zNTRRGvaNbuUsd8pvdg3kkzDyd+QkYFHwowcCH5/JcLdsOz1hfDy+XAayBbNg26zu54QpEZ4BdQUjw+T6jdwuIAOhLBl1ojSMR5w8EGDmyN2fMjhHbYX4NDW0J0Rk+zu6N/s3gL3mFKUtrVre08njMxDFtjt/XCSIwUOMCCysveAgCFM+TPKjT43MtnVOgoe2bg2f1EQ7AXpuGPPmmko6J7JDoLBrV7V20NzD9tmYbFnclQhhJRAdXGNFsoMAgwQ86RF7A9s3Ti4o6ISayhZRkYm4q1XLfIrTZKWLtwuc9cakm5AvJ+qtFp2HlAn8Jq4ryqGvWJz6HO0NYd2npK5/Q+UQ+n+WFIVgQ4L1ep3Ic7s1bTV1UvSdhv73Knxk3QReTdTRhLE9BZQg5NMUF+uqzxY6ViuSCLigIek7fKtVVbHV1NETEod8lKNDL71p2xcNolkMTPqrPqJBeeYlSzengcLtd1ns0Aymf0WWYX3PAOMxc24S4F8F9xp1r269hObzqmtgH0u6B7jEpXuxmAknk8sAjuYMLJa8SSLdkQxbg==,iv:csLf6uBS+oMvn83qLWhq1Sdl/IhynGJeECHdG51YIqU=,tag:sHv6SYDP7CxJHx86psNM2A==,type:str]", + "data": "ENC[AES256_GCM,data:lDEegw336ZbVvfbeOoeI4e+1YYoLA1WPwrlfk2ADgXR4CIV6YnyeRCn88RbqxD8o0bQxMgMFwq+kkSMYSuVfXQCB9A2MDpC21dtteT51MoE5KliCNOh9qYdYTZRnbspysGWsqxNKCwUzS37t3qTFVXpBlWw3ktBva+z6Ea+NnwPD4XYCgey/zoPy2YpNHVv6qmvQkplgavHYwwkVakhiZXlwpYVYRGa2fIcAFjntpROv87ZRD9qbGySWfczhjLSgri+ZJLhY/Bx9xg3D3yy4iQ0+XGNnEjvvpTAZiRLK3Zokf46IXATowt8UQ9uoccI1Gf4We09eBcZuWiMyAaiVPjBBxvdJ/tofhLvAhis88sMoJaNBcnhJ56E9+x37vNEybDaYoeJbPyb+aYu9+hPXuo7ridBxICOFJGb298v/Ns4Q157blVx4KKvwOyPf2ZTPodyFB9DEJTjlVFkAahCV3ATtCJMrrrj5Br3k+B+7uO/pzUGoOHDKv27hTBDxzLX8LZ+OQHBHbP7fDnWSa8XXAAF++cjJXUscj/dCefmE7khkgB1GbToR/l/vlg1cetEQTOvfS/ECMzOm7ThRQ3lUOoZHdy+rAnaeOfyAnf8PsnrTCNeKaWqWKHtkEH5YgMNgFrvzh05dvMvjyhr66DaXj5vTSLgpiAwCHfiX9B7NY2lXJeWmJyB4Qgn4x/zrz0o45PqkEadkitlpa+Nkt1DGCdWcjCg8O++Z3438E8UJ7aIaBO8WtMZfK/ZIj98v1umo7x/3iIgOebFvbXFphjziCZ1550Xt/WbYMyE0Ews/VdW5NSHelJDjyDvvPYkz2fsszTErDh/3lC+cs9Hl8rFaTpz7E8ybcHGxeOMr6vog+ie0piLiOCeb8uKmjYNF9uebMPxx4qIm60RcGWbem/lIBeXklHbJsLEQO+DRGB0SpjF+Ry0zu7ezxtA5PCDiQmIO40WD0dA+f/SMLTmINYbeQQHtYUQfB4dG2easYw==,iv:5UlVHuPflDwXduoGdzwsV9It6erpds6Rnf1co2zSteI=,tag:/oVcuOD+UMwXdwu5A0/54g==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -8,13 +8,13 @@ "age": [ { "recipient": "age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvK1piNVlCNkNOQ1Vna0dE\nMWtTWTd4WmlibU9BTk1xbE9XSVB5T2lTYUhjCmdGbVcyY05KZWw0ZVAvbkJaaGNM\nbkRObUVXZTZIWi9kTnVPb2Q5TXVBNDQKLS0tIHFjejNGbXBzc2Q2djRRMnZKeXI3\nRUxGL1MzVVVLenZRckNiV3lrSVNMbjQKGNhyE3LHLJbTwb4AGtcPNHzRPHV2QRkK\nuw3NoSYeJk288Yyv+DZRcWgt9koUILgVzY7tYrW0gO/X5g2/lveJ3w==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZS3RIaURkeHQydnMzSlgr\nM2doT2F6WnFZRHA1YzBtbE5RMytrY2h2eEVRCjFudUUvdUlsNVJtZXlmTjNFdURL\nNWJ6alY0b0RUcnlQOGZNTXFQQVFnTUkKLS0tIEsvRVlkWG5ZelVvUEdqUlg3Y3dX\nT0RrTzNTK1VvVzFqZnhHMC9uYmUxZnMK+A8xD4Tlr5vp6x/zjM1EiBrpVyXhU8i+\ncCw+d7I7D9e12Xh8I81fwF1AHOcglFa4DXq/l+7iOj7EIssGpw6TIg==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-09-14T06:26:16Z", - "mac": "ENC[AES256_GCM,data:5q+OkmlnhWC7JNlgtWnRCynsdcsbW4gEurnXc4/rvIKUeJgtQPHL4mxbYbPdYSuN6Un6xhGc2JwEzG5VxC7lKQob8XUEkaSOFabvcp/i+/CAbY2pdZUGd6AKRnEBy0V2kEJHidB4ShwaeVvCeP39UNBNcR5VHh7yooJ/9C7F2aU=,iv:amAybT5nhJ2xfd5EPetEm66Kd/n6ztb0XksJuUhPWtQ=,tag:5j6Vno/uhSgoGwfL0laRYw==,type:str]", + "lastmodified": "2024-11-29T09:05:22Z", + "mac": "ENC[AES256_GCM,data:8NEkMXyNDX62w0io47xlMa/anTIEyVokxsJi+nbhQkrWLiig31UD+J0h4KX8pzDX4gmWqGVYR+nWDB8AYNTUxSYF1EPWPFBpLtKGnB+9pmiJlThvXTjDKnjufx2E2aFUthD/xYCN8fpt+pjW03J+u7eolpbsCBLUtcFSQkdczoM=,iv:TNR47dRQ7IeXKrUkFy6vrsXptXH7ILzGCm2QqJlH1mw=,tag:i2QTP6UPBBKQKs9O9lsGUQ==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", - "version": "3.9.0" + "version": "3.9.1" } } \ No newline at end of file diff --git a/secrets/iosmanthus/id_rsa_iosmanthus b/secrets/iosmanthus/id_rsa_iosmanthus index 5ebe3b3..684f99f 100644 --- a/secrets/iosmanthus/id_rsa_iosmanthus +++ b/secrets/iosmanthus/id_rsa_iosmanthus @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data: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,iv:+rb4xSikb4X9nPy+Z/87Z9MdJ/p9WSRhyiccdzyyhUg=,tag:A2vl1A2bKfooB8qPePo8Nw==,type:str]", + "data": "ENC[AES256_GCM,data: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,iv:izHGNfE0MGFTIKPznyjAF6U1A7SdbawgPD7vT9ppkiE=,tag:Xp5//UEozJLc2ZFNdX6ceg==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -8,13 +8,13 @@ "age": [ { "recipient": "age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNVGpQajlQTXlDM0NJT094\nS29oTkJORVR0eGNtMGxIRjJkTlVFRmZVcUVVCks3TTE5cElJUU9nSHdKK0NqMDk5\ncTZWd2taR1pWdVdmWVdZUmpBL0MvL0EKLS0tIEJHclhkTTU2UXJkeis0NERqeUFz\na05iaThma3Qxb2xuT25lMDYyRWNQRDQKxVf/zvBnqD9+RkYcIunjypV3eRxF/p1F\nkrYX3AqnUdmUQ1QB4CMrE69+GilfK8oZAJ3eXE90TgoMNb40yS+2uw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvNGd2cFU5MFVmOEJmTzBX\nUC9YczJFSFpmbU55RjBTeXhrS00rUkNKK1RNCnB6bEtzd3lmWG9peWgrUFh5ZEd6\nU3dqZ1podGhWWWlLcW83dUdUN1lyVEEKLS0tIFhtaElDOWlqTmpPSG0rYlNEWkRY\nNWdMVlFYVW9KanhaK1h2S3dZNUhkaVkKVH52M9yJQF8ccOl675TCARhBwXVwHqlU\n9aVCOK5UGNmXWXqroKlAjIQqpPqfqR70/KMKapyy96EFAFPKWAeyJw==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-09-14T06:26:16Z", - "mac": "ENC[AES256_GCM,data:6hgu8xvs2A2Y0o0unIJKIDE2mdEQOgYWhGFZD+pnBMos5eiJCaU3DS28CpG+f4WkbwACRL/ckypGTMzLRpvcJaizSaBgckFlGP+GJvJUAsBUtTH/J/IkeQnoLafps9nXFNfN5UzJlIT5/yVdza9MgYINO0D7R17mXP2NYOGxc3c=,iv:9wQ+6HTXcfxjc1yTS8Eu7TlK7pxU0ZyCpqR/ls1llUc=,tag:5Fx1ltwPgeWH9EID/CZdiw==,type:str]", + "lastmodified": "2024-11-29T09:05:22Z", + "mac": "ENC[AES256_GCM,data:X/ZOz7Jmr5gdsdcUVF0gxVXzlGEEinWW/LCTZfJtkNWsFm6I/Xjfq4dTEiOq7wMK3Oq3+gY8Dhj3pDEUltLQAQDN0WI7A3XoNWlNO8tkWsY6Xy3GiV+oeEPoU8W3ZfVG8yyAezql05am4s+196BXr/gRHba6gJzrguUr/VdRdcM=,iv:bzTyu7UPzRFV9jMBh4572hd468v01XnjkivVfWOXPlI=,tag:BQbDqoqE4Y7xX/OlPCbjIQ==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", - "version": "3.9.0" + "version": "3.9.1" } } \ No newline at end of file diff --git a/secrets/iosmanthus/nix.conf b/secrets/iosmanthus/nix.conf index aa4bb21..ffaab3f 100644 --- a/secrets/iosmanthus/nix.conf +++ b/secrets/iosmanthus/nix.conf @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data:O800AZD5RysvTkbisPhTOAATGD+BkvtJdy0LoubMnN8h3jfcLMeESZVVimGRQN6vvkd4zr8EZzD4I0CX4SeJ5L8Hj0Q=,iv:RQc7H7RZqxwuRdE1HAfIAqLH8Sgmi6F7h/hikrwDarw=,tag:QlucZAqNe22t+lyoJ0+n+Q==,type:str]", + "data": "ENC[AES256_GCM,data:NnDSLRl6IviGp/n0KRoTKwiBU/nZElz4yR03jXOEruZXcKGelhNSlMBwb8KdLcsM0Qes/+ijvrtHsnsHfkKP8ybVmE8=,iv:QsJJ7Kmf0xcGxECFlZ/2k5XhWcA0y1JoXhVCzrqe2fw=,tag:loraL5BvLW+5EvvEagkocA==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -8,13 +8,13 @@ "age": [ { "recipient": "age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCUmZ4YWtyQUx1blVFbGl5\nN2lkY2hEamozSW53RVdZOXloYk93dTlVdUY4CnFCdzZ3eFpzYzlVRTVhNU5qRVZj\nRVo2MTl0UTBCV2dwVzB2NWxWNUVSY0kKLS0tIFRleDRXeTJmUlBkM2hmNys5M0t0\nUlNjTmsySzJYS3c5VTFYcjhtMDdiNW8KqfdHZ012fyL14S4YKEHZR6dNMfL8v5p8\nefxhrtVWWXOBXkFJw/NNlz3ZF8HiCtvEjfD+xivBKYuMaGaBVDEeEQ==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpblNMWFMzcGdPVHZqM1JR\nYVNWWEdaUjRJVUtWWjJOUkErZzRXcVQxeXdVCnl1RmxlRzgrZXJueUJoT09TcGZZ\nbVlRYXc4aVlRWk40ZU1BbnRKUmQvYzgKLS0tIGpTNWt2eWF0dGoyN1U1dUZSZ2Q1\nU2piemEvaG1hclBIMEVya3NtbzVWSlUKVYayWioGIsz6Gtj8NfdAevMa7SIT+MUb\n82p32PCmSEJ6eCC+82WL+6OVZDk4SYbhiDlPmH03Bb5H3xg9R9l6YQ==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-09-14T06:26:16Z", - "mac": "ENC[AES256_GCM,data:tcuFA/xCsWsNgNOwJlMhneWcgVKM4c24NlmOtdeIpxP9zRpJoxGHZKu0urhMjS5x8c8gzuUhMUrhAfhLR3t1vCrG0jbQ/nxLtpq1Et9CIgKLFAhK3FdVcbLmQ+bXnsDeAlxjcSywMHaHWFWHi5YSQ6JYek3+A82SMSP1sqp8psQ=,iv:Q1m+wuy6r9HDVHDY2xMktCsxmS1CrTPekcVH7GAWN+s=,tag:UZ6+thqEhi0dtAzdtUro4g==,type:str]", + "lastmodified": "2024-11-29T09:05:22Z", + "mac": "ENC[AES256_GCM,data:5Gp6gJpddFjgX9Rv+j8ZR/kSHSla956gx5lfTz2n9eBu/D2UU5IACxeQFgdfZJpYGH/U1MhGHAqrS4cFotkqAaqApdKBjjf5Fgg8fgfmBsw15F1S8K9g82sl1jUnapC5C4P0t5TvSsnMlz/xC+TG7wdXUKHwz56WNzHlr793/L8=,iv:kIgsy2T5TRYG9hcl3L8jbPInDsKfiAJZKE4aXh2os+4=,tag:yICFR8QuRvUiyDdgkFO2eA==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", - "version": "3.9.0" + "version": "3.9.1" } } \ No newline at end of file diff --git a/secrets/iosmanthus/ssh_config b/secrets/iosmanthus/ssh_config index 17f5588..91cfbd5 100644 --- a/secrets/iosmanthus/ssh_config +++ b/secrets/iosmanthus/ssh_config @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data:cINE9c3VNO8VEL1ADjM3G9LJoeiqv+Lt6X9RKK5e87sfgsx80bhdMRmZJgL8s/VcDq+pfXhOyLHo2qLBRsqYx6o9ZbY2zlNv4m4nEpn7IZLlCTmYM3EJjqY596sbVkICmasYxRRU3eKug/qfXOeCSXRtd1ATXp61c/66/Y/CPMuZlOXqW3clrpD2EXdJP/yLmh6HO0p+XVdPtjCesG5oFpXlwpzJvKR60ON23y4uYeWYf9D9P4LiKhTXsST+88BrACUw4acN9ZioRN4fbI3t26spNEGwaoz8Zetrv/HZYxt/E3V/8zdAoXl14FQOz/72N6gLbRx8pBDXm0jBAhV9wWZ29Q1TDbvKT6lQCrTtJXZ+v7Wp5x7uw/86R06efShuKlmwrNROjC9iq0y3qbtkwsDe4e6AgP5MrsPj58z7SFZdH6plGk7ICW2KnS1cy7fDk5/crASsR4972kKhVZtqvEZdvWRjq6VMbdTW9L2/wQxC2BHYEbVI8l+HzD+7QznKjdYJ69H9mVT/xU5x4tz58Hr6RVXvy0H4gf5OpGV+hcI0VAjMroaAR3PbDKUpgjm4SBpYtko//KGwDTgDr+CiMtilTAxSYK4GGEu2l2Ce7pgeKvbzidxyrCjeVQFg0QQG1/uBbhS5YIJ7wKVvpknfWpJjBnW07uEV35dXgfWL2ox8C4kjS0MBmxkSf5a17ecxwlbFtBGGmKFYIkjWvy9f/e8NIYY0bYnQBp0V5q7b9z6QJo4FMArzWjI6gE7pdbJ92CukczJPld8lUUWcgKcHS2lU479Uv21gil73EIALKDW77xwlrJL7xshudWeyMf63iAs/8Y7Kz+YJq/KuzIEQNcZRT2yFlHYoqhcLVnJvF8caaUAdqRYtT4VbRC29N1LUZeChP+hD+Yh8WGt7cDDeVLSfiqOYKGfCU2ZDe4Qi009au3r/Qzk3nu7Eiq3QGlY3J/ALeExs3U8u+IGmCkauupTHcRRW6eJyaFzR1xg5qc8wLSFLA7evybAL+O5ThYiyJIdGW0bO9JhiftJghIxQmUoJjdFnXVGDAivz0HY3kQBBjnZgfnEfw1KNcS1Cz/cWG2KNIcsLIP93+otk5SObvDRis+RDAQLJI8ytFhwXioN7hbbbkBrvkhwn2xsM35+51+TbRquI83/E5SR9hw==,iv:5HYwuBeRBz/Adp3y1K5tsgC5hCgXBDoUuIp9/S7be5c=,tag:Mlu89J2d6wqgxogSIHeQng==,type:str]", + "data": "ENC[AES256_GCM,data:U1x5dg35r+GHI4ZL3GUcr5C55R136gUoIVsY2WxXzIKKyRGplIASELuxd0A7Rjc/mRvHqa3JyQolxj1M36YKrAhX9PvZymXkyktRqrNhmUl2KKXKKsizCK6wRcrt/7zV5OwTNtsqkw9PZFxhOS46MzO9uchktt9ABpuA0ocwvj5fngUt3lA+8PjFjk2jpmH3mtGhLaGy9CBd+pNQ/P19Nj8AtTadFi9X71Z4ATyijmW4ALWS/+UHyWQsgLidbP7I3xBUxy9wjp8WdqFf4+XOcNC9GKAJI+URJvYQ5PhC57J6wXC3H7Qw1+5YVgdN54HUvWH+/1xhNK2NLFC/zYOfowgvM6xt0py2LyPvdlj3LmZGg3ajvHtH+wb96ejGS9kjikpkdBbbT5ZK0TLg03sioysnPODjIl+YnJGLukq++hmE2sVAgy5YI3/DyOWKc8leSaby5WN/sGo4yw5yT6roP9sW4VTFNuJBGiqAV/3CmU98t5RvA1tSN3ymioHkypV0GTaOFkeW5BSy8GThO4gK+etS7xD/+KdvIMJN9/tTaRvd3fLlboSql86yY6WhstSXw6YmWHZlTIK7QuF6Vz5QBCTyDAwBOd5ixc+FBrxbIFRp8JqrwSpLDk0LiKYj/4sNAsDSZ1+TovDrMxBVxlB1AQPVfLwvqJb1sFCAtmXGDrxFVS3/634/PGPXTF95idHM+qC0RQfin0FSeSDjSVDQHaaLvGW3lHAE2Go868e3zRLVmVtc/Da5X+hQ9a8xEiTkKeQ4a9K9zU/PBiULmnAXwS1MtmDwC97GHvya2ioRKr5FQBcPARx+dZG3+KzzrsMlw4K92cgZIedZBS85jEC0gXcmVJsBOJeynuO/kd0rwSY5Ln9zSm2TLc8KRALpY25iRN+hs9hcc90R0etifgfyNkuAXmAxNIuMLrfGcmxgnB9EQne/s1ijcS2iqNiRfmkjPa/1cCJ5ZwT+uhsSOkbSs3wB7RSw1RkoqbewwfLi3PZwr4LbQtKd6B2PfDHHsOgwDdjEt7cnhMpdOpsjedUyJj8m9jV8ofRmrjDMwDWmG06KQYxOp/qTOnMmXAlAcZn7xU67N0SG8poXvRxHKJzXfzjHgml6Mz1J3dehQFNt8kvnQuOy8pzxNdusro6Aht0fM/TfUyzRFoggntzN6A==,iv:UArm3VPMqKJEkchiU7kJQO6j2XrHUew+iCF0wMaF3WQ=,tag:M8FJu5LmwpE1WQUd4g+xKQ==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -8,11 +8,11 @@ "age": [ { "recipient": "age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnc3lBZlpQTFlwajRpVFhU\naUZ2Y01BMGxLSTBGeW5rNWJDcWdzRUorZWhBClIvM21KRFI2bUdUeEtZVUFHc3Aw\nU1lXbElGeGFsZ2lTb0ZIQ2FFOFNPakkKLS0tIHVvaFhLQWVYSjY0SGhXR0dKUi9J\nTU9EQmJNeXlPM0hoV29wZkxtenRwcU0KMuNwBkLjOU0Li1+Cu9cuDyB8jVk/6r2R\nCEHQKVRnKi7DNf88CUGyiZaFrFBdKWy4jKG4ymEl1WEDTSRSdUgZRg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIMmZ3c2E0ZWFhUVlSSFE0\nc1U0bk96dlhNMks1czV5dlNiNUIwY0JVZURnCnNVTDJvcDdDcVBmS1NhMUdEcEZq\nVndlMHhTTk9XZXk0WWZzMHl2a3kyREEKLS0tIHpWdlltNGxRUEhLajY1NFYzL0tH\nM1FjNjFMYVA1V3VVeVVQYVRndWxwaEkK1Nww558M4XcStcB2S4uhhFoSgejm2qCz\n2Ny2bo6UuO2smifYwcLSha/gWkjBI1gYZW8MwgRYsEqnj6Fpv2CDNQ==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-11-27T07:08:09Z", - "mac": "ENC[AES256_GCM,data:FgOoup/ysk3jYoNSRuOQrFEd0CbwLKYkiv1vw+I0oH7VadidPX8OlA5bJ0ozbEjYHULvyGFTxp57kyz5wqI1a7JiGxZyfss4KWfTIDdneAyPN0pbWarThT96NBEPe/BunuHLRcETqxfx6x8Fmbc4Ur8XtXdWuizM86G++BmsIbQ=,iv:mqkJamr6sIl02D2FU+NQ5EfbNa7eSD13pp+KVE+3+jg=,tag:1AInKRO0xprozgjx8k9wbQ==,type:str]", + "lastmodified": "2024-11-29T09:05:22Z", + "mac": "ENC[AES256_GCM,data:L/TX6vTDI4iSE+RUgUEa16lFcTYln3M2c/pfB2PDeb8c/C3hfmRySonkVTLJ5V74Yfz72BtxLJzOCIgezxQE+EC2MhTmbnblIAeWFvHriWMIwxsvPEyRIAwbSsAggUBArDOTU0BaFo9vRseZ+linv4riVu9qksqzMK0XLmL3Ua8=,iv:XG3rrCCQMrPNrOZ21DjXkcmPylUr9hknEyRrNbGxN1U=,tag:mNvJJJY4/depCueGDxVjyA==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.9.1" diff --git a/secrets/workstation/secrets.yaml b/secrets/workstation/secrets.yaml index f3b2fb0..abbd478 100644 --- a/secrets/workstation/secrets.yaml +++ b/secrets/workstation/secrets.yaml @@ -1,6 +1,6 @@ -sing-box-url: ENC[AES256_GCM,data:+0NKUY3iKyWmOHzx+YV8KMqUOLR/cucnpqQbmrdExAPpFccuBAW7FNoXUlb6EJwgznHfWA9CdWhBvxhx0FAmkZKaUw==,iv:W9E4uJMd89l9HlBmpLKw0p22yuo90OhGBwpFgfzzbjs=,tag:a4UU7OrAycJOGS0xFJWCPQ==,type:str] +sing-box-url: ENC[AES256_GCM,data:CdGlJ1xALL0zCebN6JeeDgd1IKXwf6ie60qw5ATF76ptQA4pDXcmWau7gF7GKedclPQIN56gpZg6MG220V4Zb2GOAw==,iv:rdE6NqqljkEcQSnWojLkHEjs6kHboddsLGi6whIVmFQ=,tag:oCZ+mNugMpfdXLFTXfrv6A==,type:str] iosmanthus: - hashed-password: ENC[AES256_GCM,data:zmIwTwo42yR2dn6EEQcBG50e6cA21Rc8S0D92RirLQQYs5uAQgXTkSUPMFq9PYJsqZcCKxMpojVozqx8iDXzVxMZHlrXgwpUv8cbI3h/ayzp6udyb6XJDS14bFq5ofmR0eVkBeF0U9dp8UGFrALl1uyKD+oUIA==,iv:XUpuLt+9PEV8eIF47JSAWFWDfS3TNqcOd26WPeNxk+g=,tag:HOEC1ix2npB87Z/WaSbwDg==,type:str] + hashed-password: ENC[AES256_GCM,data:JrLyDZCRyabo429D5QFGcvB8Ap7neR91YxKJVmjH8RT/a8Qyh2oLGjduWU440B4DN8iUt2VFO/IuoIO9c0u2szyWgY+8hzkFCaF3zSHrONR0vp6hHb4HcYJZkiQKAbhHxQ2FmlNX0oIcCctWsZ2liIjVSsOTYg==,iv:FmCa24YaOJUwigdh5JUNM/IjrRwlmvBlJYGQSKQvNp8=,tag:I3VJlu/2w2hio8IiXngdBw==,type:str] sops: kms: [] gcp_kms: [] @@ -10,23 +10,23 @@ sops: - recipient: age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBic2FiaXZScXpIU0xpM2Ny - OVhHRXZiRzZGaXBEdWlpMHoxTkxpN1V3S0dRCnVoczNIUmkybXJUV2V5QVFHRGlG - RUpmcG81T0hZREtjRlJ3Mk5aMElPOXcKLS0tIGRrZkJLMlR3emxDMnVaM1VMWVAw - MHM0cGhOYWtBS00xTEpmeUJhSWJXaXcKBcmgMggITJ3yamxjZO/Qx4o8qanTbbBn - D4Lo3cdLzza/gILUuCpsF23dH722hoAN5GgNUeIxfwv0SY2J1aA4ng== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4WkVJVDBHdk1WR0Vva1Z6 + czQwRzhyMitkdmdUUFgyWE9EMmIzRkVrWmp3CnFGUzhONHcxU1VGdk9HN2tUOE9J + NHlKcWFsUkVsMkVlc0dYdlkzL2xSR2sKLS0tIDdmTVQ4dnpPTi91cERnVnZuNUxT + T0lJbzdtTGMvVkpHNzBETkpHOGsxUEkK7BpAyzjfzz1UDR3kYo5XnXcNMZSUT2FN + 4W+TTsEenVO153NIv6ES4Uo64leDRiXjnYCHQYG08icL+KIBb25SSg== -----END AGE ENCRYPTED FILE----- - recipient: age1gt6fyh2fs87yyu2gnaqmzj3f0pdad9ecx29lhf83un0z94ng24hqn3pg4n enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFQjk3ZFpJRm1FeGg5TS9R - UENvSStwY1ErUlVHWVJqTXd5WmtiWTBSV2hjCmtPQWQ2cFM4MVp4dFdnZS9tL1lJ - bTRhUndPcExGTDlrK1RzR24rYkN3R3cKLS0tIG1mR3NnelU3YUZubGNGSVYxUnRL - bHZmMy8wZEoxd1dwejFpWTdsNE9hbG8KIAgfVyCJS5ppYCE+ma3+gja0wAdigs+3 - NCkUIdaOaoL5P5ubpKP/UyWXrixV3cLkxB9X6Luu8YAQOG/AaFXJDA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxUU91ajlIbVJCbmNQdkFp + cVNhSU1Td0F1aFk1SGl0V1Rscjl3L1B1VlR3CnNTNjk3T09vNUZXT1NaS3VvZzdy + YkkyTjYzSDhrRFg1azVHbzN3eUVJWVEKLS0tIFh6Vm9oY2pqYjRtc2JpeHlOYkpE + dmdzNzJiMVh3ZkUvU2Znb3VuMmhyS2sKgvqcTUO7TY/kxwUocl9GO4+/lh8gNIlH + 9wyB11rikPB3n7RRkKJrYp+4NqdT4hrf6XEdSFtlhCc6V18DCOfZ5A== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-09-14T06:26:16Z" - mac: ENC[AES256_GCM,data:bMvwXH66s8obh/+z8ycpIuAPUaA0XKBschFjR64gIdcx20rFOP10/d3JuWHAN38UVKDX/nhK+FBJJ6peN4o1yC0i3fre3ecAKRBY1V1U54Hy9hvKs92bnoMNguzsuCdCeEeOxdqxqnTHyR5ECiZA9GIuLonzSMuTNYv23ZG5lD0=,iv:fxfQoyoLZTChITzEJXUY/E6WGpKJdmTUzPSyGzTZW2A=,tag:gu1jaGv8FoEyw69Xzg5c4A==,type:str] + lastmodified: "2024-11-29T09:05:22Z" + mac: ENC[AES256_GCM,data:UzxUngjVnnjAMw0YO5MDq6eFNqG6kO4tIoIGNcF56L4mRqWJpVXXTACRvHgmvMLZ53JINEvqEGg4UUhCJJbtVq9lZDTTls3lfY1xqjy6/N2bcVFmqxz47FkrtCfDXeNMBw4L+7aTjE75LYbk8HnmhTc5YAuP5/docc+yKWKCjyw=,iv:aG4EhyTeSWJQ0Oc4JhrufPsU7u/dpyy00HkF3gMApEY=,tag:o9pFzZF+BRldP4/DjHBxGQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.0 + version: 3.9.1 diff --git a/secrets/workstation/sing-box b/secrets/workstation/sing-box index e2fce72..f979ad3 100644 --- a/secrets/workstation/sing-box +++ b/secrets/workstation/sing-box @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data: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,iv:ikpeGDG2DLmoXNxBuOp8EO0EyijukL8Iqf2I8T94d6s=,tag:FgynFIguQmU8lGlS3fCkIQ==,type:str]", + "data": "ENC[AES256_GCM,data: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,iv:dFLfZUHQE37n8hQM7DLzj8UjkSaEiMYGLvJNrp42/mo=,tag:FvBKBqD48tFdoms3vpaKIQ==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -8,15 +8,15 @@ "age": [ { "recipient": "age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjbEhrUkZ2UUpPaUxDenVW\nM3hoZThidzhpRXBLYS9scE9FSHpjUjhoVlVVCkxTNUFZUGRqaGhyc1I4V0pQVmZH\nZVo2OElkdkVVOWRnWlNSSHkwTFJFNkEKLS0tIDRHSGI3WHhBb3h2bUZVdDZ5aVB6\nN1c0bHdRSllxSHRjQWNYNGlRNjVZd0EKcmeW9nBmJB3BOyaDp3BYjpE/i8SzMoNq\nGY3jo09XUBljsTvArYzNaTzjWQ36uLHOV5K8bf75l1+ELWCE/8GhjA==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGcjhNajMrTkZYNXdOWWNQ\nckFxQXlqQUxjVmx5NWZwL2tlZFhFUGZXVkVVCktISmhxTHpNRUNMbnk5VSt2LzMy\nbkpoZDdlNy9GQ1pxNmRjVDVyQmlkckkKLS0tIFNISWJlRWk0Z3ZQVHlPV2NtNTZX\nb1hFN3ZnRGFPVE04dVk1Z1BlRlY5K2sKUU4dWF8gMrX3Ml4oPwYMkkFIMfuzzBHe\n5xXeXqasKEnSv3RoxA5RrOuR0kejxhW8sHC64YkTdiPW40LsB0wN9w==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1gt6fyh2fs87yyu2gnaqmzj3f0pdad9ecx29lhf83un0z94ng24hqn3pg4n", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzUDZFSHRNOFF2UkFSOWVP\nNUJPMk9jaENGVUJPbDJwRzg2a2xmRDhCZVdjClNwdTJORklyME5EeG9Wd0JLaloz\naDFBaG9NN0ZKQUxLVWRzV1F6bkNPMW8KLS0tIDJleDhSYUwxMUdwRlVkR1UvQ1I0\nczFEM2IvOTdKQ3dSakFkZ3hIeldnNVEKuXScR2VQYHlU+youmAsb+F4sEjLwTNQX\nyVaO2wKpWXWXOpWxt1gTjV4OQGSfyxESX1X5s/40wh8jijw0M5XYGg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUU200ZkE5VWFJb1JtOG56\nNmFhQjRCUnRxYUdDZHJTNkhodWl6d3J3aENzClN6N1ozSk9vb1N3aUdsbFFibjBq\nRlVGNnU3eWdlS3d1TGl1c0UrSG83ZXcKLS0tIFlyUGM4c1ZaUTkxZnNQQmhrWWJv\nRTFpVDA3NHpxcjNsdTdGMnViSURqMU0KM1I+Yr+RqX6RSrpkHw2ZAUKNUTObpT+1\nm/T6w+LRQq8QERRJ7H7venNLcHmVaKCxT1t6NdRJ2oqDMSvY2CeydQ==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-11-11T07:18:29Z", - "mac": "ENC[AES256_GCM,data:baC7aPJziYC8ODIRIc4wJomh4Ldlqp+S650ttExPn4kYcTaufJbzecOy2lnpAzX8m5PdOhwD1WBJ6OZxlCun6UbfO6nikOosv/Dj5V0OJo28GH7dAv/S8io+QislFXX2Jl97tvNl3MBm0JC0a3mPfgnOfDik0RISBXmyZbQCs/M=,iv:m6I2jr8BNOZUoAzjGhsGlM4K2wOyeLO28/ejK8FwUUg=,tag:Z1ViP6WX5j9+1bicCohuPw==,type:str]", + "lastmodified": "2024-12-01T08:40:04Z", + "mac": "ENC[AES256_GCM,data:LeFv5zcAKro/PHNdswf4xPwfS6wSEvS2o5o8F4ujulEoCcd7JMs7qby5lofYaeHBtVoW0QoTwM5Ms2annAVfYtTezA0ZD4OwTgCn61x0m6Cu2hjLmPYJTJGJon/N0J8Ba623oUWa8TEEKT2HfjiCMqXPGsQASjCNHVpmH5RtMKI=,iv:CTm7rFPtR30QjJ+VPIVbfqhGYyKxgdbx1XZyUBrBK7M=,tag:CR57jHcvu21lRb+OKhhPrQ==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.9.1" diff --git a/secrets/workstation/update.py b/secrets/workstation/update.py index 238a9da..a45998a 100755 --- a/secrets/workstation/update.py +++ b/secrets/workstation/update.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 --pure -p python3Packages.pyyaml python3Packages.requests sops +#! nix-shell -i python3 --pure -p python3Packages.pyyaml python3Packages.requests sops --keep SOPS_AGE_KEY_FILE import yaml import subprocess @@ -28,6 +28,10 @@ def override(resp): dns_rules.insert( 3, {"domain_keyword": ["aws", "pingcap", "tidb", "clinic"], "server": "secure"} ) + tun = cfg["inbounds"][0] + if tun["type"] != "tun": + return + tun["interface_name"] = "utun7" # tun = cfg['inbounds'][0] # if tun['type'] != "tun": # return diff --git a/secrets/x.py b/secrets/x.py index 7cbb6c0..911691c 100755 --- a/secrets/x.py +++ b/secrets/x.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 --pure -p python3Packages.pyyaml sops +#! nix-shell -i python3 --pure -p python3Packages.pyyaml sops --keep SOPS_AGE_KEY_FILE import json import os