From 6e9890dd07e87d960869a5e7816c23edebc8fd4c Mon Sep 17 00:00:00 2001 From: Roy Dumblauskas Date: Tue, 19 May 2026 00:04:19 -0500 Subject: [PATCH] run modifications --- nixos/.sops.yaml | 4 +- nixos/flake.nix | 10 +- nixos/home-roy.nix | 459 ------------------------------- nixos/home.nix | 439 ++++++++++++++++++++++++++++- nixos/secrets/cloudflare.json | 8 +- nixos/secrets/minio.yaml | 32 +-- nixos/secrets/psql.yaml | 32 +-- nixos/secrets/tests-service.yaml | 32 +-- 8 files changed, 489 insertions(+), 527 deletions(-) delete mode 100755 nixos/home-roy.nix diff --git a/nixos/.sops.yaml b/nixos/.sops.yaml index b8df25e..2ee8fbd 100755 --- a/nixos/.sops.yaml +++ b/nixos/.sops.yaml @@ -2,7 +2,7 @@ keys: hosts: - &laptop age1zad0qu648dhjav4pzjhkc6vswnqtacuv9230xcgle8wmv56r8ykqn0ud7y - &desktop age1rwugh86469664fwhgrj9xuhjxs9vpflx3r0ftuvd0glphf2gecfs8thxsj - - &nixos-homelab-00 age1z0w0jqxxze7umj0vpve2kt4v89n5t5xk9txup4gtl4vausm3aajs65tdjy + - &nixos-homelab-00 age167d7s2d2rwmduvt7sytzykhej3tq4q7vwvjz8kucsvv9dy4f4yqswnr6pd creation_rules: - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$ key_groups: @@ -10,3 +10,5 @@ creation_rules: - *laptop - *desktop - *nixos-homelab-00 + - *nixos-homelab-00 + - *nixos-homelab-00 diff --git a/nixos/flake.nix b/nixos/flake.nix index 92a5455..fa1a3b8 100755 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -84,20 +84,12 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.sysAdmin = - { ... }: - { - imports = [ - ./home.nix - sops-nix.homeManagerModules.sops - ]; - }; home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.users.roy = { ... }: { imports = [ - ./home-roy.nix + ./home.nix nixvim.homeModules.nixvim sops-nix.homeManagerModules.sops ]; diff --git a/nixos/home-roy.nix b/nixos/home-roy.nix deleted file mode 100755 index ca6bbab..0000000 --- a/nixos/home-roy.nix +++ /dev/null @@ -1,459 +0,0 @@ -{ pkgs, inputs, ... }: - -{ - - home.username = "roy"; - home.homeDirectory = "/home/roy"; - - home.packages = with pkgs; [ - age - awscli2 - dig - ffmpeg_6 - fish - git - git-filter-repo - go - grim - jq - kdePackages.gwenview - minio-client - nodejs_22 - postman - python3 - slurp - sops - ssh-to-age - tree - tmux - unzip - vlc - wl-clipboard - woeusb - wofi - xorg.xrandr - yq-go - zip - ]; - - programs.git = { - enable = true; - settings = { - user.name = "Roy Dumblauskas"; - user.email = "roydumblauskas@gmail.com"; - - }; - }; - - # user program config files - home.file = { - ".config/hypr".source = ./roy-config/hypr; - ".config/waybar".source = ./roy-config/waybar; - ".config/fish".source = ./roy-config/fish; - ".config/alacritty".source = ./roy-config/alacritty; - }; - - # user persisted dirs - home.persistence."/persist" = { - directories = [ - ".ssh" - "rp" - "dl" - ".mozilla/firefox/roy/storage/default" - ".cache/mozilla/firefox/roy" - ]; - files = [ - ".bash_history" - ".mozilla/firefox/roy/places.sqlite" - ".mozilla/firefox/roy/cookies.sqlite" - ".config/sops/age/keys.txt" - ]; - }; - - # User services must come after sops secrets - systemd.user.services.mbsync.unitConfig.After = [ "sops-nix.service" ]; - - # Configure firefox to be resilient against reboot - # Source = https://github.com/johnmpost/nixos-config - programs.firefox = { - enable = true; - - profiles.roy = { - search = { - force = true; - default = "ddgc"; - privateDefault = "ddgc"; - engines = { - bing.metaData.hidden = true; - ddg.metaData.hidden = true; - google.metaData.hidden = true; - wikipedia.metaData.hidden = true; - amazon.metaData.hidden = true; - ebay.metaData.hidden = true; - ddgc = { - name = "DuckDuckGo (unthemed)"; - urls = [ { template = "https://duckduckgo.com/?q={searchTerms}"; } ]; - icon = "https://duckduckgo.com/favicon.ico"; - }; - }; - }; - - extensions.force = true; - extensions.packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [ - ublock-origin - vimium-c - ]; - extensions.settings."uBlock0@raymondhill.net".settings = { - selectedFilterLists = [ - "ublock-filters" - "ublock-badware" - "ublock-privacy" - "ublock-quick-fixes" - "ublock-unbreak" - "easylist-chat" - "easylist-newsletters" - "easylist-notifications" - "easylist-annoyances" - "adguard-mobile-app-banners" - "adguard-other-annoyances" - "adguard-popup-overlays" - "adguard-widgets" - "ublock-annoyances" - ]; - }; - - settings = { - # don't force manual enablement of extensions on first launch - "extensions.autoDisableScopes" = 0; - "browser.urlbar.shortcuts.bookmarks" = false; - "browser.urlbar.shortcuts.history" = false; - "browser.urlbar.shortcuts.tabs" = false; - "browser.aboutConfig.showWarning" = false; - "dom.security.https_only_mode" = true; - "privacy.trackingprotection.enabled" = true; - "privacy.trackingprotection.pbmode.enabled" = true; - "privacy.donottrackheader.enabled" = true; - "signon.rememberSignons" = false; - "extensions.formautofill.creditCards.enabled" = false; - "extensions.formautofill.addresses.enabled" = false; - "browser.urlbar.suggest.quicksuggest.sponsored" = false; - # hide weather on new tab page - "browser.newtabpage.activity-stream.showWeather" = false; - "browser.newtabpage.activity-stream.feeds.section.topstories" = false; - "browser.newtabpage.activity-stream.feeds.topsites" = false; - "browser.toolbars.bookmarks.visibility" = "never"; - # set default download dir (to avoid Download dir creation) - "browser.download.dir" = "/home/roy/dl"; - "browser.download.useDownloadDir" = false; - "browser.download.folderList" = 2; - "full-screen-api.ignore-widgets" = true; - "browser.tabs.firefox-view" = false; - "browser.gesture.swipe.left" = ""; - "browser.gesture.swipe.right" = ""; - "pdfjs.sidebarViewOnLoad" = 0; - "identity.fxaccounts.enabled" = false; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; - "browser.uitour.enabled" = false; - "toolkit.telemetry.enabled" = false; - # don't show about:welcome or privacy page on first launch - "browser.aboutwelcome.enabled" = false; - "datareporting.policy.dataSubmissionPolicyBypassNotification" = true; - # disable pocket - "extensions.pocket.enabled" = false; - # keep window open when closing all tabs - "browser.tabs.closeWindowWithLastTab" = false; - # allegedly disable addon recommendations - "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons" = false; - # allegedly disable feature recommendations - "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features" = false; - # don't show "open previous tabs?" toolbar, hopefully still allow functionality - "browser.startup.couldRestoreSession.count" = -1; - }; - - bookmarks.force = true; - bookmarks.settings = [ - { - name = "google search"; - url = "https://www.google.com/search?q=%s"; - keyword = "g"; - } - { - name = "youtube search"; - url = "https://www.youtube.com/results?search_query=%s"; - keyword = "yt"; - } - { - name = "wikipedia search"; - url = "https://en.wikipedia.org/wiki/Special:Search?search=%s"; - keyword = "w"; - } - { - name = "dictionary search"; - url = "https://www.wordnik.com/words/%s"; - keyword = "d"; - } - { - name = "github go to repo"; - url = "https://github.com/RoyDumblauskas/%s"; - keyword = "repo"; - } - { - name = "chatgpt"; - url = "https://chatgpt.com"; - keyword = "chat"; - } - { - name = "github my repos"; - url = "https://github.com/RoyDumblauskas?tab=repositories"; - keyword = "repos"; - } - { - name = "github profile"; - url = "https://github.com/RoyDumblauskas"; - keyword = "gh"; - } - { - name = "drive 0"; - url = "https://drive.google.com/drive/u/0/folders/1hMAgupSZvhAml0K1WhBi9sNINfvkhw0e"; - keyword = "d0"; - } - { - name = "drive 1"; - url = "https://drive.google.com/drive/u/1"; - keyword = "d1"; - } - { - name = "mail 1"; - url = "https://mail.google.com/mail/u/1"; - keyword = "m1"; - } - { - name = "mail 0"; - url = "https://mail.google.com/mail/u/0"; - keyword = "m0"; - } - { - name = "discord"; - url = "https://discord.com/app"; - keyword = "dis"; - } - { - name = "downloads"; - url = "file:///home/roy/dl/%s"; - keyword = "dl"; - } - { - name = "nix package search"; - url = "https://search.nixos.org/packages?channel=unstable&query=%s"; - keyword = "nixp"; - } - ]; - }; - }; - - # Configure nixvim - programs.nixvim = { - enable = true; - globals.mapleader = " "; - opts = { - number = true; - relativenumber = true; - shiftwidth = 2; - tabstop = 2; - expandtab = true; - }; - - keymaps = [ - { - action = "Neotree toggle"; - key = "b"; - mode = [ "n" ]; - options.silent = true; - options.desc = "Toggle Neotree"; - } - { - action = "h"; - key = "h"; - mode = [ "n" ]; - options.silent = true; - options.desc = "Focus left"; - } - { - action = "l"; - key = "l"; - mode = [ "n" ]; - options.silent = true; - options.desc = "Focus right"; - } - { - action = "j"; - key = "j"; - mode = [ "n" ]; - options.silent = true; - options.desc = "Focus down"; - } - { - action = "k"; - key = "k"; - mode = [ "n" ]; - options.silent = true; - options.desc = "Focus up"; - } - ]; - - plugins = { - lualine.enable = true; - lsp-lines.enable = true; - lsp-format.enable = true; - - lsp = { - enable = true; - inlayHints = true; - - servers = { - html.enable = true; - lua_ls.enable = true; - nil_ls.enable = true; - ts_ls.enable = true; - marksman.enable = true; - pyright.enable = true; - gopls.enable = true; - terraformls.enable = true; - jsonls.enable = true; - yamlls.enable = true; - - rust_analyzer = { - enable = true; - installRustc = true; - installCargo = true; - settings = { - cargo = { - features = "all"; - }; - }; - }; - }; - - keymaps = { - silent = true; - - lspBuf = { - gd = { - action = "definition"; - desc = "Goto Definition"; - }; - - gr = { - action = "references"; - desc = "Goto References"; - }; - - gD = { - action = "declaration"; - desc = "Goto Declaration"; - }; - - gI = { - action = "implementation"; - desc = "Goto Implementation"; - }; - - gT = { - action = "type_definition"; - desc = "Type Definition"; - }; - - K = { - action = "hover"; - desc = "Hover"; - }; - - "cw" = { - action = "workspace_symbol"; - desc = "Workspace Symbol"; - }; - - "r" = { - action = "rename"; - desc = "Rename"; - }; - }; - - diagnostic = { - "cd" = { - action = "open_float"; - desc = "Line Diagnostics"; - }; - - "]d" = { - action = "goto_next"; - desc = "Next Diagnostic"; - }; - - "[d" = { - action = "goto_prev"; - desc = "Previous Diagnostic"; - }; - }; - }; - }; - - neo-tree = { - enable = true; - }; - - # neo-tree dependency - web-devicons.enable = true; - - cmp = { - enable = true; - autoEnableSources = true; - settings = { - sources = [ - { name = "nvim_lsp"; } - { name = "path"; } - { name = "buffer"; } - { name = "luasnip"; } - ]; - mapping = { - "" = "cmp.mapping.complete()"; - "" = "cmp.mapping.scroll_docs(-4)"; - "" = "cmp.mapping.close()"; - "" = "cmp.mapping.scroll_docs(4)"; - "" = "cmp.mapping.confirm({ select = true })"; - "" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})"; - "" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; - }; - }; - }; - }; - extraConfigLua = '' - local _border = "rounded" - - vim.lsp.handlers["textDocument/hover"] = vim.lsp.with( - vim.lsp.handlers.hover, { - border = _border - } - ) - - vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with( - vim.lsp.handlers.signature_help, { - border = _border - } - ) - - vim.diagnostic.config{ - float={border=_border} - }; - ''; - - colorschemes.catppuccin = { - enable = true; - settings.flavour = "frappe"; - }; - }; - - home.stateVersion = "24.11"; - programs.home-manager.enable = true; - -} diff --git a/nixos/home.nix b/nixos/home.nix index 2bea17e..ca6bbab 100755 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -1,31 +1,458 @@ -{ config, pkgs, ... }: +{ pkgs, inputs, ... }: { - home.username = "sysAdmin"; - home.homeDirectory = "/home/sysAdmin"; + home.username = "roy"; + home.homeDirectory = "/home/roy"; home.packages = with pkgs; [ + age + awscli2 + dig + ffmpeg_6 + fish + git + git-filter-repo + go + grim + jq + kdePackages.gwenview + minio-client + nodejs_22 + postman + python3 + slurp sops ssh-to-age - git tree - unixtools.ping + tmux + unzip + vlc + wl-clipboard + woeusb + wofi + xorg.xrandr + yq-go + zip ]; + programs.git = { + enable = true; + settings = { + user.name = "Roy Dumblauskas"; + user.email = "roydumblauskas@gmail.com"; + + }; + }; + + # user program config files + home.file = { + ".config/hypr".source = ./roy-config/hypr; + ".config/waybar".source = ./roy-config/waybar; + ".config/fish".source = ./roy-config/fish; + ".config/alacritty".source = ./roy-config/alacritty; + }; + # user persisted dirs home.persistence."/persist" = { directories = [ ".ssh" "rp" + "dl" + ".mozilla/firefox/roy/storage/default" + ".cache/mozilla/firefox/roy" ]; files = [ ".bash_history" + ".mozilla/firefox/roy/places.sqlite" + ".mozilla/firefox/roy/cookies.sqlite" ".config/sops/age/keys.txt" - ]; }; + # User services must come after sops secrets + systemd.user.services.mbsync.unitConfig.After = [ "sops-nix.service" ]; + + # Configure firefox to be resilient against reboot + # Source = https://github.com/johnmpost/nixos-config + programs.firefox = { + enable = true; + + profiles.roy = { + search = { + force = true; + default = "ddgc"; + privateDefault = "ddgc"; + engines = { + bing.metaData.hidden = true; + ddg.metaData.hidden = true; + google.metaData.hidden = true; + wikipedia.metaData.hidden = true; + amazon.metaData.hidden = true; + ebay.metaData.hidden = true; + ddgc = { + name = "DuckDuckGo (unthemed)"; + urls = [ { template = "https://duckduckgo.com/?q={searchTerms}"; } ]; + icon = "https://duckduckgo.com/favicon.ico"; + }; + }; + }; + + extensions.force = true; + extensions.packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [ + ublock-origin + vimium-c + ]; + extensions.settings."uBlock0@raymondhill.net".settings = { + selectedFilterLists = [ + "ublock-filters" + "ublock-badware" + "ublock-privacy" + "ublock-quick-fixes" + "ublock-unbreak" + "easylist-chat" + "easylist-newsletters" + "easylist-notifications" + "easylist-annoyances" + "adguard-mobile-app-banners" + "adguard-other-annoyances" + "adguard-popup-overlays" + "adguard-widgets" + "ublock-annoyances" + ]; + }; + + settings = { + # don't force manual enablement of extensions on first launch + "extensions.autoDisableScopes" = 0; + "browser.urlbar.shortcuts.bookmarks" = false; + "browser.urlbar.shortcuts.history" = false; + "browser.urlbar.shortcuts.tabs" = false; + "browser.aboutConfig.showWarning" = false; + "dom.security.https_only_mode" = true; + "privacy.trackingprotection.enabled" = true; + "privacy.trackingprotection.pbmode.enabled" = true; + "privacy.donottrackheader.enabled" = true; + "signon.rememberSignons" = false; + "extensions.formautofill.creditCards.enabled" = false; + "extensions.formautofill.addresses.enabled" = false; + "browser.urlbar.suggest.quicksuggest.sponsored" = false; + # hide weather on new tab page + "browser.newtabpage.activity-stream.showWeather" = false; + "browser.newtabpage.activity-stream.feeds.section.topstories" = false; + "browser.newtabpage.activity-stream.feeds.topsites" = false; + "browser.toolbars.bookmarks.visibility" = "never"; + # set default download dir (to avoid Download dir creation) + "browser.download.dir" = "/home/roy/dl"; + "browser.download.useDownloadDir" = false; + "browser.download.folderList" = 2; + "full-screen-api.ignore-widgets" = true; + "browser.tabs.firefox-view" = false; + "browser.gesture.swipe.left" = ""; + "browser.gesture.swipe.right" = ""; + "pdfjs.sidebarViewOnLoad" = 0; + "identity.fxaccounts.enabled" = false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "browser.uitour.enabled" = false; + "toolkit.telemetry.enabled" = false; + # don't show about:welcome or privacy page on first launch + "browser.aboutwelcome.enabled" = false; + "datareporting.policy.dataSubmissionPolicyBypassNotification" = true; + # disable pocket + "extensions.pocket.enabled" = false; + # keep window open when closing all tabs + "browser.tabs.closeWindowWithLastTab" = false; + # allegedly disable addon recommendations + "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons" = false; + # allegedly disable feature recommendations + "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features" = false; + # don't show "open previous tabs?" toolbar, hopefully still allow functionality + "browser.startup.couldRestoreSession.count" = -1; + }; + + bookmarks.force = true; + bookmarks.settings = [ + { + name = "google search"; + url = "https://www.google.com/search?q=%s"; + keyword = "g"; + } + { + name = "youtube search"; + url = "https://www.youtube.com/results?search_query=%s"; + keyword = "yt"; + } + { + name = "wikipedia search"; + url = "https://en.wikipedia.org/wiki/Special:Search?search=%s"; + keyword = "w"; + } + { + name = "dictionary search"; + url = "https://www.wordnik.com/words/%s"; + keyword = "d"; + } + { + name = "github go to repo"; + url = "https://github.com/RoyDumblauskas/%s"; + keyword = "repo"; + } + { + name = "chatgpt"; + url = "https://chatgpt.com"; + keyword = "chat"; + } + { + name = "github my repos"; + url = "https://github.com/RoyDumblauskas?tab=repositories"; + keyword = "repos"; + } + { + name = "github profile"; + url = "https://github.com/RoyDumblauskas"; + keyword = "gh"; + } + { + name = "drive 0"; + url = "https://drive.google.com/drive/u/0/folders/1hMAgupSZvhAml0K1WhBi9sNINfvkhw0e"; + keyword = "d0"; + } + { + name = "drive 1"; + url = "https://drive.google.com/drive/u/1"; + keyword = "d1"; + } + { + name = "mail 1"; + url = "https://mail.google.com/mail/u/1"; + keyword = "m1"; + } + { + name = "mail 0"; + url = "https://mail.google.com/mail/u/0"; + keyword = "m0"; + } + { + name = "discord"; + url = "https://discord.com/app"; + keyword = "dis"; + } + { + name = "downloads"; + url = "file:///home/roy/dl/%s"; + keyword = "dl"; + } + { + name = "nix package search"; + url = "https://search.nixos.org/packages?channel=unstable&query=%s"; + keyword = "nixp"; + } + ]; + }; + }; + + # Configure nixvim + programs.nixvim = { + enable = true; + globals.mapleader = " "; + opts = { + number = true; + relativenumber = true; + shiftwidth = 2; + tabstop = 2; + expandtab = true; + }; + + keymaps = [ + { + action = "Neotree toggle"; + key = "b"; + mode = [ "n" ]; + options.silent = true; + options.desc = "Toggle Neotree"; + } + { + action = "h"; + key = "h"; + mode = [ "n" ]; + options.silent = true; + options.desc = "Focus left"; + } + { + action = "l"; + key = "l"; + mode = [ "n" ]; + options.silent = true; + options.desc = "Focus right"; + } + { + action = "j"; + key = "j"; + mode = [ "n" ]; + options.silent = true; + options.desc = "Focus down"; + } + { + action = "k"; + key = "k"; + mode = [ "n" ]; + options.silent = true; + options.desc = "Focus up"; + } + ]; + + plugins = { + lualine.enable = true; + lsp-lines.enable = true; + lsp-format.enable = true; + + lsp = { + enable = true; + inlayHints = true; + + servers = { + html.enable = true; + lua_ls.enable = true; + nil_ls.enable = true; + ts_ls.enable = true; + marksman.enable = true; + pyright.enable = true; + gopls.enable = true; + terraformls.enable = true; + jsonls.enable = true; + yamlls.enable = true; + + rust_analyzer = { + enable = true; + installRustc = true; + installCargo = true; + settings = { + cargo = { + features = "all"; + }; + }; + }; + }; + + keymaps = { + silent = true; + + lspBuf = { + gd = { + action = "definition"; + desc = "Goto Definition"; + }; + + gr = { + action = "references"; + desc = "Goto References"; + }; + + gD = { + action = "declaration"; + desc = "Goto Declaration"; + }; + + gI = { + action = "implementation"; + desc = "Goto Implementation"; + }; + + gT = { + action = "type_definition"; + desc = "Type Definition"; + }; + + K = { + action = "hover"; + desc = "Hover"; + }; + + "cw" = { + action = "workspace_symbol"; + desc = "Workspace Symbol"; + }; + + "r" = { + action = "rename"; + desc = "Rename"; + }; + }; + + diagnostic = { + "cd" = { + action = "open_float"; + desc = "Line Diagnostics"; + }; + + "]d" = { + action = "goto_next"; + desc = "Next Diagnostic"; + }; + + "[d" = { + action = "goto_prev"; + desc = "Previous Diagnostic"; + }; + }; + }; + }; + + neo-tree = { + enable = true; + }; + + # neo-tree dependency + web-devicons.enable = true; + + cmp = { + enable = true; + autoEnableSources = true; + settings = { + sources = [ + { name = "nvim_lsp"; } + { name = "path"; } + { name = "buffer"; } + { name = "luasnip"; } + ]; + mapping = { + "" = "cmp.mapping.complete()"; + "" = "cmp.mapping.scroll_docs(-4)"; + "" = "cmp.mapping.close()"; + "" = "cmp.mapping.scroll_docs(4)"; + "" = "cmp.mapping.confirm({ select = true })"; + "" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})"; + "" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; + }; + }; + }; + }; + extraConfigLua = '' + local _border = "rounded" + + vim.lsp.handlers["textDocument/hover"] = vim.lsp.with( + vim.lsp.handlers.hover, { + border = _border + } + ) + + vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with( + vim.lsp.handlers.signature_help, { + border = _border + } + ) + + vim.diagnostic.config{ + float={border=_border} + }; + ''; + + colorschemes.catppuccin = { + enable = true; + settings.flavour = "frappe"; + }; + }; + home.stateVersion = "24.11"; programs.home-manager.enable = true; diff --git a/nixos/secrets/cloudflare.json b/nixos/secrets/cloudflare.json index 5a94fbf..8dd326e 100755 --- a/nixos/secrets/cloudflare.json +++ b/nixos/secrets/cloudflare.json @@ -5,15 +5,15 @@ "age": [ { "recipient": "age1zad0qu648dhjav4pzjhkc6vswnqtacuv9230xcgle8wmv56r8ykqn0ud7y", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArUXR0ajdlKzNOc01sSmE4\nMXRlVmNQTVlBdXpkNm5qYlBRTzlMVWdPYkdrCklicEg3ZnVmVHNWZmtBdkt0Ukov\nV01CZ3pJR2FyRDdoRUVEdW5FeUttQ0kKLS0tIFRjM0VlZWlzVnBYazhXT1NITElz\nNlVyWGxuUW5nN0xZMk5xdTMva1d5WlUKuCvOAP31hWUvxVzVjmjdF8pawDtCXrqA\no1/MzHzhtiODNI+p8PVrs4obJpAS0UrjDNgM6Y0hEGlrW1FHGcjM7A==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJcHNrenMvTmxOYXVzdHBI\nYm40V3J0dERLUlNpd2hrRklrczJ0YllSalVBCm55cmVpVDgxbE1ic3NqdWVOQ2pN\nOTBJY203anZSaFhSM3JWcVhNdyt0Z1UKLS0tIEV5NkhsSU4xVktzc05OMmw5Zm10\nSzBhSEVrZUkyUCttMFFnQjlMb3ROcTgKjoKJ99cfj4yiF0jOmacd8M0kAhcrVe30\n8arslhr5iocJBymiFCyVDK2Tryp5u81S+CK7JkEWJRokMV9jVIAWVQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1rwugh86469664fwhgrj9xuhjxs9vpflx3r0ftuvd0glphf2gecfs8thxsj", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxdWRqNXNmZDBEdDB5WXlo\nNFBhMWRSc1N0cnpxUnNSRDBraG1FYmd3QkVBCjFNK1UybGdLRzYreWNUK3VSY3Vu\nNDdVZ1UyNUowZEhZM2U4bFlYWWR0QW8KLS0tIERGakZpZHNmOE9yWGcybHd4aE45\nS3hkS1RyLzJrZWxoVU9hUnliMVRVOG8KSqkrW810YYVjNBrx8qIFpCk11FfkLDcS\nhhP4YU7JtceBl6J1/l0e6Yf/VQhpB91yilO4iYIFtH+PxrEuEqL9eQ==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvdC9DTXM3ZjZNNHd6SXUw\nMEVxQnkyQk9YMlhFd1lwRlpab0VpM3B1M1V3CnI3OVhMeWgxQStZLzVzNkIwV01W\nMWhMTWJjT1hLcDdqbkFpMGxXOE5pT0kKLS0tIERVS0lXT2hLbmk1c0UvY3dlQXBV\nbzV4ZnZRMmpYOFRpUFBiclNwQTIvRE0Kqye3Hsx1V9Zqasl3ar/MXHRiFW0a146C\nc6BE7taIQM1wP/YZinvxf00N5KUc09CVTrEZvN5vMIDHAlX9t9aNbg==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age1z0w0jqxxze7umj0vpve2kt4v89n5t5xk9txup4gtl4vausm3aajs65tdjy", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHcnRtODZNVTBxbWZsNUo0\nM2pNQjg4dXhKVjZiWmtJZEJISGVhSXFVT2tVClZldzAvQkN6cGNaZFRUbDdrV04z\nUHNGK0hPTS9WaG5kV2UzOUlTeDRvRmsKLS0tIHZqZkFwdkp2ek9hYW1GSGlScFNE\nd1ZUcytsd0FsYktDR21JRjF4QTZzV2sK69dXR+/LroJ3oRrD6nR+k/2t3wv8Eisl\n4634wrgduieI/6Jnh3TnrRSi2QF9YUq7Dp7VOVDH25zMndZmn9iFRw==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age167d7s2d2rwmduvt7sytzykhej3tq4q7vwvjz8kucsvv9dy4f4yqswnr6pd", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5WWZxV2MxN25tS0hDY3Jx\nVUl4ZU1MMVN0L0lObGwrZm4zUGFWODdqUG5zCjczQTdIaFU4bXJPRkl6cnc1ZFpL\nSENrZXFIcWZpRVFaZDJUVDZ5bjF1REkKLS0tIDlaL2RhVXA1VmxvSmxOUGJaeW1l\nLzRES0JXR1VBbWxXY1AyRDZZSkpLRVEKm4LjidQgGFC7W03bOiBjts2/0qztAFNB\ngZb0hOH/D5P8BmG9ZQ5AibLzGncn5d7je5WIBgAqLfWCkIxYqrwO1w==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-06-12T21:09:57Z", diff --git a/nixos/secrets/minio.yaml b/nixos/secrets/minio.yaml index 88b2e78..7da32be 100755 --- a/nixos/secrets/minio.yaml +++ b/nixos/secrets/minio.yaml @@ -4,29 +4,29 @@ sops: - recipient: age1zad0qu648dhjav4pzjhkc6vswnqtacuv9230xcgle8wmv56r8ykqn0ud7y enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaWml2TkVkaXN5SlNBTzRO - REQ4VGVzYVlnRHRpQkRweGVFemF5Z3RiUDBzCmNhNm03SzlIWndWbC9ONWppOU10 - NWtyNGlRT0JXTXNPZmFvWHh3SE13MncKLS0tIC9oc0xqSitaNUlvZkh1Sjh4MnlK - V2lIRURZL1h3RVJJaTRRQjhEU1JtbGMKOcwg6+o7JmBDaCorraKqVca9Wu9y+x4f - kO57/vcAx7yc3OAC6bFVEn/FVQbNRIgNE63IDOzNh0X1Xlpjm9WTgQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxYjRqaFQ1d2lTUExjNGdM + NmpWUlJHdENYeSsyV0s4SDNZS3FmSXB0MGhvCmFtR3lWR3VMbUFoaXNlUkxwaHY5 + c1NrKzM3cWVObGpQcit1M3VPRVRDRTgKLS0tIFg3ZFF1UFJvVGRBUmhkbjVXMWJk + ZUNsV1NwVUs1UnVJdnVVUmZ1cHJ4ZlUKGl0nR9986FV2qyvCKcHPeMzxRWQK6grw + zwUTx5hSmaom/H0sVzRATq2dFA2SoGGpdp/DYxVnran0bZEL0UwZFg== -----END AGE ENCRYPTED FILE----- - recipient: age1rwugh86469664fwhgrj9xuhjxs9vpflx3r0ftuvd0glphf2gecfs8thxsj enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSYncyVmJpY3BrTTBDOFQx - TXlpemtZMjF5Y2dnQktDVGdtV3hiVmhVM0ZRCnUyeDJ4SW1CeXRPTjNKbC8zTDEx - b2NkKyttaTZVYUNqV3lWVEdtWW9hdW8KLS0tIFNuNFdDOVVSR2FVanc4ajBJb1Z6 - NmN0bmhnSW15eHBETmI0NnQ0allhMWsK/B3DzC8KLr1Ngip2jijnGVa1buDyoIyN - kfO2vBI4xhGSEBOnzHCIyAnOsce2iS+d3FzTJmjzfFX2zaOexXliQw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiMmcvQXFPUFltaS9OaSti + TnRkdmVKcm10NzF4Q1VuNEFReWFlR1BjbEhZClprR0JHbjB0Y2pRbmw3T3VNTGVP + Z004SFoyK3RzWTdGSHU3WklJR2gzM3cKLS0tIFYrNVBhRmVSelYvVXR2Sll3QkVB + UHZuS0xKOWtzNEJYS2h4ZkRPQzg0aVUKGRvcbu5GePXC4/EATJZ0p0md0Bt9NUTJ + x59hOQWwpLo6OHw4n7w45WaRhJkip0XhNDFkVP6WQyPzaj+pS4ngHA== -----END AGE ENCRYPTED FILE----- - - recipient: age1z0w0jqxxze7umj0vpve2kt4v89n5t5xk9txup4gtl4vausm3aajs65tdjy + - recipient: age167d7s2d2rwmduvt7sytzykhej3tq4q7vwvjz8kucsvv9dy4f4yqswnr6pd enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCN3ZnL0djVUhzT1hDR21u - M28xTklYTStBcG1KUjlQWE12NXhHdDVrQ1hnCk4yZFpRelZnZGNWTWd2N0pMTVMz - VmhVblNXOGNqalk4RUhRRk1JcGF3Z0UKLS0tIHNPd1FYS2t1RjRwa283dElmUC82 - UEhkZmlGTEp5Q2hxdHRqcHgyT2VJaTgK3s9pAkI8SCaKCljCDrGP4JIzmEnJ2IXX - OG84lrO9a7ibS/m3ADkFEBcoY5xu0ORKfsjW8Yl+R/fWujMVa2NFXw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxUDc5MHdJdktSRnZ3dVlH + MGJhYnVGaXFIaEQ4KzV0R2tsVGJjalVFQ3hZCnZDTGdBSVh3U1JLdWw0STZEWS9l + VWh4VkNQRjdEMzhSVHVXSURialJrMm8KLS0tIFpxUWdHVHNqRStTaWRFVUVmZHJi + bzRMaVloYk9sNVlvSWxrcTlnbGtQWUkKSU7wCXFAeF4Id2pVITKHWqZrOnVf/JSR + YcxhGc+qV/QlM10+7ZTU/eAnQqANH2/ztsKUDzMjPnk/9B8kZDiGeg== -----END AGE ENCRYPTED FILE----- lastmodified: "2025-08-24T07:09:13Z" mac: ENC[AES256_GCM,data:TnVhig4bOGRf4v0XXwa6qaJIsPBBE34zIYDu/HTL3uRrA7vu0HiIhKn1PiI0HyKwhAwXoLbGCXutwVCEz8AcdeQuWyQ+/jmxjJgy73vg5wcHxxuiFTcwZSixBxrzszmZQsM1p7BUAPvhLuFOLDN7yZRg04iQcD5Imqj0dTXOnPc=,iv:WKhDRJypEK1hFnDjU+geqKSRgefZ9h2lgaih62TJjJ8=,tag:y/f4jXEHcPvoO/lV+WY1bw==,type:str] diff --git a/nixos/secrets/psql.yaml b/nixos/secrets/psql.yaml index 00d5361..09f6e92 100644 --- a/nixos/secrets/psql.yaml +++ b/nixos/secrets/psql.yaml @@ -4,29 +4,29 @@ sops: - recipient: age1zad0qu648dhjav4pzjhkc6vswnqtacuv9230xcgle8wmv56r8ykqn0ud7y enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuZTRQVUlrcGRGYWlrRGVD - UFQxbndqQW82c1h4NmxUcmIvcmJTNHRDclRFCjl2U3h6RU1zMm91RHR0QklZenlh - cDhjcDY0anlrWHhVaGl6dGlNR1MwR0UKLS0tIDRxOVlVUzFiTVNvZ3NXbnR2cGd6 - SUNVSm85UWJpVHpET3hueSticVRGbU0KK6s5ee6Tdh2eqyTC6XB6VmpMnvc9SyJV - WYQIjyq77gLRVK3to+lUV+EQdJGvvgA27ab1+GUvQwz10ix5UlhlrQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzSk5IN21KNnhmcHpkaEZN + S05sVEFrOC9IekQvbXBGQnFaNUZMdzN6TWdnCmFIbFlJc3RKKzRTUUJ6N1UzdFhC + K3gyL0l1aWZHUStJdzJtYUhFN1dPRWcKLS0tIHc4ckVGRkpCTWRxQjExdFRLOThL + M29xUDJrK3hiaXBGRFY0blVURDN6YlUKm0mRs5WCcb4p34+wfCL31lk1xQSAjn5Z + 4DwJACwp0d41RGoUSXQM3cJWqQbhrx4OcoP1oyQliZeFOUYhfZS9WA== -----END AGE ENCRYPTED FILE----- - recipient: age1rwugh86469664fwhgrj9xuhjxs9vpflx3r0ftuvd0glphf2gecfs8thxsj enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4RTFLdW1Ka1kvMU11MHc1 - d2pMTGxYUGZLNEZWenpsWTlNSkVnTm5EaDBnCkYrZUd4WjRRSVFVdUFWSVA4MXpH - dnpKeEVQVnU1TlZHa0lKV1daMUhDZjgKLS0tIEZVUG1nTmdQY2lSZWwvTkYvUE5l - SkR3NVJ0TDFHTi9xZ0dFVnJnUThBdVUKyMjN1otw3HHWloI6hf6+KBNcOX2SYTFy - j9Vvix0sBazB51IpAapZ8Gy0Y2u3iCAvcLhONWFUjz4NTwXbONgb6w== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJSVVRS2tPaXN5L3FMeFJk + TS9qZ08xRWY4eWRqUmZhSVJjai9ObEErQ1ZjCkhJcXN0TWZzUVgvMkQvQ1BGbHVG + V3N5aTk1VmliMUxKTWlwTnNOYmlra2cKLS0tIHpEc0ZBWWdnOCtMVDRmVG5vQ2cx + Tm5Fa0xwbm1DSVNOY1dTV2xTdGtQSncK8MRk2Uk7XtW/jWmUqCNdpL6u0WwIrRBx + SshVBzl86R6CMLLF/Ju0K2gCnV2UOpD6lwH2SouOK5qcq4O39aLIGg== -----END AGE ENCRYPTED FILE----- - - recipient: age1z0w0jqxxze7umj0vpve2kt4v89n5t5xk9txup4gtl4vausm3aajs65tdjy + - recipient: age167d7s2d2rwmduvt7sytzykhej3tq4q7vwvjz8kucsvv9dy4f4yqswnr6pd enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxNlpYM0FWejJWRXk4R2xB - MUQwaXRYeWNXeXV1anBYS2JZelVXWEJyNTA4CkordkUxMHRJdXBOZUltbnUxOEp5 - NXFERTRVN3k0TXR0MFdTZjFTSnQ3ak0KLS0tIGljRFUwcEREWmZmeitoQStvS25U - SUw1S2dONTIzVG5CNU5udUYzSmU5VlkKJILjrzwEvcxSAFgYhIpJPhKe0Zr54wdV - 3FR4biF4SQTHyqNurA9vQ/vprY24EMZ3nZogaP0E4MeVUArxwZaztQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBodUs1QlAzWGYxOEZoL1BJ + TC9Sa00zSDJIUG9IY3laaENXb0Q2cVhHUFZ3CmZvRUdCc1lyMElNMVJlUUZNZDlO + ajlFdVIzNkdtZmU0UWZGbXQ1KzdxdTQKLS0tIEpwMGt0Um45VFJTRWNZbUJPcU1F + d3RXODFKNlJyTUdWOXVDbWhHQ3lobVEKq6XZw8qsukipx8+6ffiFfD8HZlnQxt7H + vepG/eSgVkmso28f61ESZHhH3WpbVHZDDPlN9XCDgSfruHLD3T1CFA== -----END AGE ENCRYPTED FILE----- lastmodified: "2025-11-19T05:03:49Z" mac: ENC[AES256_GCM,data:uqhNCdl+we0UBjPFOBngA/2ywwXfIxpgXB9ozb7Vcy/sEZCoSob+VuEAzBQ/cbE5EuBlxoltg3Ve0r0xNNQQ5rZ+q6rfyRaSLrO1Xd3B5ITg6hLHLXIjFOGW6q15E2X1vKipnXGE11LZCsTEHCS1JCntLxMu+cTpIZbnVOx+KcY=,iv:6/H5fPHtyqvkkONF49AxLAjKVQpY+jcGm+4d+a2aa9U=,tag:hdoKyv64RpxnbQfd+S6FLg==,type:str] diff --git a/nixos/secrets/tests-service.yaml b/nixos/secrets/tests-service.yaml index c75bd05..a1d5d0c 100755 --- a/nixos/secrets/tests-service.yaml +++ b/nixos/secrets/tests-service.yaml @@ -4,29 +4,29 @@ sops: - recipient: age1zad0qu648dhjav4pzjhkc6vswnqtacuv9230xcgle8wmv56r8ykqn0ud7y enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBONXQrU2h1VEtuRU9tWG1y - VGNHU0NXRlZIREQrVVpyUUZaOThvMlR4akdzCkNQWHJMbDNkaVRTVVlPRDdKcnBM - djZqZDBhbkdhbmZRSEJyTXBEL3NJZkkKLS0tIDZLQVZpYzNmSk0zYktJYzFBaEZw - Y1BHaUJkOHRyRllNRjVwRkgxWXR3TXcKevUYbPQllvwpz0oNCyTDxJW78s+AG8GZ - ZjJDqmuqxnd5VaIRg70OhTbT8h0vdfqp8peuaAQ+Ibq8h0EOI+4ctQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4Z0xwaWgxUU9PcUZKVzVE + Wmd3MHBhSFBMOTF5c3czQXFmdUgzaTI0b0dRCmNKSXdwMzBvUm1tOVpyVGNUZnNK + eTlBb0VKV1NoeWtYNkIrVHd0STNIWEEKLS0tIGNZNEg1bHFYMDAxYTRqSXYrYzdY + TGNHenFwTTZ2RlQ3OHJNbkRxMHlyY0EKLeJ8NJdivCZHOdXpjdLP1q78X8F/A1w3 + mA3sEaXnZ1/65d6FC/dJH4F5bySogGgkbaH3DeBW6G5alL93aS0QzA== -----END AGE ENCRYPTED FILE----- - recipient: age1rwugh86469664fwhgrj9xuhjxs9vpflx3r0ftuvd0glphf2gecfs8thxsj enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSMjZyT1pNTjRmR2R2ZTND - dG1mcDU2QVRIQzdTN1B6Vm9vRTJTeUhzSFdVCjJuM0hRSWZETDB6RlBNRk5VcVU2 - aUFQdVdIRTBoR2ZIbXpwaVkxemtoNEEKLS0tIFdNMmUrY1pualVvNUpqTnRScER2 - bk1hWmhhSVBpZ2tUdTU0TzBoTXJ1eDQKKTBsi4FB+x05kr8dakx8uns4RnW1PEuA - 3tW0HCpGjgssENJnDeD0QtY5AUMW957ueMShl7lNdyQPWKw5Sj47FA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2dnI5YWhEVXkvUkphSUNo + Q2QwTUYrbm1KTXNMZlhqTjhWcVQ1MUo2OW1JCjhkZUJlcDEyVzd1NGhzeWl0R2o4 + UzRZUjVpVTNsaE9lRk1oOUx5RFBtbFkKLS0tIHRBZG5XV2hhTnBQdzB3QmFSSnFp + TGpDejBrMlVhbXpHZmNQOVdVTVA0d3cKANgkjdMG3Z+PMEjAnmkhmH+F3bAxpLVz + o5DFZ9Rda/DxQpQomYQepePhV516swKwLlX3dCwifVZjyDnigg+toA== -----END AGE ENCRYPTED FILE----- - - recipient: age1z0w0jqxxze7umj0vpve2kt4v89n5t5xk9txup4gtl4vausm3aajs65tdjy + - recipient: age167d7s2d2rwmduvt7sytzykhej3tq4q7vwvjz8kucsvv9dy4f4yqswnr6pd enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxOC9CaE03YzVoUXZBZFNk - VGxWOGp3Qng2THoyckwwYy9VMW5nWGJaU3hVClV2dDJKcXUwY2ExS0VVaGpTOWhV - bGhiS3c5V2FHZ0dWZmdScitGMUpEK3cKLS0tIEpNOWJ2bmNydlcyaDNrSklDQTVj - a3plS0paL1BvODJJdHBxRFBqclhFQmMKv+0prhsi3SEQo6M19wO/x8YxTYq4zfh0 - 2FAfLcpn8sHh97r1F2GhS7sDj0n0lxV3fNLmGE5EPkRFQ7Jfdje50A== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzV1J4QllsZTBDUjdZU0d2 + R0RlODROaCs1NEJKbEY4M1ZMSFBtcDBKK2lnCm1hdndPOWpucnltakFidEFBY1ds + MmtzZXZyQkQ3TGRONVJjcFBHQzJiOWcKLS0tIEtDZXg4R3pnYXBKcGZZL2hxbmpo + dFg0c3o2OWpBcmJDWnB3VklZMlh4d1UKU8MqSmpejyTVveqJ0W6R2/1h850L5P04 + l+1Py0IP1MdaRsMGZF/axWSsxbXCA8cEDMrMYRiDJhX/2ydC92DbrA== -----END AGE ENCRYPTED FILE----- lastmodified: "2025-08-24T07:10:02Z" mac: ENC[AES256_GCM,data:rOWVeryENj8Vqzmv3dX3bADbfo1SuUrcowe5ODx3mPYKkYcjCaBjy8vBa3pGNFhS7jFUMaN6k5XN6aEX7+MfWxXQo0oFbIwXqUkiyIELI262dY2qq2xwzr1XPEcxGLKV0mpiSJQZg6Covoe/KFjDRh/aTHnVe8tT7TNyXNZCGvI=,iv:pbsb0aoBalFUxzBksTtg3fPKPoC9Z76rMp0wlZSb/uo=,tag:8rEyL+hNQmFfOs+gnk9Tgw==,type:str]