From 8346c9f02cb5bdc2c03c3dffbebaf7193a5bee2a Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 16 Jun 2023 10:07:37 +0200 Subject: [PATCH] va a ciapa i ratt --- flake.lock | 176 ++++++++++--------- flake.nix | 6 +- hmModules/aerc/binds.conf | 129 ++++++++++++++ hmModules/aerc/default.nix | 18 ++ hmModules/email/default.nix | 73 +++++--- hmModules/firefox/default.nix | 15 +- hmModules/git/default.nix | 11 +- hmModules/gitui/default.nix | 3 + hmModules/helix/default.nix | 6 +- hmModules/hyprland/default.nix | 13 +- hmModules/kitty/default.nix | 46 ++++- hmModules/lazygit/default.nix | 12 ++ hmModules/remmina/default.nix | 3 + hmModules/shell/default.nix | 5 +- hmModules/thunderbird/default.nix | 24 +++ hosts/default.nix | 20 ++- hosts/mothership/default.nix | 4 +- hosts/mothership/disko.nix | 5 +- hosts/pbp/disko.nix | 4 - hosts/rock5b/default.nix | 114 ++++++------ hosts/rock5b/disko.nix | 68 ++++++- hosts/thinkpad/default.nix | 7 +- hosts/thinkpad/zfs.nix | 20 +-- lib/default.nix | 1 + modules/nix/default.nix | 1 + modules/vm-mara/default.nix | 88 ++++++++-- modules/vm-mara/i915-sriov-dkms.nix | 53 ++++++ modules/vm-sala/default.nix | 10 +- modules/wireguard-server/default.nix | 1 + secrets/autistici-password.age | 45 +++-- secrets/cache-private-key.age | Bin 1805 -> 1831 bytes secrets/cachix-personal-token.age | Bin 2058 -> 1966 bytes secrets/cachix.age | Bin 1101 -> 0 bytes secrets/default.nix | 1 + secrets/git-workspace-token.age | 20 --- secrets/git-workspace-tokens.age | Bin 1839 -> 1862 bytes secrets/hydra-admin-password.age | 58 +++--- secrets/hydra-github-token.age | Bin 1863 -> 1815 bytes secrets/magit-forge-github-token.age | 63 +++---- secrets/mothership-wireguard-private-key.age | 58 +++--- secrets/pbp-wireguard-private-key.age | 56 +++--- secrets/rock5b-wireguard-private-key.age | 59 ++++--- secrets/thinkpad-wireguard-private-key.age | 59 ++++--- 43 files changed, 909 insertions(+), 446 deletions(-) create mode 100644 hmModules/aerc/binds.conf create mode 100644 hmModules/aerc/default.nix create mode 100644 hmModules/gitui/default.nix create mode 100644 hmModules/lazygit/default.nix create mode 100644 hmModules/remmina/default.nix create mode 100644 hmModules/thunderbird/default.nix create mode 100644 modules/vm-mara/i915-sriov-dkms.nix delete mode 100644 secrets/cachix.age delete mode 100644 secrets/git-workspace-token.age diff --git a/flake.lock b/flake.lock index d248549..9bf3c99 100644 --- a/flake.lock +++ b/flake.lock @@ -55,15 +55,15 @@ "locked": { "lastModified": 1683798766, "narHash": "sha256-HY0Arq4uGqfMM0WiSKrOlVt7KTTN9jtpxCHDAtEp8Vs=", - "ref": "refs/heads/master", + "owner": "aciceri", + "repo": "emacs", "rev": "7f3ee2413d6b0756ade8435e0fa9ff3317e4c000", - "revCount": 43, - "type": "git", - "url": "file:///home/ccr/.config/emacs" + "type": "github" }, "original": { - "type": "git", - "url": "file:///home/ccr/.config/emacs" + "owner": "aciceri", + "repo": "emacs", + "type": "github" } }, "colmena": { @@ -115,15 +115,16 @@ "crane": { "flake": false, "locked": { - "lastModified": 1670900067, - "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=", + "lastModified": 1681175776, + "narHash": "sha256-7SsUy9114fryHAZ8p1L6G6YSu7jjz55FddEwa2U8XZc=", "owner": "ipetkov", "repo": "crane", - "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b", + "rev": "445a3d222947632b5593112bb817850e8a9cf737", "type": "github" }, "original": { "owner": "ipetkov", + "ref": "v0.12.1", "repo": "crane", "type": "github" } @@ -179,11 +180,11 @@ ] }, "locked": { - "lastModified": 1680146283, - "narHash": "sha256-YZSw3O6uv6NqOJP+dol/njmzblRFIsrmqqb0HsL4mcQ=", + "lastModified": 1684783210, + "narHash": "sha256-hxRbwwBTu1G1u1EdI9nEo/n4HIsQIfNi+2BQ1nEoj/o=", "owner": "nix-community", "repo": "disko", - "rev": "4d9c89abde7ccedf743a01119d41fb880793bcba", + "rev": "f0b9f374bb42fdcd57baa7d4448ac5d4788226bd", "type": "github" }, "original": { @@ -250,11 +251,11 @@ ] }, "locked": { - "lastModified": 1680258209, - "narHash": "sha256-lEo50RXI/17/a9aCIun8Hz62ZJ5JM5RGeTgclIP+Lgc=", + "lastModified": 1683212002, + "narHash": "sha256-EObtqyQsv9v+inieRY5cvyCMCUI5zuU5qu+1axlJCPM=", "owner": "nix-community", "repo": "dream2nix", - "rev": "6f512b5a220fdb26bd3c659f7b55e4f052ec8b35", + "rev": "fbfb09d2ab5ff761d822dd40b4a1def81651d096", "type": "github" }, "original": { @@ -285,11 +286,11 @@ ] }, "locked": { - "lastModified": 1680172861, - "narHash": "sha256-QMyI338xRxaHFDlCXdLCtgelGQX2PdlagZALky4ZXJ8=", + "lastModified": 1680698112, + "narHash": "sha256-FgnobN/DvCjEsc0UAZEAdPLkL4IZi2ZMnu2K2bUaElc=", "owner": "davhau", "repo": "drv-parts", - "rev": "ced8a52f62b0a94244713df2225c05c85b416110", + "rev": "e8c2ec1157dc1edb002989669a0dbd935f430201", "type": "github" }, "original": { @@ -557,12 +558,15 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -700,11 +704,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1680646269, - "narHash": "sha256-MRohWyeJJf3zwMWUt4XQnD1qbem0/3D0cbomvJ47YuE=", + "lastModified": 1685289082, + "narHash": "sha256-fryIaVSDYZAZWxlBQwldxGjINJnHh27DQRabOIx/oYI=", "owner": "helix-editor", "repo": "helix", - "rev": "531b745c54e5d316603601cc05ade50ab02066ab", + "rev": "3334e7e4b2181590ddfa9aa72a19429b9b2381ea", "type": "github" }, "original": { @@ -717,15 +721,14 @@ "inputs": { "nixpkgs": [ "nixpkgsUnstable" - ], - "utils": "utils_3" + ] }, "locked": { - "lastModified": 1680597706, - "narHash": "sha256-ZqJ3T+BxzjPH9TnmeUwS4Uu9ZQPeBXAFC9sUWlharT4=", + "lastModified": 1685480784, + "narHash": "sha256-pkk3J9gX745LEkkeTGhSRJqPJkmCPQzwI/q7a720XaY=", "owner": "nix-community", "repo": "home-manager", - "rev": "ec06f419af79207b33d797064dfb3fc9dbe1df4a", + "rev": "54a9d6456eaa6195998a0f37bdbafee9953ca0fb", "type": "github" }, "original": { @@ -739,7 +742,7 @@ "nixpkgs": [ "nixpkgsUnstable" ], - "utils": "utils_4" + "utils": "utils_3" }, "locked": { "lastModified": 1679846261, @@ -789,15 +792,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1681677208, - "narHash": "sha256-R9b2/SZfkxuv54YDo4FUp65wgLREQ4gfYxfJ9mSMTno=", + "lastModified": 1685380658, + "narHash": "sha256-LPih0Q//p8IurXG9kGRVGAqV4AUKVYj9xkk3sYYAj6I=", "owner": "hyprwm", "repo": "hyprland", - "rev": "c62ab1bee72cc4bda16a0574a8c9de7d71da314a", + "rev": "51a930f802c71a0e67f05e7b176ded74e8e95f87", "type": "github" }, "original": { "owner": "hyprwm", + "ref": "v0.26.0", "repo": "hyprland", "type": "github" } @@ -810,11 +814,11 @@ ] }, "locked": { - "lastModified": 1681065697, - "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", + "lastModified": 1684265364, + "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", + "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530", "type": "github" }, "original": { @@ -879,11 +883,11 @@ "mk-naked-shell": { "flake": false, "locked": { - "lastModified": 1676572903, - "narHash": "sha256-oQoDHHUTxNVSURfkFcYLuAK+btjs30T4rbEUtCUyKy8=", + "lastModified": 1681286841, + "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=", "owner": "yusdacra", "repo": "mk-naked-shell", - "rev": "aeca9f8aa592f5e8f71f407d081cb26fd30c5a57", + "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd", "type": "github" }, "original": { @@ -951,11 +955,11 @@ ] }, "locked": { - "lastModified": 1680329418, - "narHash": "sha256-+KN0eQLSZvL1J0kDO8/fxv0UCHTyZCADLmpIfeeiSGo=", + "lastModified": 1683699050, + "narHash": "sha256-UWKQpzVcSshB+sU2O8CCHjOSTQrNS7Kk9V3+UeBsJpg=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "98c1d2ff5155f0fee5d290f6b982cb990839d540", + "rev": "ed27173cd1b223f598343ea3c15aacb1d140feac", "type": "github" }, "original": { @@ -1011,7 +1015,7 @@ "nixpkgs": [ "nixpkgsUnstable" ], - "utils": "utils_5" + "utils": "utils_4" }, "locked": { "lastModified": 1677512347, @@ -1167,11 +1171,11 @@ "nixpkgs-lib_3": { "locked": { "dir": "lib", - "lastModified": 1678375444, - "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=", + "lastModified": 1682879489, + "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e", + "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", "type": "github" }, "original": { @@ -1234,11 +1238,11 @@ }, "nixpkgsStable": { "locked": { - "lastModified": 1680498889, - "narHash": "sha256-4nGFBm+oILOO6DPoKTPxVlfkZSxCOY4W25zSRHESK48=", + "lastModified": 1686656800, + "narHash": "sha256-duScdQZNeZcde0JwmQ9W4XfqlO/Z24MDhlTq2MokuSM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "799d153e4f316143a9db0eb869ecf44d8d4c0356", + "rev": "2b273c2351fe1ab490158cf8acc8aafad02592ce", "type": "github" }, "original": { @@ -1250,11 +1254,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1680487167, - "narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=", + "lastModified": 1686592866, + "narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "53dad94e874c9586e71decf82d972dfb640ef044", + "rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05", "type": "github" }, "original": { @@ -1313,11 +1317,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1680213900, - "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", + "lastModified": 1683408522, + "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", + "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", "type": "github" }, "original": { @@ -1464,11 +1468,11 @@ ] }, "locked": { - "lastModified": 1679737941, - "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", + "lastModified": 1683560683, + "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", + "rev": "006c75898cf814ef9497252b022e91c946ba8e17", "type": "github" }, "original": { @@ -1482,11 +1486,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1679737941, - "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", + "lastModified": 1683560683, + "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", + "rev": "006c75898cf814ef9497252b022e91c946ba8e17", "type": "github" }, "original": { @@ -1648,11 +1652,11 @@ ] }, "locked": { - "lastModified": 1680315536, - "narHash": "sha256-0AsBuKssJMbcRcw4HJQwJsUHhZxR5+gaf6xPQayhR44=", + "lastModified": 1683771545, + "narHash": "sha256-we0GYcKTo2jRQGmUGrzQ9VH0OYAUsJMCsK8UkF+vZUA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5c8c151bdd639074a0051325c16df1a64ee23497", + "rev": "c57e210faf68e5d5386f18f1b17ad8365d25e4ed", "type": "github" }, "original": { @@ -1707,6 +1711,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tow-boot": { "flake": false, "locked": { @@ -1796,21 +1815,6 @@ } }, "utils_3": { - "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_4": { "locked": { "lastModified": 1676283394, "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", @@ -1825,7 +1829,7 @@ "type": "github" } }, - "utils_5": { + "utils_4": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -1844,11 +1848,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1680810405, - "narHash": "sha256-LmI/4Yp/pOOoI4RxLRx9I90NBsiqdRLVOfbATKlgpkg=", + "lastModified": 1685491729, + "narHash": "sha256-YfpP8tKpcr0Lxlr3PdoMaY3GD/uJRl6E5pp5KQCEuzg=", "owner": "wlroots", "repo": "wlroots", - "rev": "7abda952d0000b72d240fe1d41457b9288f0b6e5", + "rev": "3f0487d310974f6ff889ca80e4fb4005553814ed", "type": "gitlab" }, "original": { @@ -1870,11 +1874,11 @@ ] }, "locked": { - "lastModified": 1681127512, - "narHash": "sha256-vklOOhBj5W8fii6yN4L2WY5ZeifBmsq3+mJ2wC1Pk9U=", + "lastModified": 1685385764, + "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "04f579377a32781ce57c9cf4ba2a5bcb7f53fa97", + "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fe6057d..66ef150 100644 --- a/flake.nix +++ b/flake.nix @@ -30,10 +30,10 @@ agenix.url = "github:ryantm/agenix"; comma.url = "github:nix-community/comma"; rock5b.url = "github:aciceri/rock5b-nixos"; - # ccrEmacs.url = "github:aciceri/emacs"; - ccrEmacs.url = "/home/ccr/.config/emacs"; + ccrEmacs.url = "github:aciceri/emacs"; + # ccrEmacs.url = "/home/ccr/.config/emacs"; hyprland = { - url = "github:hyprwm/hyprland"; + url = "github:hyprwm/hyprland/v0.26.0"; inputs.nixpkgs.follows = "nixpkgsUnstable"; }; hyprpaper = { diff --git a/hmModules/aerc/binds.conf b/hmModules/aerc/binds.conf new file mode 100644 index 0000000..625f369 --- /dev/null +++ b/hmModules/aerc/binds.conf @@ -0,0 +1,129 @@ +# Binds are of the form = +# To use '=' in a key sequence, substitute it with "Eq": "" +# If you wish to bind #, you can wrap the key sequence in quotes: "#" = quit + = :prev-tab + = :next-tab + = :term +? = :help keys + +[messages] +q = :quit + +j = :next + = :next + = :next 50% + = :next 100% + = :next 100% + +k = :prev + = :prev + = :prev 50% + = :prev 100% + = :prev 100% +g = :select 0 +G = :select -1 + +J = :next-folder +K = :prev-folder +H = :collapse-folder +L = :expand-folder + +v = :mark -t +V = :mark -v + +T = :toggle-threads + + = :view +d = :prompt 'Really delete this message?' 'delete-message' +D = :delete +A = :archive flat + +C = :compose + +rr = :reply -a +rq = :reply -aq +Rr = :reply +Rq = :reply -q + +c = :cf +$ = :term +! = :term +| = :pipe + +/ = :search +\ = :filter +n = :next-result +N = :prev-result + = :clear + +[messages:folder=Drafts] + = :recall + +[view] +/ = :toggle-key-passthrough/ +q = :close +O = :open +S = :save +| = :pipe +D = :delete +A = :archive flat + + = :open-link + +f = :forward +rr = :reply -a +rq = :reply -aq +Rr = :reply +Rq = :reply -q + +H = :toggle-headers + = :prev-part + = :next-part +J = :next +K = :prev + +[view::passthrough] +$noinherit = true +$ex = + = :toggle-key-passthrough + +[compose] +# Keybindings used when the embedded terminal is not selected in the compose +# view +$noinherit = true +$ex = + = :prev-field + = :next-field + = :switch-account -p + = :switch-account -n + = :next-field + = :prev-field + = :prev-tab + = :next-tab + +[compose::editor] +# Keybindings used when the embedded terminal is selected in the compose view +$noinherit = true +$ex = + = :prev-field + = :next-field + = :prev-tab + = :next-tab + +[compose::review] +# Keybindings used when reviewing a message to be sent +y = :send +n = :abort +v = :preview +p = :postpone +q = :choose -o d discard abort -o p postpone postpone +e = :edit +a = :attach +d = :detach + +[terminal] +$noinherit = true +$ex = + + = :prev-tab + = :next-tab \ No newline at end of file diff --git a/hmModules/aerc/default.nix b/hmModules/aerc/default.nix new file mode 100644 index 0000000..6c3e65b --- /dev/null +++ b/hmModules/aerc/default.nix @@ -0,0 +1,18 @@ +{ + imports = [../email]; + config = { + accounts.email.accounts = { + autistici.aerc = { + enable = true; + }; + mlabs.aerc = { + enable = false; + }; + }; + programs.aerc = { + enable = true; + extraBinds = builtins.readFile ./binds.conf; + extraConfig.general.unsafe-accounts-conf = true; + }; + }; +} diff --git a/hmModules/email/default.nix b/hmModules/email/default.nix index c9169c7..3b64fe5 100644 --- a/hmModules/email/default.nix +++ b/hmModules/email/default.nix @@ -3,52 +3,67 @@ secrets, ... }: { - home.packages = with pkgs; [mu]; - programs.mbsync.enable = true; - programs.msmtp.enable = true; - programs.notmuch = { - enable = true; - hooks = { - preNew = "mbsync --all"; - }; - }; - services = { - mbsync = { - enable = false; - # FIXME this requires `pass` every 5 minutes that run `pinentry` - frequency = "*:0/15"; - preExec = "${pkgs.isync}/bin/mbsync -Ha"; - # First time run: mu init --maildir ~/.mail --my-address andrea.ciceri@autistici.org - # TODO Nixify this - postExec = "${pkgs.mu}/bin/mu index"; - }; - }; + # home.packages = with pkgs; [mu]; + # programs.mbsync.enable = true; + # programs.msmtp.enable = true; + # programs.notmuch = { + # enable = true; + # hooks = { + # preNew = "mbsync --all"; + # }; + # }; + # services = { + # mbsync = { + # enable = false; + # # FIXME this requires `pass` every 5 minutes that run `pinentry` + # frequency = "*:0/15"; + # preExec = "${pkgs.isync}/bin/mbsync -Ha"; + # # First time run: mu init --maildir ~/.mail --my-address andrea.ciceri@autistici.org + # # TODO Nixify this + # postExec = "${pkgs.mu}/bin/mu index"; + # }; + # }; accounts.email = { - maildirBasePath = ".mail"; + # maildirBasePath = ".mail"; accounts.autistici = { address = "andrea.ciceri@autistici.org"; gpg = { key = "7A66EEA1E6C598D07D361287A1FC89532D1C565"; signByDefault = true; }; - imap.host = "mail.autistici.org"; - mbsync = { - enable = true; - create = "maildir"; + imap = { + host = "mail.autistici.org"; + port = 993; }; - msmtp.enable = true; - notmuch.enable = true; + # mbsync = { + # enable = true; + # create = "maildir"; + # }; + # msmtp.enable = true; + # notmuch.enable = true; primary = true; realName = "Andrea Ciceri"; signature = { - # text = ''''; + text = '' + Andrea Ciceri + ''; showSignature = "append"; }; - passwordCommand = "${pkgs.pass}/bin/pass show autistici/password"; + passwordCommand = "${pkgs.coreutils}/bin/cat ${secrets.autistici-password.path}"; smtp = { host = "smtp.autistici.org"; }; userName = "andrea.ciceri@autistici.org"; }; + accounts.mlabs = { + address = "andreaciceri@mlabs.city"; + imap = { + host = "imap.gmail.com"; + port = 993; + }; + realName = "Andrea Ciceri"; + smtp.host = "smtp.gmail.com"; + userName = "andreaciceri@mlabs.city"; + }; }; } diff --git a/hmModules/firefox/default.nix b/hmModules/firefox/default.nix index b2ff4b2..f12b0dd 100644 --- a/hmModules/firefox/default.nix +++ b/hmModules/firefox/default.nix @@ -28,7 +28,7 @@ # fx_cast # TODO make PR to rycee NUR repo ]; settings = { - "browser.startup.homepage" = "https://google.com"; + "browser.startup.homepage" = "https://google.it"; "browser.search.region" = "IT"; "browser.search.isUS" = false; "distribution.searchplugins.defaultLocale" = "it-IT"; @@ -54,6 +54,19 @@ } ]; }; + "Google IT" = { + urls = [ + { + template = "https://www.google.it/search"; + params = [ + { + name = "q"; + value = "{searchTerms}"; + } + ]; + } + ]; + }; }; }; }; diff --git a/hmModules/git/default.nix b/hmModules/git/default.nix index b24576c..2305728 100644 --- a/hmModules/git/default.nix +++ b/hmModules/git/default.nix @@ -4,7 +4,7 @@ email = "andrea.ciceri@autistici.org"; }; in { - home.packages = [pkgs.gitoxide]; + imports = [../gitui ../lazygit]; programs.git = { enable = true; package = pkgs.gitAndTools.gitFull; @@ -18,6 +18,8 @@ in { user.signingKey = "/home/ccr/.ssh/id_rsa"; gpg.format = "ssh"; commit.gpgsign = true; + + core.editor = "hx"; }; userName = config.name; @@ -35,7 +37,7 @@ in { }; delta = { - enable = true; + enable = false; # Playing with difftastic at the moment options = { features = "decorations"; delta = { @@ -43,5 +45,10 @@ in { }; }; }; + + difftastic = { + enable = true; + background = "dark"; + }; }; } diff --git a/hmModules/gitui/default.nix b/hmModules/gitui/default.nix new file mode 100644 index 0000000..600b89b --- /dev/null +++ b/hmModules/gitui/default.nix @@ -0,0 +1,3 @@ +{ + programs.gitui.enable = true; +} diff --git a/hmModules/helix/default.nix b/hmModules/helix/default.nix index ead0fc4..98b1278 100644 --- a/hmModules/helix/default.nix +++ b/hmModules/helix/default.nix @@ -1,13 +1,12 @@ { config, lib, - pkgs, ... }: { programs.helix = { enable = true; settings = { - theme = "onedark"; + theme = "dracula"; editor = { indent-guides.render = true; cursor-shape = { @@ -15,7 +14,10 @@ normal = "block"; select = "underline"; }; + true-color = true; # to make colors coherent when in ssh }; }; }; + home.sessionVariables.EDITOR = lib.mkForce "${config.programs.helix.package}/bin/helix"; + programs.nushell.environmentVariables.EDITOR = lib.mkForce config.home.sessionVariables.EDITOR; } diff --git a/hmModules/hyprland/default.nix b/hmModules/hyprland/default.nix index c071c30..268d17a 100644 --- a/hmModules/hyprland/default.nix +++ b/hmModules/hyprland/default.nix @@ -57,12 +57,17 @@ in { exec-once = ${config.programs.waybar.package}/bin/waybar exec-once = ${config.services.mako.package}/bin/mako exec-once = ${pkgs.hyprpaper}/bin/hyprpaper + exec-once = ${config.programs.thunderbird.package}/bin/thunderbird windowrulev2 = tile, class:^(Spotify)$ windowrulev2 = workspace 9, class:^(Spotify)$ + windowrulev2 = workspace 8, class:thunderbird - bind = SUPER , F, exec, firefox - bind = SUPER , RETURN, exec, ${config.programs.kitty.package}/bin/kitty ${config.programs.kitty.package}/bin/kitty +kitten ssh mothership.fleet + bind = SUPER, b, exec, firefox + bind = SUPER SHIFT, b , exec, ${pkgs.waypipe}/bin/waypipe --compress lz4=10 ssh mothership.fleet firefox + bind = SUPER SHIFT, RETURN, exec, ${config.programs.kitty.package}/bin/kitty ssh mothership.fleet + bind = SUPER, m, exec, ${config.programs.kitty.package}/bin/kitty mosh mothership.fleet + bind = SUPER, RETURN, exec, ${config.programs.kitty.package}/bin/kitty bind = SUPER, x, exec, emacsclient -c bind = SUPER, y, exec, ${pkgs.waypipe}/bin/waypipe --compress lz4=10 ssh mothership.fleet emacsclient -c bind = SUPER, d, exec, ${pkgs.fuzzel}/bin/fuzzel --background-color=253559cc --border-radius=5 --border-width=0 @@ -116,14 +121,14 @@ in { rounding = 4 blur = true - blur_size = 3 + blur_size = 8 blur_passes = 1 blur_new_optimizations = true drop_shadow = true shadow_range = 4 shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) + col.shadow = rgba(a8cfee11) } animations { diff --git a/hmModules/kitty/default.nix b/hmModules/kitty/default.nix index 59407ae..49a60e8 100644 --- a/hmModules/kitty/default.nix +++ b/hmModules/kitty/default.nix @@ -1,4 +1,4 @@ -{ +{pkgs, ...}: { programs.kitty = { enable = true; font = { @@ -9,5 +9,49 @@ disable_ligatures = "cursor"; confirm_os_window_close = 0; }; + theme = "Snazzy"; + # extraConfig = '' + # include ${pkgs.writeText "custom-kitty-theme" '' + # # vim:ft=kitty + + # background #252D30 + # foreground #ABB2BF + # cursor #ABB2BF + # selection_background #636C6E + + # #: black + # color0 #16181A + # color8 #818b95 + + # #: red + # color1 #D05C65 + # color9 #e7adb2 + + # #: green + # color2 #7DA869 + # color10 #bdd3b3 + + # #: yellow + # color3 #D5B06B + # color11 #ead7b4 + + # #: blue + # color4 #519FDF + # color12 #A8CFEE + + # #: magenta + # color5 #B668CD + # color13 #DAB3E6 + + # #: cyan + # color6 #46A6B2 + # color14 #a0D3DA + + # #: white + # color7 #ABB2BF + # color15 #d4D8DF + # selection_foreground #636C6E + # ''} + # ''; }; } diff --git a/hmModules/lazygit/default.nix b/hmModules/lazygit/default.nix new file mode 100644 index 0000000..7817008 --- /dev/null +++ b/hmModules/lazygit/default.nix @@ -0,0 +1,12 @@ +{pkgs, ...}: { + programs.lazygit = { + enable = true; + settings = { + git.paging = { + colorArg = "always"; + useConfig = true; + pager = "${pkgs.delta}/bin/delta --dark --paging=never"; + }; + }; + }; +} diff --git a/hmModules/remmina/default.nix b/hmModules/remmina/default.nix new file mode 100644 index 0000000..abbd844 --- /dev/null +++ b/hmModules/remmina/default.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + home.packages = [pkgs.remmina]; +} diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix index 71e5405..b776865 100644 --- a/hmModules/shell/default.nix +++ b/hmModules/shell/default.nix @@ -76,7 +76,7 @@ case_sensitive: false # set to true to enable case-sensitive completions quick: true # set this to false to prevent auto-selecting completions when only one remains partial: true # set this to false to prevent partial filling of the prompt - algorithm: "prefix" # prefix or fuzzy + algorithm: "fuzzy" # prefix or fuzzy external: { enable: true # set to false to prevent nushell looking into $env.PATH to find more suggestions, `false` recommended for WSL users as this look up my be very slow max_results: 100 # setting it lower can improve completion performance at the cost of omitting some options @@ -87,8 +87,8 @@ metric: true # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard) format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, zb, zib, auto } + buffer_editor: "${config.programs.helix.package}/bin/helix" } - let-env TERM = "screen" ''; }; @@ -145,6 +145,7 @@ thefuck htop-vim dig.dnsutils + lsof zsh-completions nix-zsh-completions carapace # used by nushell diff --git a/hmModules/thunderbird/default.nix b/hmModules/thunderbird/default.nix new file mode 100644 index 0000000..9eb89c8 --- /dev/null +++ b/hmModules/thunderbird/default.nix @@ -0,0 +1,24 @@ +{ + imports = [../email]; + config = { + accounts.email.accounts = { + autistici.thunderbird = { + enable = true; + profiles = ["default"]; + }; + mlabs.thunderbird = { + enable = true; + profiles = ["default"]; + }; + }; + programs.thunderbird = { + enable = true; + profiles = { + default = { + isDefault = true; + }; + # mlabs = {}; + }; + }; + }; +} diff --git a/hosts/default.nix b/hosts/default.nix index f488059..0e1dd67 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -20,6 +20,11 @@ type = lib.types.str; default = "x86_64-linux"; }; + colmena = lib.mkOption { + description = "Set colmena."; + type = lib.types.attrs; + default = {}; + }; secrets = lib.mkOption { description = "List of secrets names in the `secrets` folder"; type = lib.types.attrsOf (lib.types.submodule ({name, ...}: { @@ -79,6 +84,7 @@ config.overlays = with inputs; [ agenix.overlays.default comma.overlays.default + helix.overlays.default nur.overlay ]; })); @@ -169,6 +175,7 @@ secrets = { "thinkpad-wireguard-private-key" = {}; "cachix-personal-token".owner = "ccr"; + "autistici-password".owner = "ccr"; }; }; rock5b = { @@ -180,6 +187,7 @@ secrets = { "rock5b-wireguard-private-key" = {}; }; + colmena.deployment.buildOnTarget = true; }; pbp = { system = "aarch64-linux"; @@ -239,10 +247,12 @@ nodeSpecialArgs = builtins.mapAttrs (name: value: value._module.specialArgs) self.nixosConfigurations; }; } - // builtins.mapAttrs (name: config: { - imports = config._module.args.modules; - deployment.targetHost = "${name}.fleet"; - }) - self.nixosConfigurations; + // builtins.mapAttrs (name: host: + lib.recursiveUpdate { + imports = self.nixosConfigurations.${name}._module.args.modules; + deployment.targetHost = "${name}.fleet"; + } + host.colmena) + config.fleet.hosts; }; } diff --git a/hosts/mothership/default.nix b/hosts/mothership/default.nix index cb49640..ab3f651 100644 --- a/hosts/mothership/default.nix +++ b/hosts/mothership/default.nix @@ -19,6 +19,7 @@ "nix-serve" "cgit" "docker" + "binfmt" ]; ccr = { @@ -32,6 +33,7 @@ "shell" "xdg" "git-workspace" + "firefox" # used with waypipe ]; packages = with pkgs; [ comma @@ -59,7 +61,7 @@ nixpkgs.config.joypixels.acceptLicense = true; - environment.systemPackages = with pkgs; [waypipe firefox]; + environment.systemPackages = with pkgs; [waypipe]; home-manager.users.ccr.gtk = { enable = true; diff --git a/hosts/mothership/disko.nix b/hosts/mothership/disko.nix index 22253f4..0c71d4a 100644 --- a/hosts/mothership/disko.nix +++ b/hosts/mothership/disko.nix @@ -12,7 +12,6 @@ format = "gpt"; partitions = [ { - type = "partition"; name = "ESP"; start = "0"; end = "960MiB"; @@ -25,7 +24,6 @@ }; } { - type = "partition"; name = "zfs"; start = "1GiB"; end = "100%"; @@ -45,7 +43,6 @@ format = "gpt"; partitions = [ { - type = "partition"; name = "zfs"; start = "1GiB"; end = "100%"; @@ -69,7 +66,7 @@ options.acltype = "posix"; datasets = { root = { - zfs_type = "filesystem"; + type = "zfs_fs"; options = { mountpoint = "legacy"; autotrim = "on"; diff --git a/hosts/pbp/disko.nix b/hosts/pbp/disko.nix index 31736ee..041720a 100644 --- a/hosts/pbp/disko.nix +++ b/hosts/pbp/disko.nix @@ -9,7 +9,6 @@ _: { partitions = [ { name = "root"; - type = "partition"; start = "1MiB"; end = "-4G"; part-type = "primary"; @@ -22,7 +21,6 @@ _: { } { name = "swap"; - type = "partition"; start = "-4G"; end = "100%"; part-type = "primary"; @@ -42,7 +40,6 @@ _: { format = "gpt"; partitions = [ { - type = "partition"; name = "ESP"; start = "1MiB"; end = "1024MiB"; @@ -55,7 +52,6 @@ _: { } { name = "home"; - type = "partition"; start = "1024MiB"; end = "100%"; part-type = "primary"; diff --git a/hosts/rock5b/default.nix b/hosts/rock5b/default.nix index 469fc3b..7733625 100644 --- a/hosts/rock5b/default.nix +++ b/hosts/rock5b/default.nix @@ -6,12 +6,16 @@ config, ... }: { - imports = fleetModules [ - "common" - "ssh" - "ccr" - "wireguard-client" - ]; + imports = + fleetModules [ + "common" + "ssh" + "ccr" + "wireguard-client" + ] + ++ [ + ./disko.nix + ]; ccr.enable = true; @@ -26,64 +30,62 @@ generic-extlinux-compatible.enable = true; }; - disko = import ./disko.nix {}; - - fileSystems."/mnt/film" = { - device = "//ccr.ydns.eu/film"; - fsType = "cifs"; - options = let - credentials = pkgs.writeText "credentials" '' - username=guest - password= - ''; - in ["credentials=${credentials},x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"]; - }; - fileSystems."/mnt/archivio" = { - device = "//ccr.ydns.eu/archivio"; - fsType = "cifs"; - options = let - credentials = pkgs.writeText "credentials" '' - username=guest - password= - ''; - in ["credentials=${credentials},x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"]; - }; + # fileSystems."/mnt/film" = { + # device = "//ccr.ydns.eu/film"; + # fsType = "cifs"; + # options = let + # credentials = pkgs.writeText "credentials" '' + # username=guest + # password= + # ''; + # in ["credentials=${credentials},x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"]; + # }; + # fileSystems."/mnt/archivio" = { + # device = "//ccr.ydns.eu/archivio"; + # fsType = "cifs"; + # options = let + # credentials = pkgs.writeText "credentials" '' + # username=guest + # password= + # ''; + # in ["credentials=${credentials},x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"]; + # }; environment.systemPackages = with pkgs; [ - kodi-rock5b + # kodi-rock5b cifs-utils ]; - users.extraUsers.kodi = { - isNormalUser = true; - uid = 1002; - extraGroups = ["video" "input"]; - }; + # users.extraUsers.kodi = { + # isNormalUser = true; + # uid = 1002; + # extraGroups = ["video" "input"]; + # }; - networking.firewall.allowedTCPPorts = [ - 8080 # kodi control - 80 - ]; + # networking.firewall.allowedTCPPorts = [ + # 8080 # kodi control + # 80 + # ]; - programs.bash.loginShellInit = '' - [[ "$(tty)" == '/dev/tty1' ]] && \ - [[ "$(whoami)" == 'kodi' ]] && \ - ${pkgs.kodi-rock5b}/bin/kodi-standalone + # programs.bash.loginShellInit = '' + # [[ "$(tty)" == '/dev/tty1' ]] && \ + # [[ "$(whoami)" == 'kodi' ]] && \ + # ${pkgs.kodi-rock5b}/bin/kodi-standalone - ''; + # ''; # Waiting for https://github.com/NixOS/nixpkgs/issues/140304 - services.getty = let - script = pkgs.writeText "login-program.sh" '' - if [[ "$(tty)" == '/dev/tty1' ]]; then - ${pkgs.shadow}/bin/login -f kodi; - else - ${pkgs.shadow}/bin/login; - fi - ''; - in { - loginProgram = "${pkgs.bash}/bin/sh"; - loginOptions = toString script; - extraArgs = ["--skip-login"]; - }; + # services.getty = let + # script = pkgs.writeText "login-program.sh" '' + # if [[ "$(tty)" == '/dev/tty1' ]]; then + # ${pkgs.shadow}/bin/login -f kodi; + # else + # ${pkgs.shadow}/bin/login; + # fi + # ''; + # in { + # loginProgram = "${pkgs.bash}/bin/sh"; + # loginOptions = toString script; + # extraArgs = ["--skip-login"]; + # }; } diff --git a/hosts/rock5b/disko.nix b/hosts/rock5b/disko.nix index 5dda7c5..d379585 100644 --- a/hosts/rock5b/disko.nix +++ b/hosts/rock5b/disko.nix @@ -1,5 +1,10 @@ -{emmc ? "/dev/mmcblk0", ...}: { - devices = { +let + emmc = "/dev/mmcblk0"; + hd1 = "/dev/disk/by-id/ata-WDC_WD10EADS-22M2B0_WD-WCAV52709550"; + hd2 = "/dev/disk/by-id/ata-WDC_WD10EADX-22TDHB0_WD-WCAV5V359530"; + # old_hd = "/dev/disk/by-id/ata-WDC_WD5000AAKX-08U6AA0_WD-WCC2E5TR40FU"; +in { + disko.devices = { disk = { emmc = { type = "disk"; @@ -9,14 +14,12 @@ format = "gpt"; partitions = [ { - type = "partition"; start = "32.8kB"; end = "12.6MB"; name = "uboot"; bootable = true; } { - type = "partition"; name = "NIXOS_ROOTFS"; start = "13.6MB"; end = "100%"; @@ -30,6 +33,63 @@ ]; }; }; + # hd1 = { + # type = "disk"; + # device = hd1; + # content = { + # type = "table"; + # format = "gpt"; + # partitions = [ + # { + # name = "primary"; + # start = "0"; + # end = "100%"; + # content = { + # type = "lvm_pv"; + # vg = "pool"; + # }; + # } + # ]; + # }; + # }; + # hd2 = { + # type = "disk"; + # device = hd2; + # content = { + # type = "table"; + # format = "gpt"; + # partitions = [ + # { + # name = "primary"; + # start = "0"; + # end = "100%"; + # content = { + # type = "lvm_pv"; + # vg = "pool"; + # }; + # } + # ]; + # }; + # }; + # }; + # lvm_vg = { + # pool = { + # type = "lvm_vg"; + # lvs = { + # root = { + # size = "100M"; + # lvm_type = "mirror"; + # content = { + # type = "filesystem"; + # format = "ext4"; + # mountpoint = "/mnt/raid"; + # mountOptions = [ + # "defaults" + # ]; + # }; + # }; + # }; + # }; }; }; } diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 65f5fc0..3e573a0 100644 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -15,7 +15,6 @@ "adb" "audio" "battery" - # "binfmt" "bluetooth" "ccr" "common" @@ -43,7 +42,8 @@ "digikam" "discord" "element" - "email" + # "thunderbird" + "aerc" "emacs" "firefox" "git" @@ -67,6 +67,7 @@ "steam-run" "lutris" "wine" + "remmina" ]; packages = with pkgs; [ comma @@ -90,7 +91,7 @@ boot.initrd.kernelModules = []; boot.kernelModules = ["kvm-intel"]; boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback]; - boot.kernelPackages = pkgs.linuxPackages_zen; + # boot.kernelPackages = pkgs.linuxPackages_zen; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/hosts/thinkpad/zfs.nix b/hosts/thinkpad/zfs.nix index db06bea..c547d1a 100644 --- a/hosts/thinkpad/zfs.nix +++ b/hosts/thinkpad/zfs.nix @@ -35,14 +35,14 @@ users.users.root.initialHashedPassword = "$6$EqXfyFLxUZfpmJ8F$UH3pLcHwgLpOZwiSDhdq/iR/p.uyZZYlk6G4Q0S8BtYr3Qt2xKU56Fwv3Mgco.J0i3cx1Nm8XMfvythSuv8gh/"; # TODO: remove this when it will be no more necessary - boot.zfs.enableUnstable = true; - nixpkgs.overlays = [ - (self: super: { - linuxPackages_zen = super.linuxPackages_zen.extend (lpSelf: lpSuper: { - zfsUnstable = lpSuper.zfsUnstable.overrideAttrs (_: { - meta.broken = false; - }); - }); - }) - ]; + # boot.zfs.enableUnstable = true; + # nixpkgs.overlays = [ + # (self: super: { + # linuxPackages_zen = super.linuxPackages_zen.extend (lpSelf: lpSuper: { + # zfsUnstable = lpSuper.zfsUnstable.overrideAttrs (_: { + # meta.broken = false; + # }); + # }); + # }) + # ]; } diff --git a/lib/default.nix b/lib/default.nix index c7655ea..e65bf2b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -18,5 +18,6 @@ oneplus6t = "10.100.0.3"; rock5b = "10.100.0.4"; pbp = "10.100.0.5"; + babbo = "10.100.0.6"; }; } diff --git a/modules/nix/default.nix b/modules/nix/default.nix index af67cb0..b1383d9 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -15,6 +15,7 @@ "ccr" "@wheel" ]; + netrc-file = "/etc/nix/netrc"; # Disabled all the substituters, this should be managed at flakes level # trusted-public-keys = [ # "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" diff --git a/modules/vm-mara/default.nix b/modules/vm-mara/default.nix index 85c8d77..b220c49 100644 --- a/modules/vm-mara/default.nix +++ b/modules/vm-mara/default.nix @@ -1,7 +1,8 @@ { + # config, pkgs, - lib, - fleetFlake, + # lib, + # fleetFlake, ... }: { security.polkit.enable = true; @@ -28,19 +29,78 @@ ]; }; - boot.kernelParams = [ - "intel_iommu=on" - "iommu=pt" + # boot.kernelParams = [ + # "intel_iommu=on" + # # "iommu=pt" + # "i915.enable_guc=3" + # "i915.max_vfs=7" + # ]; + + # boot.blacklistedKernelModules = ["i915"]; + + # boot.kernelModules = [ + # # "vfio-pci" + # "i915" + # ]; + + # boot.extraModulePackages = [ + # (config.boot.kernelPackages.callPackage ./i915-sriov-dkms.nix {} ) + # ]; + + # boot.initrd.availableKernelModules = [ + # "i915" + # ]; + + # boot.initrd.kernelModules = [ + # "i915" + # ]; + + # hardware = { + # firmware = [ + # (( + # pkgs.runCommandNoCC + # "adls_dmc_ver2_01.bin" + # {} + # "mkdir -p $out/lib/firmware && cp ${./adls_dmc_ver2_01.bin} $out/lib/firmware/adls_dmc_ver2_01.bin" + # ) + # // { + # # compressFirmware = false; # TODO can I re-enable compression? + # }) + # ]; + # }; + + # hardware.enableAllFirmware = + # builtins.trace "${ + # (config.boot.kernelPackages.callPackage ./i915-sriov-dkms.nix {}) + # }" + # true; + + # boot.kernelModul = '' + # echo "vfio-pci" > /sys/bus/pci/devices/0000:00:02.0/driver_override + # echo 7 > /sys/devices/pci0000:00/0000:00:02.0/sriov_numvfs + # modprobe -i vfio-pci + # modprobe -i i915 + # ''; + + boot.kernelPatches = [ + # { + # name = "i915"; + # patch = null; + # extraStructuredConfig = { + # INTEL_MEI_PXP = lib.kernel.module; + # DRM_I915_PXP = lib.kernel.yes; + # PMIC_OPREGION = lib.kernel.yes; + # }; + # } ]; - boot.initrd.availableKernelModules = ["vfio-pci"]; - boot.initrd.preDeviceCommands = '' - echo "vfio-pci" > /sys/bus/pci/devices/0000:00:02.0/driver_override - modprobe -i vfio-pci - ''; + # boot.kernel.sysctl = { + # "devices/pci0000:00/0000:00:02.0/sriov_numvfs" = 7; + # }; # -vnc :0 \ # -audiodev alsa,id=snd0,out.try-poll=off -device ich9-intel-hda -device hda-output,audiodev=snd0 \ + # -device vfio-pci,host=00:02.0 \ systemd.services.vm-mara = let start-vm = pkgs.writeShellApplication { @@ -52,14 +112,14 @@ qemu-system-x86_64 \ -enable-kvm \ - -cpu host,kvm=off \ - -smp 2 \ - -m 4096 \ + -cpu host,kvm=on,hv-vendor_id="GenuineIntel" \ + -smp 4 \ + -m 8192 \ -nic user,model=virtio-net-pci,hostfwd=tcp::3389-:3389,hostfwd=tcp::47989-:47989,hostfwd=tcp::47990-:47990,hostfwd=tcp::47984-:47984,hostfwd=tcp::48010-:48010,hostfwd=udp::47998-:47988,hostfwd=udp::47999-:47999,hostfwd=udp::48000-:48000,hostfwd=udp::48002-:48002,hostfwd=udp::48003-:48003,hostfwd=udp::48004-:48004,hostfwd=udp::48005-:48005,hostfwd=udp::48006-:48006,hostfwd=udp::48007-:48007,hostfwd=udp::48008-:48008,hostfwd=udp::48009-:48009,hostfwd=udp::48010-:48010 \ -cdrom /var/lib/vm-mara/virtio-win.iso \ -device nec-usb-xhci,id=usb,bus=pci.0,addr=0x4 \ -device usb-tablet \ - -device vfio-pci,host=00:02.0 \ + -vnc :0 \ -nographic \ -drive file=/var/lib/vm-mara/w10.qcow2 ''; diff --git a/modules/vm-mara/i915-sriov-dkms.nix b/modules/vm-mara/i915-sriov-dkms.nix new file mode 100644 index 0000000..b94203f --- /dev/null +++ b/modules/vm-mara/i915-sriov-dkms.nix @@ -0,0 +1,53 @@ +{ + stdenv, + kernel, + fetchFromGitHub, + runCommand, + ... +}: let + m = stdenv.mkDerivation rec { + name = "i915-sriov-dkms"; + version = "4d89a1d5ba8c66308e3276c5297eda838c70cc31"; + + src = fetchFromGitHub { + owner = "strongtz"; + repo = "i915-sriov-dkms"; + rev = version; + sha256 = "sha256-LNKDNi7oEhO3FY47oKYbg8wt+268GlBVxQpHdNLNrwM="; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + setSourceRoot = '' + export sourceRoot=$(pwd)/source + ''; + + makeFlags = + kernel.makeFlags + ++ [ + "-C" + "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "M=$(sourceRoot)" + "KVER=${kernel.version}" + ]; + + # installPhase = '' + # install -D i915.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/i915/i915.ko + # ''; + + installFlags = ["INSTALL_MOD_PATH=${placeholder "out"}"]; + + installTargets = ["modules_install"]; + + enableParallelBuilding = true; + + # meta.priority = -10; + }; +in + m +# in runCommand "test" {} '' +# # mkdir -p $out/lib/modules/6.1.30/kernel/drivers/gpu/drm/i915 +# mkdir -p $out/lib/modules/6.1.30/extra +# cp ${m}/lib/modules/6.1.30/extra/i915.ko.xz $out/lib/modules/6.1.30/extra/foo.ko.xz +# '' + diff --git a/modules/vm-sala/default.nix b/modules/vm-sala/default.nix index 6347edf..4dc5457 100644 --- a/modules/vm-sala/default.nix +++ b/modules/vm-sala/default.nix @@ -25,17 +25,17 @@ initial-config = fleetFlake.inputs.nixos-generators.nixosGenerate { system = "x86_64-linux"; modules = [ - fleetFlake.inputs.nixos-vscode-server.nixosModule + # fleetFlake.inputs.nixos-vscode-server.nixosModule ({ modulesPath, lib, config, ... }: { - services.vscode-server = { - enable = true; - enableFHS = true; - }; + # services.vscode-server = { + # enable = true; + # enableFHS = true; + # }; system.build.qcow = lib.mkForce (import "${toString modulesPath}/../lib/make-disk-image.nix" { inherit lib config pkgs; diskSize = 50 * 1024; diff --git a/modules/wireguard-server/default.nix b/modules/wireguard-server/default.nix index 0617644..1b937ba 100644 --- a/modules/wireguard-server/default.nix +++ b/modules/wireguard-server/default.nix @@ -48,6 +48,7 @@ oneplus6t = "O6/tKaA8Hs7OEqi15hV4RwviR6vyCTMYv6ZlhsI+tnI="; rock5b = "bc5giljukT1+ChbbyTLdOfejfR3c8RZ4XoXmQM54nTY="; pbp = "jvfAfQ2ykBndpnoLQTBJzDOhpjMOtIyCufEw+BxMxSc="; + babbo = "mb1BsvGurWVA6s3uXP1hdEi3YPpzM0vtXD/7Vfsw2HI="; }; mkPeer = hostname: { publicKey = publicKeys."${hostname}"; diff --git a/secrets/autistici-password.age b/secrets/autistici-password.age index 71dd1ae..341bbe2 100644 --- a/secrets/autistici-password.age +++ b/secrets/autistici-password.age @@ -1,17 +1,32 @@ age-encryption.org/v1 +-> ssh-rsa /AagBw +ktkGbg8IjCm+FbRSmWi+YoMt+T3G5flNJF1nfDh96MjkB9Cg+zPN8Oq1ikZJFPXU +DKrFyeBaZncOGnhaXcyno6lvu+etvFaC1I+Zni2dtmp1CJ0o+b0ylXEvE0CFee71 +Isx8sMOxx5Bx8liS3WxXz02GCvrTxWauMDFSxnjcWty7pGaJaJqYN5Q4bdxRjOtH +dtCSV2PSpZuGdyrk2jTDhBX2PcfOC/Mw1qpmWsPZF4NVtdKY1TwbV4aRmYPDNUfb +D4Xi3kOLbAd+QBdtb6/7thUyfdxOFDomoHiJASfLISRT0zsHDvkrP1aRt/yvhWjm +zZE+M/IYu2rbxHKmZqTOxdDrjc9fafAIFqM//E5vuHK9VBPROY7wAF1kq2y2uzcp +Eoes3+XV9Gu8s83p86BWPmlU5okMGykXb0q/PuBzPtVjj5yrJQS5C+8OOfPwPDQ2 +ftKQj+6F3BjKwOl49orhqIyenyKpLfoqLhbP8KfII2Vpo008ES9LIRU/NzSP+BoH +vOK+PRCwGBOamET0bJiL2VSBI6S2a+OML5PmyPaLFSxFFI8q4FThBepgr5VRSeIc +vFS0TTNvlDekUngWyQnTmKG80Hc/sgwutJ6RU2EEqV+0FztiMzigwUlgPR5TUQoX +oCelCBDueoq1zNe5izXlAPBdF23955CZxcmp1Dj/agU -> ssh-rsa QHr3/A -khUhJFKpmTuzviFWehb/ccdgtFfWytGg1+E//EAyvioE4P+M1ZL4LMGG2RQvUdw+ -MXdBD0ZCC7f0ImGgRrbmcO19vvaXOYD97ScCJpkS0rFA3nwvpMJuSYuisTO5vvm2 -4GJXzCdwEUCX+DWFlgrLp+aBMb6qZZizkDUOlIePJdEemkgTqCjL2IyVcq33H6zw -uNvk6R7wqharmOz1f4Vy+bliDzWlDh5Y+i/siK07VUtPoVW6MDkQMEvvvPW1/b0I -SQ+iZpmZq0MKtH/kmJG6uk347XO1+Sd8bFlNp5iO4qnCFI+iH4fvoxDKL4746/Ak -YzLu/4i7LOV90hCFOjNZXgLjFhXdEFEmXv9bAdvNlm7/EgSx918ZEI+ERbCLbwAX -lWXwpfEuAiTjvdqIZeyZM7ndFoAnp5Py3rLoQ7AZ5LW2qHIOEcYj9/5LZ6o16ps/ -oNgBeeqjCIWYcHlAGJUh36PU/jGix/ofQFEYaZQvIYzRjYbceg2jJMgoKvwzYbkh -wGzhQRgcjH1bdbYjtHqK8VXtyUC72wnRZ/KD9V9pfgu0ZoUilpjZZpuCxHmaI6y/ -maW0U1/U87DkGevuV5obD176MfpKYxYb2F6GKgPIl8/Or3ckdqLDWbVKkGBV30yv -R/y0S+PJACTly/mFiZSQfOr0oTY8e6I6P7S0UV+ij50 --> }"^%>-grease I=Ef?N -lOO/QaBLoVNDwcBSwb4gaIT9QdAlTLQsBv2nmx9TPdVg ---- vx7UPleUi1TPlCF/vKQSiRzb+UHyGERUfNPEYz0Ulew -2tnrGIRRU)AYhCG0&M4~- \ No newline at end of file +K49Z1HvsQfitU9PNoEjSsaNYEGGnwmZ8SRqTqBht4+JHwRhWSDtG4h9KIiEBmC19 +LEczh/9uHpNGUq10xRY/9//tNN96L27DozIthXXyivWN3Oqrb7jDxyW1+mOjUBUK +3UUOiq55LcYfpO/+6XwAs0NK3iwxhNYw0wYouVGgYDcr7azyL04qjy9GDzR7+12A +i+WPBesFXi2dkcaCNy28pStYI1dOhrzfYb6aSb3RGMK97OvNyrOri3hHw4pCHqAh +/tfi7dnpd+wluunjrVpoyd/KcSsLgbOgh9F5dZf4a15VP0ZXzRL6ZomXpNRvj1pm +HBUb0n1Afl3noddCvHnDHcIZeC8Y40oJMIMXn5qNr8YVISFQ5GfnT5H+GpVUV6C9 +fLvGb0snmno5buDLhEuImiqFbijhYuRX48HYuhOTIh5r25zPrQYnaFR2zwe3PHIG +c+2FmIuAvXzE2CHndlyzPsHvBp7a8f6J/2ONFSuJLtd6VzfjDBbbnxRO8lj/g6ww +Rl8wWLedVSL1bRQVk86vFNcbI4mLkuE1riQJtGcfVvL7cFtyVyMABKc2cKqUiLdV +2F80lng80yRuDgr8n0VXNjKM+QXG6tnywvznw14dmbHuW+b7t7ejnRFtaDZrj5cF +q3VioSN90xPyp/shJrjNxfOdpvJDed9jwCgN9a/uzsA +-> ssh-ed25519 GVMLQg 6sMtU+v5Rp8UMxQwecd1czc2fqTJvWc9q9a+Cx0/fFU +7W/E5wbxWlNxgGHsRDTrVtT9IdXTN8cwEH5YsGBJbiU +-> q-grease 7a< g@'qz# "@lER>} +q5BEbj5jYAd+eU+dzYOTcOCWiVykVJrl8zXO7rJ5jYYXHA+z4VZj9jA1WeNXhAwc +m41au3hDN4qyZJR7KFeAraU7/vDOP8h8uMNz8r1DzKu7ci0T+Q +--- VZh/APHPZQLIJ2uc5P0ult8Hyijf9hlClEDVhP6HMnM +t-]Kj&}Y Fv : \ No newline at end of file diff --git a/secrets/cache-private-key.age b/secrets/cache-private-key.age index 1269f0cadaff4c03294f7f241ca9746a4d94ff27..54c952f9e2628b81d0b982ba66df2063ea00dd76 100644 GIT binary patch literal 1831 zcmYk6%d7MT0mVNoSP0#8WwBjc(a$czHIrmANvzZ_naSimc_%Z2AbCG0?{~Kq7rN-m zg%pJPScphf@CEu0ShR`@DYz)sg;0ugB~sAqqTu!{&f)Mo95)W{!_se;x=*X}3soCK zBMjWXeAji!ecQQr5aq`71ho66@RoS4(v=Knf`cr{hmKoY8b~BwL9B^`wrjE0)#U@Y z?W&uXdP2QN`}4-wx{3tc&_YR>bYJ2s-AWu1V1=*-At^SxFW!_?Hniq8>Vt%!h@4dx zgLaD!9(g915&l60Qs0832MY`F9dd}#nln!!=M_h3XK7S7o@O2=VCS$ZPFY??OOt6I z=c$o0%b^_P1~|@I>2FeRav)Q|{SvAw=+@h@TW>WV<;>`axUAA#P?|6ZVHbo8d8~F+ zaErywc0Q;;9(ggLrd|lsIMtfD07KgyW^Y*4=ms>%q~RJ2*2iOYoJI-}h(nCroO5Uw7M@Mb z5#Xg`;_9IV2}rp{8J65}mAdYv;`qk2KOPWmG3+1;U&W1Ug?rfZtzT ztcpV|k;R^Dv^{|;hG4X_YPW`s&DZ3na?|$0Dmu0ru$qA}HekI_l0C7NhXXLVZnfE6 zIM=^*9K7G4($%*+napLkq65R9rfX{)N@2|6|KG93wJ1aZ=PqK)Max;x5LZl;d!v)* zhNN-?TnJ}7^>b8Ta)QMtVjoB$OEcxPZR$*$S6)<+67V1`TNh&G`C1VCDB`kRaw6hc zLoT~?UTu1{mWkh<6Mpe!BHt!UBsMCam>$UMmkkM+yd>d7HEW z*MjRDlWsYw<_&#|2MAt`2~`;DHUR|T7&?A5hHID|4q6^l(YY6zTb9w$&WS>uu}zW3 z(-w8lGbQN+V;qDrxq*bfb=JuS`q)d?EW)T9*V}a=`PP6c8yRuCJ3+4Avr+j zwX(&V+ImsMfC(i`FbEWWL!D^l7`q(oxkNJWNb4{|m9DtGykg1R2@?*}Lqx`vE7Ur= z+oBr9rx!B!a=YyTK}%S=pfKFy)^2GB#=OYgi6z*UZsb!vD{Lym3){78_3@6w0KqVr zylX&9EvdV+7BsQq852yIM{Z!ZP1vuOKtGHi(_g8MJ)Kf@f1ApQ0m|ki=2Zw$+Hts| zzFyJ2oTrVlbpQoHzeVlb_tjZRmF4ow`5W4QqP$@@D{R=DHzlp!rlg z&a$5|auz#xv|}q|85`wiP3==sQ>+KpBkd-*fECuoa1k1Q;MoE9_xE@7k7t*z>nU2{NAtR`=32}{;hw!5R9+C^7My4`P(O6 z`^K~X{L1^!eDTYlzKg&s^?~xoM^C*Q{rykvx4!h+_SMh9hi^ag=8Ml6-$CB`?eBi9 z{l<9Z`;UJ5gXitnKl^*!ed7<`{0RKl`_rrDub=$<^Y6X*(qEr@%zXWO?g!s}mP;mlyu?=j6=~f1&=6euRCMdg|%^@jFlc3khp*FaQ7m literal 1805 zcmYk6ImkQ*8HdF#BM}P`Ei|8KFfx3ZYj+M5VUFFokDb}M7Lm+7vpd($?3`Fws1Q^F zf`}*~QHy{UYGsuuMg)a4|K>|Xu!(3Fv=A%(ECk#4<>d!Ip63m+H?jlE_l#|C7Hu4C&%*rpfO?svuF75#vT}c5 z7XfLH`2oG=q6pMC&|1<_)-jBNU8q%yi>sf|*k8iwa43Dv@NZs8=r%!?6ozmNjj||N z*C{p}Aj~@gi`AvUYM9|w1gWKB^|DHPkf<(~K!|D>OE1M4_oMS%4yCW^6E?3Ue(Mw* zk*QH;0w5vJi(U9p6fv~QnU6b6?qj|(94KMRWrg~pUVD_~s_NJv2N&%M!edEDRjoBR z)FYr5RwJrZeGNC#0TU)+RU48$Qo6H(Stx|YWsa!KmMv(*~p)pZnIVhSLv!6?(3)YFWR1Wk((pfTJ# zAh`Opu7P6Mj>@qaC&bA=6!Q zbHj)vI*Uc7vBhnv%`oBNL{!T`T((3tv{gM6S_&Y{qgVR69C^Dv`=dWh``qQL8v`R} z1hNm-Za*t2LJFJ=_rlb;A%}4O!Qs+^qLiHvz&trQXTB{PH0>Vc*}D+4p84v$%>Lt8 z(Te$ut{HnJw{$|_jZ@V#)gw)@*A}ED9DoHK#8>H zQ%v-76AVg9Lde=RsU|_XL?tK5aw`QGW(SXs5p-5JND4x-Cfww)t&0QaZaO5OCPyOS za^(@1Dbqo0PUp%vVls~440*kHA>baz3nouFJMm&(o<=g|HQk7??A*iEM8N!F-flB> z(dL#74|YiewRq_2%?RrYw?)*)4m2n{PN7JXo+v5L+2o9)>5W88N?MvFO*uW@ALn+I$9V_;kK-gp zw_Aj|yMne+(|5|_*V|b;%kpgd%oB~)&cPHbO})wHeF4|FLPkbxtPv(YLSyT+62YA% zURro8=cKma+^W-x+~{K^B!1QzOdQ^}^ncTyyU)5L=#x9@lY0BS4+M+5DP06}$K!Tz zg%KqUZ;H1U2C6PCCv5{r(QU12wa4rG`#U1huqKi<$XQOgIf*krFg1sf8sh45)9`#* zOQLKRY8?Te|M0Wp8?Qd`-x-`Mp=Z zN7um~~K+{N%}xoY%hk-gmHHfAbT+d0Kk;ZQ!5Z_|^3A+%LZU``^C#`q+QQ`{1{J T{uQEr`>)Ub@|lmm@Y(+WLFH&_ diff --git a/secrets/cachix-personal-token.age b/secrets/cachix-personal-token.age index 47cfc3680886f8e8df9738369a6ba0d3f3ec970e..c054a2eec5f61be8b5d47f6ccd6479364d6ffff3 100644 GIT binary patch literal 1966 zcmZ9MOUUd70Y;%vw4tcQ3a<1=&`RTPUXx6+spc_xXEMo5o<2&FNivgU^3LQ@7ZvNu zx+uuSO)V7VUKCxly1cq5fR1#u-_7lOF|;4Hqw3DWpBE~9p?`*T%( zx@uGCiU7Ay-E`gQw(Wu&hz?R_1a?%fCyU`U#BqfN5#tn);&ipu2(j2P9gKFqu+~Uv zf(7Y2B-Z{4j?z?uU6LiNUbWcJ z8*FDZr$}?Fk?pz)aA?F_kJc6uR9YTVoj2fX)2zAj1dFwN7Ac7}z+LSVt?9)*d(|)~ z*dFN1{?)lBf`L8+~h6{t$==tT_a)SvlU58?Qw+2CV5>u1RhNhMl)h z7RGG_s|4IUT0B+IHOetP6cGm}aYwpLC|o3vW6^A4PLdfk)1jmyxSVPgv=4)QLHg&F z%?K-61g+oP7loXborhQFXC^@ndi$DmkY32}R9ojyR07#N(W= z1JFz$yFolH%YcN&)Nw}+>@PKgov;pErG(fXYpUNL5Z>q*k~{H-v7YuLRiGh#rB6Hn zldNQQc?vZ|l?s7VvbEP`h@Q4Hm6ch%E-uK)vXrfz-Z|@>PsS zl#?`$yRFe-;-@g2$1ED5;~tw9re}0hlh4}&m|c!mU=wl;-#DP6i!U>GMLE+f+JcVRaWATZ z<(0;ROC+$m?pGHklEb}*lhA9yqpCUa z>VWM!@=TjYcNdoCY37*L-;Rd6$BPG>!_3D)p*!v%0b!1{n?M8umpC7$2)k2ebq#GPVL>pfkF02AZ`cfN-DWJiIxqV^3bokqUX%Y%a2ZSm9J^Ba-_5v zN<%ql#26Urdc#iB!g17+ADF7#d5Yg>vy1p^63~N6aTTze5nt)!9eiO}l(T7&zo;2F zpLud`wZ#P4Cc+W1fzgSy>Z484##W+j(-s1tBb$~)%}(e%jjoNYoy53o`<{kzdNH|X zcd24YMdSu#nIY5^IXEkNBl7OFD3U>+fX1;CoafkJqEDH8nr3e&II`x7AYwx%R~Ott zMZw*Om$O8lSdT2ueT_B!YNDXDRvMr<8ulr*4GV!}p%ccnpdyCYDcGL5=(yaDo~bSb zhd3}=3VeYq3c78i)boAsEc2WTz>&HyQ~eSPHiDlecg-KNuAiCWxWi18#;#zLe>m9jE7kem0^||pgrjxaPRw{ zxbtxS_>(^Zp7);k>*3W8%dg&h=negmcVGLOTm9+&^Y8iH?&EjvR@Tq5&;IoE>?G5-~-3=j1{q=49(fY-2J^I#fp8YcR z^Eap;0`J04{_3mGKl9E@e|-3r-~aNZFaGo8?RVeNU;oLUqi3J{@ry5z-+TD|KlsOU xSNQM#`~LMN`irOPH$Q*(X86W(@6op(di~q>&0{Zo@~a?3rXTNrXz4$ucw9Gf5^`Hxv;M zRjUZagNI@((u;@opk6%aLAziTEaE}5`ir6m5k)9i1VOyM%R9UmW{2BD6?fNWDC+9b zy33#u0d7BX)A#vp*M~O{6K3lPuursSx1bpwcrmZrEJq@Bqo^&`M5B;Vf^KKsU}jQp z;RL*FG-7>@ZMi7uYI~YN-2@^&1ReLtKy~6nnPeHr2>SGxu<|sfkjf({v5FFZz?~s0 zBZ9Vzwe4%CfYf}xM^q5l)M18j8DE=>biU4gv+DW^rR_Yqg%Y9C&vcFRXhxg)#%bZzJ? zG1(Z+2BhNvYZI6Kx+vH@&qdmd3UC$HP)o$i$`{lm%-LzYWwSGXwO;nghl z$-}ISA+T0p7wq+!?p<>`cdnKluK^}hHl`$KR)YP?>cXKSBn=fWV-?9K4GPL0K`%_7 zfPo4`sB3_1=%?okX?bQxpfoH%$H_n?ftYcP31MvR+eC!N5b;@Pz3TgE6~W>(#U+_F z0CBp~W`*ZVC15b3%MDCHr@ekU(y$GlV7X=kbSGU>#zO*^-Jqe7OGMizQ?XQ(zgB?Z za)c0NX|>`A3e=91%`pvwE=eRV9bm7q-p)1%YsK-V|NYpKx)sC#9yHRfcbF#fR801n zY&_o139DT$gp<_Jo@spTC~2VJgOpxZHoB-o0p?}ui9@$Kjev6KK^4o3GUm=@sS`*D zNz4JBuF;i8mm^9Qf@Hw*D^^k&9Z{??M#`3%KL_%76j^ShUVlJZF8QLHGs_l>hYOX9@5xzK{LzqqZM59 zP_4QUX9`rWl`3^12^gC zqje_OGYUEbJY|M#yISDuad?3&NS^VP z5Uk3}fn@iNaUrRqHDM}&D}h+UXD@d)GLXZA#9hp27ag6qbM85X!SP;A@c@h}q&|YS z1Fn2*M$oBa(J3-^TAT43WUFy|n9O0IJFT%p!)~VNs#}hPrnpUmt-I%#s1Tc4F+$by z6;z7iU|MgBK=aR9ZO&^`jzgwPbimh=N&~aq0d2_fvc#2CHM(}zXUrs#MIl_jIBg{l zZ8iZjE-{Mtmn5fXIUQR5+;buTwsvHBE2jyQ6NeHDzOcBWXI78Xs*2!|qEoY0F(i-g z{`>JEL2(?RZ(49?R?H1q9S`lYWo#A>R#(jLI(IAW=H)Uci82VYxEcimcK8_4fPzOx zjT+0Q-8eY8znXG@VH>hi$Z~*pic2kY`!<3U=k)(J(bZHdyHUNvre5XfoQIU2M3s%N zja9(x?UYw*e#+eZdR=&<-7!1BbGNzfZ`bvj^*z&qJlumAU-SE9>uOFJixcGdc1f&@ z|Jb^u?QXN~5cY?g@CoV3JLg;K=8gujxR!H-D<&2^+s{n9&dwa8W*ky-XvT-VEj-$GH;1dDuFmZPj zQNH5NXzR-mfoq!`Fn#yF*Z-;f@Rc7u@UO=n;qKmjw))1mvfZPP5bbN@~ diff --git a/secrets/cachix.age b/secrets/cachix.age deleted file mode 100644 index 79062e552c630455083595358b0a7b1d65227d48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1101 zcmXw%&CA;a0Ec(*FftkLU9_=LlIdpc#4;=(Ba9!j zy$VMOTeRicoec2xFf73300s~yKxly)2}UqJD#_G!C+6A~NT%4VCTtLP zB3VVSElDr)5NYEZ2(}6n*scP+plNB=YA@-~N!9}@a9Rk@^O3n=QfZ`ZG1Okz79DV2 zo9x2dNd@t&ickp5uxbfRlxj4dTHY8nS1cB}Da$KeOu_}NOV4AqJjr88ipy0**nUz=9KOh* zG!S}yrop2O;R1EHPA63`pV9I*<|`Wxuy_kC)>ET_sEDve6C-Cf31{fJ7IA)I8i>2@ z5E&u04pvYkz+yf&CD=xag5WCUaV|HB4c!38V|mDL#(uXW;(T6e8>|0+$DRvyyKQWD z-B8DIe^)Yk0u(7@lF;V|p>ZifNW*-YbVf+tFDb9&vaBaBDZ5GlBU`~@VO7zzQ0D$L zHMzDyx5xpelEUmrYo^7scg Ue&2iH{OK>>I2QhO?*5T~0hM-%KL7v# diff --git a/secrets/default.nix b/secrets/default.nix index fe62f82..204bc81 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -9,6 +9,7 @@ in "hydra-admin-password.age".publicKeys = [ccr-ssh ccr-gpg mothership]; "hydra-github-token.age".publicKeys = [ccr-ssh ccr-gpg mothership]; "cache-private-key.age".publicKeys = [ccr-ssh ccr-gpg mothership]; + "autistici-password.age".publicKeys = [ccr-ssh ccr-gpg thinkpad]; # WireGuard "thinkpad-wireguard-private-key.age".publicKeys = [ccr-ssh ccr-gpg thinkpad]; diff --git a/secrets/git-workspace-token.age b/secrets/git-workspace-token.age deleted file mode 100644 index c3fdd71..0000000 --- a/secrets/git-workspace-token.age +++ /dev/null @@ -1,20 +0,0 @@ -age-encryption.org/v1 --> ssh-rsa QHr3/A -keGOWcWTGA2ddugZLX3ZXs4V7vsEMYv3SNSFlgvqjiJx0dzUQCCrp5FE2v+uXwjp -MQegxCuveBiHK4ea5eogCt9ZTAzkvbV8J3NAxYqyGs/sOjbArluqUkRzJ+mV1L5f -m9iu5s1eyViesiRT7mt9dI7JvZGfbxbroZcXBDDjxqcbrOyzqhnRhSH4FhYXMITa -63fIeqgXNpdy6XnwFS8q0nQoECboKdWHPRvRJlJ86ysBhI3QwZRwjG+v14XpsE4e -6meFszkX0A+gg//qOe02TTSoMNexupdVj4mSrola5HFkiOfLAJIS+51L+g3Rs7ZN -scvjnxlv7nF/4K/s0ksFs8gpDjWzY0VVdhbY3ZBJQCanF/LBtol/5WttCRHXS+/R -be+Ak/j8NpZJcHgCJkXinA9y0fsEKb2YngX4klnemGQ12an15cfV8B4V1GON1Brz -Bro7Z3cvxaHhXWI3VlsbFXlffJgEz+rF434z9u7mYlCjkt0wJAHMZkBqn/Ecu7wE -6b4qrmI3VdsDCNp4fMVLvgfdAyzl5kfzqDPJRKBhXYyO51dK6wKy3j4hT5v4ahyK -2TpRwVebmrmE2jIEU+X0QX4mw76f5oZ0AArUO1XZT2oiT7bW0MFWiqT526xok7sa -ZPZZTEMeuNNn7GQscknt3mTYfrwSPwCNH5YcTXUsINc --> ssh-ed25519 zco92w YYlPbyyNNzbqwHrvB4K/S6pSXF19FgBMLa7YPwLURlA -1lAiYKEGBuPeNEpE75tcrsf6mzTj0UB+rH15L2LfeN8 --> s)xdR|-grease M -uVmULVxzGAPmPwQyi+DMLt9YXIhj5nLW6ox/cDQiJ0r9P1KecouXQPU ---- MU/ggSTGHLbNDds2mBqI99xf68ab3vI5C3r8wZFhNMM -]F=w01SS7ftR9_zV -KaWy?8a F!nC(k&'Q~X \ No newline at end of file diff --git a/secrets/git-workspace-tokens.age b/secrets/git-workspace-tokens.age index de7703d0beb683abfc2edc1e1b2777c899259058..d1de62c1bb7bda5f53637105a0c76ef3f9849512 100644 GIT binary patch literal 1862 zcmZ9Mxy!@|0mUsPY$rBWpNpUpK66YmNkCnbOz!(WiiJ!j_c4=ea%`uFU?m9RDk5Hs z&HfeIXk}w#=OS2%g{_63g|Jw@>IaYCdr6VKW_>#DkGZ<{U%QV5^hAKyZ@x@Z`8rO? z3q&UcvjQg7T^xB17$4i?wA~b+8tjK=M+>3N2zL|iZewzAq}FIg-yO}q$0F&k-jiw+ zg5*j--@wU#CzLQ?3($QMQ7;d3FF3 z51?fX;JV4IF15l6U6(Vt@!AvN5!tpFxUNjAyblMBam9tO$O2c)B5uq_KLvGjg{E8Hu$USVysLii&M}^qDZRafxWtgJpwlLq*Q=e$(6LEh?k;G ztQ{0F^70Z%0Y_|sAL2C+dOwNg_>-ylh?q?OPJAm4FbsdR;#A#iR;oK@&>87jT+8) zl5%dXm=nt_PN?=ltr@V<+K9t1l$F)stCCb z-p=>o+(lRJLTo!~YM=Jl62}un1HBlyvu#xUw#C;nLsm*>NwV#bLrUMWZpFnyDp0G_ zXMbIoQ4(vP?L~w+xXx&y45+x6QZ~y87UWz-+!{fy@i@4_%13Few-ExT_R@(vL#Cc` z+^qN_+=n~Hhj-69tQGe!ntGXl#j5#s(ay$jBgLA<;#`b6T~QWutA}9sb5k7}l|MOWtf+#BzxB&b)D<-P zqt0|30{GBf^0heUQB9p)6TCvKI{8?UrF?%GFH^pO6(DXqR1Pb%VGU#qE z={hi-9^z1WHuV$*Ug%tJ2vR~~hV%dbR0L>iJZldT40@ zbslUqL9?P+vLcfZ^J1hG_T<}W;yB`1V|Whw^NQ{)8Wzr#*0sb9bug_d++N8p2229y z8$XKDeW69rA-$^+$y^+*TPcwZD(S@D+uD`{OZ3d2QIzE=$FWC==C_fH!WBr&pj6#R zd0xYGKeY%IU!G>-hc|KH3wpxaSlSkm;Rt&DpU2q^#c_ms89>kM>6gyuIcnqKBE0xP zl5Oi`2MpV8BDcuWQ4i6{#rxy%)ZGGxpe7!Ab#tClU_8&t+xD3d9^;v&woSjd-Xmxy zs)df7{(qX_YpPYeB=u9uw3O=ToJg1_TQ;;%dQK%AhHNxM^sHXnbM@w4Rg^ionkHaYQX=cz55lI=egN$+13QsY ze3F(b8TyA;u-!E;0*dIwLDM3fLkc7UUSD5dwA{B$#9mRde1t*9ANuau!~W2CqLqs| zY^8mejsCj6Rry^}`5p9|_rCc4XFmJk%db9u_kHK9_&ezVHj-pSPd<_V3^S+xSb!{&V%$A9UaP9{ZPX Jy!R)L_zx<~ZvOxP literal 1839 zcmYk6Im`730foWoVmY?TJH=oT-pQWaScuv8XhVS4@4qZd^Exl- z3&f-~`v5{Yz#*7iS-%xAcPUhE;Z5e0n1{YLzGh9HNbxj6jyeP7bLu}Z>pbcZ7u??D z6!!rIE+?;Vdxh#V2yPPrCh3Zauy~{4|&B9;zc5 z$Xm@cI-NI!QmQI4-dk0g(={};*6z7oO?ox&CdpA^NI;f^t{H&?mqLgxZaH|959F}Z zS@NV+ds>6w;}FV8s^W#1`N=nlHUyK~2h*+dZrfS12HM~``mTV_i$G&_0wA}G-g+b&AS}At z*K3|u{+7pH!}d@kC52^qxXDCIIcsffw#32Aw}){HYREb^D&hb;okh!IHQhmVk3wvr z)_Kh=!E=7G>wqqcy0x{CTGedUk9dM{))BBz+2 z!ui0kMmIRqJewD8lI8j2fQ0PWC^a#(aIIv955@%mxeL3cE8|F*n?BoHNOJz&1TBwa zn0#GpbyY+u-O?xa_^}5ut_P5DnA);qE69%ZaeAE$2yHO*rEw zty@QbOi7V$+9-G~_O(-E8wFgAl=KJT`cDx~M{{J7%hBXRaZ$M@I^`OdCS8RKmTmhXPBp@boDd;U{g9DJ%9xzIdEbwF^`Q)1O>2xp#jVYUN_Qmd;=D}a}X6;8tNoWg$b*87u z8VVt5f6^5YOZZSDqbs>7b}F8yn$r8Gp5;juyXKfGgHVaun*6R3YwZSN$-S!=8xMCg zzFtw;1egi8BO6<_z+QqoL&|7}i1BcrAJ@T4Llnmv z)Ovgk%8h;!LF;7!dA@UsaP9fq88S82hbYW{Ua~4tK{Az+`|-@5MpP4LJdk@0z>jkB zVGsqYc{MJLdOi9}-S5%h!bdijr8_;e^LF%CSoxacvOoy}pQhsdn4X+|L?#5^V9eK&wup8zpa0;@LzoXq4Lo;e(?UslFEOjfBxI=0^1iK|Mkxw{ONmT r_tlqQy!#3N$*;Y4yzoae{-t97<=ez>zWLctfB&=ZeE6>U)u;aflt*Ar diff --git a/secrets/hydra-admin-password.age b/secrets/hydra-admin-password.age index cbd768c..c43f481 100644 --- a/secrets/hydra-admin-password.age +++ b/secrets/hydra-admin-password.age @@ -1,32 +1,32 @@ age-encryption.org/v1 -> ssh-rsa /AagBw -MsGA8REbYjo3l2mHo4Gi71x0qgZf5811+/x/is5BAjJj6/U15il4rs7zr9D8XucS -pXHdDxCf+/M+M19WG1ch0rzqx8rvERCshFg8NJ8THac/bgeppVhFVkWvOTSw5naj -xRIJWlDrllUGY7JHeo07TyUGM9RSyr0lYW8biGQYjmVl6cWidN8vss5chOyOP5wb -vy7BPMjBhaXsByu7Qf8CKQQkPynWFrchoJIPPpZXPmWm+EpG88e4CjVm7KlDHhnj -lW4O/3GKJ4tN2xfIJoSRLCqd6KNXxCy6SSxuDKuhuV01Sy3tsnsT++1HeoVP6OoO -o9ymDqD0+tlMPqfJpGyHpPvqR1vXNqrtUo8FbTjfH4eYS3F6EVxitreQZgT1jkVV -hixwr/5X1WS1WEzMPPACyIp60cnI1t5KD3kDVWxAqTa4W/q54AnEGB9AViivCK46 -JkoHqEG8deH0FAcAsUn8R0URiAB+rtB91apcTkjOuOZnU6k76rOZhzr9aeWpe/Td -FMnN/Ywsjz19lm6OWbR/rpGLGCBswgqSV3mho/xH+bfhKLmimhAi1tGKLI0hqXWW -6r5Bb4e3qhyjkgWGiV3iKBaqq2BqR4PpmiipS5VobDQ+Wpn8WB5d3h5MfW/PvkdH -nxaF0EQx+Xd+XFeOt8aMSs/yMfia2pfr8CuLSQO35Jg +bPD7pqnDI+Kl4ywyWsk/Li6wZShB8NgVG5BLNp1b2/hHgisR8ZLCR4UYSIcGJ4G8 +hakiLWQy5xXVJ+Aq/vEBJnFYXxr6OKcHpSnhxaBENuYBKSTnEyH423IEuQJDmf7B +Inj8fic37q6k+O4XHypBqWJp6mmXJfCX0P0/jJUn81n95Z4Qs2FOlDXaX4fuA6Z3 +VStSP5D7iyK0iAAVDrFzBLhSnwkko0/fQl3/0hQiFBREgAJIL+ucgJXJENhCsQUZ +uFP1vtpX99b84vCRgp6PJI+8wBd56BYbCTAIKkGoqMPQHEiNMhkSxcEGCoBjn4V/ +A0EJZ2Xv0nxtXJH3je9Hew+N9Twf03vMcJk6kgH53bkpCj2dNQWHrSRg2ARlgeZU +GjWE4Vlm1frqNz1Mtm1XTrR9D0tmE/hfq+Do0YziLrf+NGYLoewES18qhwz8gaN/ +gtxko4/HTD6g0l0J9v0p2LXKGVSamy1EdyVCQT4FG80yGa7aF4qQXSLeZwggO8cv +t5Q1iRe1eneUEJZuxEFTrpiI4aDazo69dQq9o7pXrdOk2s5yb/woKshjw7JILehy +tqvEIRNQkYiYbC7NSFILgarmy7zIXEB5L+UVMMZYknMdLXR/f3ZKQTbc9IH9m08T +sM5JLtcvsi76x3fXUviejCIBpUZ1slXd0TKTMDcc59k -> ssh-rsa QHr3/A -JXMKby4Kmsj85jtLZOiYgm7kohB+fVKgu+kHskK5/G7NoxBboOQZSEi7/w1Y1aGX -RfT861unu++upcimZOMLvHn2AX81HNqIQzDg5jK+RYja32fZbxCcEsoOoysdp3yD -AjPlsdx/WhsSc2qNgGqhNrB9xyDG/NS3mNVEnHHy2z+3J3VHzjmTho8SU7U8p/tA -NLVqaSvJWLl6TJ4+9YMyebQ0MXctDes7V2+UA3Wpq8vUmscBYkwcuJpLMfHnQuKn -0iaN2fn1+bwK0u4J/1CoMddyzrGL9cd3K00Auf4eRzOC9k7W01RezLwVkJb9RQxD -TZZsuHWaYhghOQaiubiebk/fyhkKNNsxgD3nwMlAn/TQzLy6NBBrrYHSKH1LkKBl -wEW6puPXmG5NA/0lNuzZLT4D7ccNwTR9bTF/q3Jyxmkxq3lqE7ftv1Bd1Tt8DtJt -z8kSKH5ADE1YL9cHtuSuNXJIYuMHmG+Q2eBSONi6nQtzaRB8uF/9Rzgj5EOIVhx/ -C0LtRU853rydEBtQR8I1Q4iu4EUXs61GTPoNvG35I61PJSK4uoNedUmk7uV2lAei -RrIx8RN3sxwoVTnL4FULCWq+PemfrELTTYsLL3IFFbfBBwAlu5+UEJXpH/NIe0O+ -HwyhBp6UeTetc/pKG736MIbkT6i+a7vVLL0NUy8fJTE --> ssh-ed25519 q+UPnA wo5ccVlqztN/oNcgzw1n/0HwxsEtnOf5k+9/CdhxCgc -aVWZ4xQTzZ5BECdxxvdSXocJU/gI1zAzPiYfHwviiuU --> o2U<(k-grease @Hc&{PY -jlFeYSSSVqxHuELmo63p24S7YFa8SyoyAqRMiSNcSk08rbegyZqHudEJ00ttF2Zn -VWapzrVLWJp52ri2sEd+YeeDnx/XnFlZ8dU ---- 0V0dvEHBKMe0sbWmanCZj4akBUK8Lwj+/kga2Tleto4 -`Ԙ.@$-gD<+iYf ċrM%M \ No newline at end of file +YBeZ2VtymMZ9sXKcKWj1JsWpyCuERj0WXzHNZaMsgIMsmIkM44DFxIc2V1XeDehA +m2OTKCxr3C8hHbhWJAzBqFG7ff2sU1mG0W9iH902hHCDcyOX0cbfsludEQg/cuWH +elbQ7QN+RUysIP8o1fUP4sM1HcZ1ASfarw0bUhiTLvjecFGjEQzS1vGrd7YLqVbx +BtjijHEdgpfQMbqCsy7ItMRwWCo4Ip76eSArJXOFnwW5NkMU7wmGTfknlH3Sej9R +u36+mRY4I1I37JcUK4amjvp+w8thVcN/KsnHgY/6OVZjefLXPxj3i2cQNvB4phqk +MifWKCTeSj94RFITKh28fUttrVHpOHdTMQb1wxCzAUBE96crHuUGayPTvzSA9xbN +UZqLaeshzE3b60cxxnum5swQ2kYuCx64XB9EzNdscRfPka0Ch4GqO54FlZ40lbL6 +6dH9ybERJZHVltfCSQD+jvJ+vNSbMyfzwrw6mh5ulJh1K1jhAl7Osa1te5RxXz0Z +DHv7QvV/X4DYR5O3duguLWCGCx9l1dTKK0VdhgfZ2AWJKn73T7cH3H1tBNQOq90c +OjJih29oXR6utbjwZh2lweALb0P/3WRnqw82xNUL0YYE7gBjRZh95ZV5vAJANsUH +/3oTkkDBWstKByx4Q0H0XZobLR5DNjjcofnAXGv7hRE +-> ssh-ed25519 q+UPnA fO2bIKiRceIJfdFCaN4kjFm6JFpW28JlmXGcEDDSYH8 +S5a6wZlQzRTjEJjIcEaZGgLLnjET1k6rVy+iJiHZpsk +-> >SJD;-u-grease voi9 @}?,:! +il9bZwB5V7+rTG9P7qmjnz0woAYWxHMZQM9IqQA9FANmANoGziGgUqi8Jm9gIlfz +Z6oK6WcgBAuUk+aL8/kkc1rnbQ +--- b4DsGZVXpyCXbcswON9xWzMtlVwNlDmz8A23/19Q4y0 +"N, Jc?&!`cl#nRg \ No newline at end of file diff --git a/secrets/hydra-github-token.age b/secrets/hydra-github-token.age index a227e06e3890ecc6aa43201e8948b3467eb9e710..4c8c50af8b98fd02fce577f32e5e94e0645dee3e 100644 GIT binary patch literal 1815 zcmYk6xyw8U0YEK+!W3Gh(#8*zpbTGTXXn~Y@e6bB+{ez$&W;M1``o#2Ed;@If`v^$ zND-1C1iOgX`45QLSfsEK!9qm*X%od*2=)(N^LTz5KgV_0Z|#^j_3KTaLNg3Jzjzvk z?71KOCy4Y@Y604F-J1}S`_p1t#1)wYPR|C@yB!j!ZD=?R9wbPtSc{dEHHK-G@p06i z_#(MFcHY`RT;_Vz#>5C&$Po-FO{BGMA+HtlSdi;Vi#_z<_P#u~Fq0s4sf~q$6Zwg4 z75CsE4}j?C({a)L#28s%QM@97~*4O z{LnN&B9)mUu6%URiX@S*uH_*nym5M4r&3&-Fp06Z+e8111940tH#5um2PoX+aGwpK z0R~GR%V1qC^1zE85^~hTRK`WZIb%iO%4;kPVd;Av*tjR=g+RL-LXfe>>w8@BK)lPoX*NA|M^ zo+C3wvYTK`8RjWnIU~|NHPDwYf}9MYluLA!Vf+j+>ALl$pd~7jjhbqrQj6&(K%R1RpaT(GJEtg> z%xge+9>D}PhHRABz{o*4^36Ud?xu0{%_Yu|(uKT8Lq}16aKOf+hC@ZCX+|%)n6f65 z)!O~cY5M|!x`?3Rrjj<-y$YH+mJLXS=%3#1J*hM zqqceaW;TPm=V_1ZAn#5jxa}hzBDG2>nV8XzK-I)DgkUT^5d^f+Y6Vi<1Ag)~&S6Eiur`R#$^Okk>;00|c4`eT+1NC^*m zJ*Pm?sCu$A^UB~^lk|#ouQ*6Z;fA%~4%_aq*czpQSZXxOfns$tTOK z)-Je90*ae;FEuLIB8%2bU6>myF3?l+KBs-`5AoA$Ge*AljjugDC-!&MHAaA@!nsYl6=pK=#gw9W z-%-pygf(Sf4Q(?=)q<|{T;-XkWUhwTCe@^mXwLYNq|yoju-W?Tt^++|ekbrN$)R>{ z8W)W&QQ-Oc`Ki{j;O+{lCd=v0=<}oT)YMFagWW|3{T8G~7UP~QDlH29o_$B6p?|tPzqpM~E literal 1863 zcmYk5xy$?r0fs9P!Ep2;0S%zY=5bCTIzEVghP!A9&9 z#G|zkgvHWMM6lRK&}~FP1S<=73qK3Nzu>)|H_X%Lw2R06HkW<(wSLT@6#<^#ewwD@ zd7Q#0hz@h+4%pZZK7#EW%=*N`)q;wic8bt-iy2V}$NOXV8F`CXs24fo0GCv{8BubX zC#bPFQ(b|&>Yd9aX2+=Yh*22G*7b2S5h`+b$`Gop7CecJBd(XS^5jmCkCQtKg51wp zEOcW7jGKfeL%XSmIRRai=eNE&KL|ZhH_X~9jTXAQGArES%%}NOw2qcgq|-wjoa<1K z$AHFMwi{HcL(HdP-g4@tMTNeLN{t>W#7zQ0lPbb*Tq$L{r4}uj(vevUaI2C@$7lf} zxmUU^2wBChtSsM;99Ce(HRw1dobf`>ltjIGLF7T(U|9M{E}Z?KMM>~wWXQG*c<5^n z*{OJ_+-xPYh3i`6-np_}jlLon*o$fR&T9)}a;w<0!_E)n)<}>sl1GKGIbckya9X6D zDfR;_g$}8lY=j$1aOsGBXpr!XK179ejd3{n3`F1u(2^Hf3r}(zubm0dV)F>e1q&`D zjvnk7X9LilDm8`c3ffRH@1!BMzsJ~?r^ z=fqHyYE5Z(^EO{W=CtVa)>b3z+ZW&TXf0n-gv&Lh;B@H@9V!5xJ8BV_pm-P@t#;;7 zdBK8EIh}_+i>lUZ=Vfka%Yr7`>P}8@BjC zWqBc(3rNB%=tjw95TKq};q1|LuR0*hDq;I8JcBs7j*9|!lUla-${JaTOHP?f8D$>W z(kW~L4qFax7$Im0p4C!>e55o0Dh|C6TEST-%VN+>k7JWZyNM=&t6Nb=hcr?wK|dZZ zbWozV$mx8>3XX_>tnUZYU4XN8jaF-n9$9_E-G=bJ=5Wb08sY}BM8mLl8T~vtjf_xQ z+~wP1+|Wrsf!9Z3n^froM>4zTgO`OD>me(WSH?YG3;a!=L4B}{N3y#!nUl-8;gg=b zs32`6Cg1x#q1rNi833%9uXMli4t9uKVWkM39b7ciPOXRdd3CG331rQOLLR-Nuu6qg zQg%sV(SS}xZR9gBf%EC1_h8cW)*Ml^W4Y!s;S=aL(aVLR*&Yb3OnK;nux z$x9pdH3ZtK-)FGDkIns#BRd;o0 zK6%x;O!gibtb^76RfEVki39hXk7+oiPtZ4mcOn{pDz8uAm*0B#E6vvdXC1~6t!=CK z5pCEyFQFpHhL0|fu1euZS0lb7TyMJPdq=RrE+gShxDHPs#S72ui?^**Xqqt3k| zE!~aW=`OF`ev2GA)Ji*+xIK1^h*)+iwhLk{E@+weL@x9szK1|oAA#rR=cf`TZ}9kt zSgwOSIBKr>Ss>#b*37k%F3VD}T#?U&L|tj%qXqoJSO2BI_T3M^^p`)r|H1b@{1N!d z{Kp?&eaHFW*T4GnPbdFd?;j`SGoLJ$jQ7g&w}1NV$KU>$@wwN3p8Vc< i^}CP%E&S&DZ~ow~|NP ssh-rsa /AagBw -DbkYMdbPgGfDlXVKwmSROU5QUy+vdI5touz9rl1cDctmw3FV8pnPst2P0m2YEC1h -538Yax6rLOGO8R2vbs2d/cPVon0cvSlGxfcHCT0C3xqM+fiWCUGJEK3Ry824IhGo -qq/USK7JckPYhMDy300Ko2bml9Jh2CojyLSy8TpIb7LBhD8Jdb9qg6PRJs6Hxewl -dyMqLhvbgK8iYjPEFPLDhfB3usux6fqo5KX1ZyyMbQsOvmQfYYp9UfpOTDPcLyS3 -lIiIBmKY3JSDLeRYWLwI+rTRT6u+rKo0oQ8f1Iy+Q05HEsM4eUZEJOqvezPTmseL -xyFa8UVkv4p7xAWe7x9i2Ne0bEW16h//Ve6/NWZDfcGHpB9SzhEYdVV/8ibzPfip -7x852jBYVKsjHOSRlgug5SUPthSs1thWZkvPHAJlyX1jEiJNzg57PGy8bmCvQtcH -4DAqyKBxEH1pf4gocEU+KcpJQAXjU7job3FHalrU76oAO44s1aK18y02yJnLGDQq -JLe+5RHXXmOicZVZjC8T2eRVBzsXg8tEdGqZtg/umZeCSoCDTH1jJu5Q7Z8OaOp5 -jlEesAMJBVlqKcsC4obYjSRmltD0vYhz+LvnKRLhm5L1FhR2dwac7K9PHs31oBoe -aOwZ6VML2iVzTHHVSU0xEZ+m7SMket7mx5+cqmpzc10 +UaDkuyzSSVgiuntPlEFp+73LDf5zeSi0B/GxTllWFZsz5d2KW/2IXcjxibtU7BP+ +rngcpNSnbaeOiwvbhuefFPWs+zUrpvnCTHJMIz4x3wwNnDmof+8E3YG5mwxaKRhc +Kp8aoecGTehwG6SO0jzZNEauiIZadqtJoRptzaz1OmWF8FZpE/vgapv8H+RJ4Y1h +Ibqb2v3i5dLl6bqcAt42HqVMioLteIMgElOWzt6ew5qiN864SESrv/XiBz2unGa8 +3ybINsxt1TYQmf9dTdM80IWAxg5e0ncnXlK/9d73/ZCSyROqo5MawsOX/Z4B46Hi +E4p0IuB1up/OD/KbfswVXapVcCWDxoQN9ww7P1+ai9fIhQLBrsIseDWduq7PNf0d +z8bO1sIOOVV5dYiZqLzc7nd3QeZFq0XNOvI65dMaoG+jsWsrGgH5Wv15rTkvWjUV +2KmJSmt3HVE6lvDEgKkAv/e5fJ8Fnx8CSE4tF8eANokVrl/c2868gK3v/q9pIf+6 +ZQNsy65gRjggy2GZoEBUgjFvCQSMcovMJjTlIW4k/JejxQ8FVOALeaylHT4vhkHU +mSjKMLeu1heXdbwz5DMaa18eH8jfeSa7njdhjcju08S9JZWQuG8m9X2FYE0DCxfJ +NOdToAN+mXNQfhUNHTyEwIlhpTxQOTG04xW0dkPayyo -> ssh-rsa QHr3/A -XmQEkYfvXncYfpaqykzISiTHH6hvHJf96auW1sktUG8EjGxJZNgLVNc2jOk2PVH1 -PjgoVe4R3OKwgboRDPh/x0zUvPAVXEBE0jZzk9ztzSmdUKZJl83iL4Yp9R9Fp2lR -jyAnaKHgbc/nDMs9USleRS51HQPEHQQuUtsSoL8bikQ6fRvTCHwiQ9Sw3lbS5R0Y -idCv5AKIxEj6yNrd+o4LOP2bD1jF2omIUMPX2wlO6EDvgcPT/cbG+WAMl0TrwWx6 -Zbyrnpg2nLwbhnPTO9yoIOR24vu+6+2JKNu8P/qRqQKB/GUES21FRBrJdv7J71rm -d3/GGHogsNKzyzQDpDN7NsFNu2vxyJUyzfBnnMkLibkaAuGOMam/hGHePH+UiGGY -AywMShzHX83yV9Gx0L/AUqiXuYqienPhxEvVF2zBGN+ewGHUt0MuBul6eWY9T5lb -VMnwXc244IgbOKRWkU5/CZkahHHX+btsXmbu/9xMP1iyHnyoFOUqauThDrbs3Lol -DH0fm7xe4aRfGxHVqblO7LbDyOb5Elj2UGfW67ep0xiXwO3A4bM5XFrFGMDUOSlJ -0cHXRnqlE1H4KG9a9VWchOohIv1uEIocm5W5XB9qAd4Pgg3QMwV/xoyXEHB9cR6p -EchARc9SUZxxH5upbp82BYY1XZTPMbT+pLajTHPjiw8 --> ssh-ed25519 q+UPnA FWQNRXVrs2TlKV45LYSDzxcmUgjs7Qo4cyAb6onSNCM -xkeeCDpbGT8jrnWNEt5E4ROUs45+dbuDd3Dgr9uyqBk --> ssh-ed25519 GVMLQg cCpgk4KfQjC9Z3gZ96WZiTRo2vnxa+qzTpD53aNYEHI -nQRe2pxNHdp4OUcCsJQCcXkczttUhca21vUG4tar2e4 --> rlWXWhU|-grease ; -K66M60IV1KtnNp2ZY1xQpsci3Tu744C7GotEC2ObSDkSCvQ5HHeGwgCHKkkYguOU -YHKt5DUc0Ww ---- Q22uazEiOR61ZC/BLfptzDRsmbACcMX6DTxZTt2+dXU -˿73Fmb$&6|b_-J\3򛈊+;q*]6} ! \ No newline at end of file +PVTZJqeRsm9/zMD/sGiTlMTC0pdVU6A8h0GHEiNVuTNcaDlPclGBEXC63+8PkWs1 +TNicNG3lN/58PMO9dLlxmcZi5TSXK42enLe6Ts0KB7Ulivi6BhQEvUumMvzNXWSr +VzKj6WDcRjn/En/z+sDScVxgDy374wGFn2/fzhgmwH+jfwae/+XZgFZtuHKkXLRC +oW5Fb75hGI9nMsabNuSjJWQN8lf3Wdc6GnVFDHkbPtDBEC0z/YXjRLVb7qS31JBs +37IH3m1UsDbv4IggWaQppSFn6+ngE4g2U1/1lnVYxu3WzcKOaabmbVjg90marTFi +F/QGfdXNmqixkuXOtXGUWIktu1eIIt5b9RmSvCzHOacLq5ougMkXYrGZKyLFClyE +pSVufiJGVe4oiFxIPBebyjg2YgPz5oRu/I8McTUlzwuUM+yUzSGAVIqPqQMKR5tb +6Yit6XTwOAN/rMzV7d172HC7mtdfCY+FRXeMURiiBNTmsN/gCGusJIFEeFNU0UuB +6A89l+uUjMQNuvNnKCHhWiSA9Y9DvmOgnmqiUMyEs//qHWC1FbwRBOfIUhKkC8Np +vJX4QDjTENOyqbGwAjqkl7Iv2Xcp/d6rgzw5Ej59B9kM5nEMVB3y1ytKegnSMU+m +KXWnoFjM+pFyNF2W+wOyArwbFj+PPTZGluINQcd1ohA +-> ssh-ed25519 q+UPnA FrsFa8oY8+T2dvMQ8/V77JrVUAeg9O3DpDnHqXfwLgY +7yV5+bjmP1B02/jHRU+s4riDVRE7y42czST1gytMOzg +-> ssh-ed25519 GVMLQg MzINbCmllcxECodOE42h6BL2zf0b3/EfzTE+r/34cwI +QleTPo6m3A2H6dXZ+Ld2GkOPN7GlO1IQ/xswgLfo82E +-> wQD-grease ;Xo|;~ +tvXwTNGZyZV8E8uv/CsEpPyO9aEH892yTtZJbPeY+4PAmoSSdF5t3VoURPqsUSOQ +2Uf4wHLYxwORBel7VZdOK3o4Ei/v +--- csL31FT+UPoGFA9GFYtjRZLcFlG9m+Cti42Z3wLL4kg +C,sY&gQtU~~ZF؈NkT q+ZEؔ0U= +m~v \ No newline at end of file diff --git a/secrets/mothership-wireguard-private-key.age b/secrets/mothership-wireguard-private-key.age index d297b2a..4a561ac 100644 --- a/secrets/mothership-wireguard-private-key.age +++ b/secrets/mothership-wireguard-private-key.age @@ -1,32 +1,32 @@ age-encryption.org/v1 -> ssh-rsa /AagBw -m5zNTTFAfMg/uFR6K5ZQLzUtCHPaCJBGx5Fl1EncRjSCKWrDVfypBewDh14Dd+j7 -mpzMw+60TLadMEBILbPMVP5Re9v62hWHfhaOuYRW4et1MEk6syd2Dciw72jW2Xb9 -ZZRy+zPjh8CulwZY5NM1beJ84DUJvQ0x/RMxmTciZ7COPNMKETLvaAwfUq1Ij4gR -enX8DVeB6SQaXfy1S91vrtuINBIY+/XIvH+dgbFtxeBvt3eethmFWu845aDFqUjj -85qEIxTwYb4qAtIxrBcf5rFfAFd27wg05NzH8qWoGS/hIAv+pCbKSJSx2F+BaWys -qh04JuSu0y2mIXxVikM85T9kMGRf5YXEDUKmfvgtOlYFgfiYSss12GBy6ed3AcBw -41nndgcT6ok1cKQF7M63CQoTWYev32KDnW2Nogm6vWBQBRs48mbj6rDxwNeAv7/W -6Zy2mcsTMcioJv+tCh6e15qbOz82KCzbn58q0eFKiG6OdjgbiPQ0nuBeuUStso5d -FqOFQ+WgCkQ9VtOmkjXG40Rsxp7/HjDSxUBmYpVdXscKD5fmDX5aUXIn0rW4MCO1 -ya/3RGHu5FHXwTM9/O/5oWRf9dvimEPQRhP+19Xz2U7Rh76lKfBg3CyjduQ9zZ60 -zTk2UgW6F4KcE+68/CjK5M2oKVYRYGDUYMRcVfFnO14 +mRCs3tCcRldQwQRKLfZ38ytXhqFInt2t8T39fvYqQHY5OUMjp3QmqUl+PLwN1ii0 +wl617MrFyXCVaAVNJjTxsEFg0ClhAqiXKQ1RbU17KgA8iNrTnZUnTeVvK5BI2cEs +92nOxFSxnhagX16IMPESia3M/uk+XDAFJZA4fPGa8ihwoxtCdTGeJKqSyl2++bP+ +/g+6cqt6mz4DGScOTwYN1dQHAVOvFmx+st1/a84LCFjCT2a9qb0XUfAP2EOO8Ylc +TWlfxSz3Z/8xlrIllm6wvTJlt8KZtT3r87O7KiiCzjAhzhkfwWPlhl6r5xSkV7yA +YdgLBTv+8tllcOYPk4W7UYrCFJpz31DyoifV+mAVQsETm2HnC6/i5EIawHOcr8qU +0PMYKqo6np0fBnRbBAzhf65mp72uIqzBtC43Sg3//ZE6wLB8zzQTfjPQc8E0Eu2B +eKFzdVlIa0seGeAl0DF25QxbLDyKbmBwW7/j0ITSsJAA5ls99x3C/Y8s12HSkbia +Ogbx/6NahlVX/2raRNz0cSggYVUZ9/oDPhkq0jFAN6bRjq8MpbQ48QIbMSpxL3dO +6jlfh8pbsbpgvUUpqb20/mh7J0h1zKze8682anrt+0aGIzV8oeNxAiMI9DQk+jc2 +eOQfJol2Ah3xeJaLF4JM2YweGQwdM0zwRtGSByv4S3c -> ssh-rsa QHr3/A -IEeaxqUUPfpcKJmzSySq2382mw2dhg5zzzGyDuM6yccWohG9Mh1xok9+im8/7wv1 -rosxC9NDAo0V0FSrwJd3nzm6JiNAHY1Q2ctLLSZn8UmNPbAqh/mDIFF+8gzArJfJ -yeKR3gZ3w1OBtL1QP2YPvrRJA4sa8qifbqyRnSxQEScsS8xipq/XRFuBJvs5nJgp -lHrJL60aLRFKbdgXfrpxvSyrxpzXVP8sNZmCYVLwyKlbTOx8CeC19ZMTNioOcLI+ -n6Q8d8Iozj6wnCBcaVLzPl37klF7CHrOpmYfGtJpRjx/A/Up4IzcYmV1kENkrC53 -v+WkBrVNw1C0vpqrMbUwEqu6KhFDmrRCJC/Dit/ydVwcqC7Xlk3MEFvrjvcomh8m -Lg9P+jGOHwfWEETSDbnPwygfa0zBli0NdIw/2XoqrIKGplgoCZB0UkgsiwrRyErs -Ux2U3q9JaXcvjodqSqClxTJk6BWUfo4pevNR+GYz+yoLMaCHrYZ/r/6huUbcDwru -sC6+g00S32gqqlk3uh3UzOEOBgroOqW+T4hxOc7/jMVpCdEgjCH8Z0UcKmXhUJJj -dlVH/L8Xm8JgwspMBhMBEgYGrn4qH+uWEHa8d81MBQ3GSWQQP5Q/EuBwPHxHdH2j -ZveRsxZzMljORVRKyHHqdRwQZLW529ANmv8xUt+cmjg --> ssh-ed25519 q+UPnA KCDnZWCLKS7DRiUFi8uPJgSme9dUtNl6yT6ImKlSa2k -A2/mcyY8ZnIOd9z1XMXxCkW31P/A6vnmD0rx7DjNDK4 --> h%z,g.-grease qR*Jt6' C8Y m9CB -rZ28gnIQ06Bz3DluA24+zTNAwbD437Sv4kXKb8+VLveQ/J0c95a58qMOwrgyUUe0 -CLAJ28w ---- clHOA1nUvcyaz6oaKcHx2kjLlCxpCDn32QmGZgGZOtM -Uܪѯ!Ae_/W LQ{LDc~#'#'f>5`G]tj鈮bB*.q.H4 \ No newline at end of file +LjLsLelv0l7opuosBIQhuAfDbOHAIzs2sUGBz1ugargI1i7/pwWq79hyE1Yw2Zcg +MoM5vIw+P4s4IivOqeI9b05rABGnfTz6WpLra28m9+PfhfCKGEWZNmdrpZdPHddy +DqnpI7uY3SHbepU5aJ8DIoK78D8j6yPMzb4Xfb+bKuPTp+k3TAPPdLj/WMe9bNcg +Xdqvi9eW+/YhXQEjYUwOsVR/Dqx6hT6EA/xm2wOgylz+nh3gCqsGY1Jawf+jaloY +DpUk5ANNpTgFxLTpxeFrRyU5Sr73d/m3tUk8+5oKvM+oreSgmsKP/MrOCEo45q39 +59hHXZcApIYel7/L/XZUG/iEgs+Q0rjY0C5DkhmfX9k17nvKMaRD/8JqQeHiy1XJ +tluGUgPigA1XEzaUACVFDLp4H/mPxAXrwpw59mb4/2BXXjbELZ5nL+XAUiHroBiV +rx+asjfRNYRmI1hSc+IKTsdOLNgclyjCSSMYCeUdLlJv0cMZUNbt3EgsFDaOZWrH +SZoeKv0EwaNQO13L33UWByLIdrEc2oRkFviSMU5khYOuT6L1UmPquiwSTm0bbnKO +kLRwUk1Z8BYU74SwPzyBUMpjvmRZ0OD0Lqy1ZrBqh7G27Ed82zr0YrtCN+rs0q0A +gOgcVBU9kNNXb9wCM8Wu/wrZSKJiyVI17SOpiL5nJUA +-> ssh-ed25519 q+UPnA SKOURuqmzF8WVbF64UwTnsPkRMaOHYeZIQYY3ooq3Ho +3oClRo7KuYNGfedEvLN/iRpAcaQjvRA3g+MfO1cTQPw +-> \-grease ^U 6;@ *bF88 +TPvkBe/MvA90EZfXceEXWCeUxX0JfjZiFvQ6HA +--- 0K++Y9AaDhPyLBvrjsiPzAwAF7E2/A/CxUVIMCGZnB8 +оG 3m&3wN-X~dwi.;l76D +q^PUP8>iؘSX \ No newline at end of file diff --git a/secrets/pbp-wireguard-private-key.age b/secrets/pbp-wireguard-private-key.age index 93bdea7..b9ac218 100644 --- a/secrets/pbp-wireguard-private-key.age +++ b/secrets/pbp-wireguard-private-key.age @@ -1,31 +1,31 @@ age-encryption.org/v1 -> ssh-rsa /AagBw -JVGa5Masi7sNK7Tx+xAbXqWGjNT6K77Tq1cKsb2yA8q1EAbheZ7bO7+RyizK2HR+ -esK24r1KpnxuSpfraaxQhRszzqKDuc2Wj5yM02LQ4UNxOizGNm5ny7FYtfmBrpx4 -Uu9M6Svte2SSoJ5AamXxjsauvBaGD16+xhX4eUxJcFAbNDOWC39XlZ/XHngx5Tpu -QTvhuoV4VEefxPKjmHjBG7VNdvB2+UeAjqx/iGOp5OfzaacLTr2QeOpq+ddkLVaF -Bzy5JcZ1mOKAeN6Wc+7prq+LNLBoRWjfdxZv6UQzYLAHvm7d3TxPtpjZXQObrQ7G -ubv0W7UAF5J/tUVgX79lSMr2SlyZfcpM19CnboHbMvhvpB97syOKvGaDf9jMAPDU -3kUO33Rzmze+16VhisB3w6H0cXDqcgZdvM9stLNgrDOtthV7xKF7UxjbIwWCaNk+ -aTDJ76xbiiMyX9ARQ0J6/z28Z8tvYKBWktejpc+1TfoU2BZY/faiLDIzG57c6ECe -UM5iWrUI5wKqIs+06tC4M2otwwGrJOqC6U9BrCkos+nHZ2cFZwNLwkWcgHvjAFoJ -A/6QJ6nnD1zKDsvsqmpvX7N4rnTo4SNUNKGp6eNi/P7VZQ0fRpFhd/0139I5i3kD -CRQXxQILR8juW4c7YMkm1zQKzXkAV3jJm9fEZ0FVxe8 +n8OU7HmSYmbVvjKawT2GUQz0f8jxP/q3EkTzS2XyhOmGrU6p0/08FoK7GBACRy92 +96QvGy3uDEYjs4LuEo0wt9GNaFkJ0JacX0epxZWJjYDXwBdlelNvMnqF1a0sEYMH +6tqWFm2sa/qhvh+tOi4kQcaVix6KK0wCpFx3xV20Vgqx/8T0/ixm9eSB6PzQSUKz +I32kxhduTlSRFQg+Q5dPYPYcQKNkRbn8QPWp4CXTbV+BE0R97MwnTDs22lBZdZ/x +O/+i9YuWob6Zz4I2csIeABMdhp1yfLSb6yWkrbF67/Dyue1lnRbTKO3qXQ2mZzoj +dv2Zu5HXbiOQn7I2Lab5/+G/DOyESf2s9WSp/51j1jFZWFQskbX9eAi6IF0gNjO1 +UvIuQVffkaQj/+8huUOLGmPFTkc8uoOWvkb1+aazYssp8z9T30lyxxgnlI5WzmZ0 +X9dhZvg44XVacE74oSuNkTkF2iMC7UdPSZy8AEyFXFIITLsOTnhY+yIpXwS3dxY/ +BVWeSVWyPLWfJnjE+K6jT7calxEzwnIqZ8rQlQbekMdqBPBYYNmQJ1Y5Vt1ZlhzE +70hj1B07FG6I4wMfhz7M9taDs4RMAcJHlzzo4oPqzWrFz6OlIv6duRxEesAO+gxU +OYtFoR+Z4cU5wEE6aZGSZ6xz/9k9FJ2n9KqesnLL35s -> ssh-rsa QHr3/A -dssXG8BUFuAd8ec+8HD4K6YUIGwKFwTyOXEBj4106w21C0+g0ffIeRXJJG7N0v7d -vM3ycxDSJgOLmV/OXRQZCysnk6zdh2Aaz1FV9xFiXbZ1WUfMU/7FbeLjhNMzdf18 -f4c1oO9+AYHEV0YhSH0JhTSUj9JkeQ1wG5LQ1Yafls9CCcg0EVNgjXCxTgHS/MzY -rDGDokc2RzvqDz83g0ks0o/1M8wntCm3+iI+aCEXILz2AF6Il3Uce7qMmffNpYb2 -9hCq7heTUxyewXv2g2F6+DThb/uG5JcRnilAMYnf3Q4LwgytCCfOh1vyvrc6kvqR -LRIMjS5ggqD22hmcAwCTGPFN2Eeq3foXKtZ2gC+hXrbBpCC8c+rFElB/IzAT+sn4 -3K6QRa+Fku6VZrR28iCMffcBCMOXg1axr5aciKjKClOUw5DDyjHD7J75hNQkIe++ -vUxnB8viGtnUC8yJNf/AeUG7COKE5ZulcMp4ZPPqvkLrA7c6alpAJCe9wK7AuIev -KlY39UK05Yakdezrj+Tr+FkrdQ5UGG5DbzBskQvoKo9T+sxEL1RMKrCVr34Ynyv3 -gZwR0Ckklk6aZPnqTC/UltrclOBsr08v01gRr9RE7w39pE4aINqigQbhXTYq8Obn -9MkEldH6j3119vXmHQ9lkyxIfyF3+kpK2gqZMCjwliM --> ssh-ed25519 QdXVbg rMspXmlQ2sJ2k0E7L3To2a4+nncH5gkNpVu1Guc2zhY -RSLNRHow8mP23cxA1irrbPBYUnczSY8xAdHKX/UWtTw --> fR>']7s,-grease x -ggBGn4n8gEq508WyofdRCRqDhy60McWIxHDwPbn8FFN4+ID6Wig ---- ts2g/OfRkv3A9JWQh54T4ve26jsqFKIvMyXXR5rJJYM -[ RwvדMapU KYWqr[F~H}ue0^uU~I> \ No newline at end of file +n00akF6dB27JrEo1mNV3eAKCQ+8B2AmBAFdNh9R4FMUSd20K1uBJan6PcN6rXjsE +lNs0f8nM8iQC6TiHwXlLs03asmXJF+cfJXpLI4rN200ewGOe4va9iZu15FVHe7Cx +g7K61thj0qdEpWamx5PUP1O8GS8wgycCHCVfjLrFQBH3HhKgdi/xVnAOG2rhinYw +Yd7yxPL4MHb90I6ovC+Z9bZwGl/HqjQq3Xg8PJGc/03b9TjcxeHZHGjcGcTzRCvj +OEeL8lTy7MY3tE/KFLJZw7q356xXLYVktqXAU9BsVH5q69fPLHR0KslLOXZDrdfM +rG18P36x8J5Ug75d5rPjEd7GL7w0xMLlUbJ33XCf9703zIJs+K6yb9MP69KQidCa +cAVvotVKf5Xux8udUEKHIluE60VdlyRAtl/0uEiZl7sqUpzFmgwLAlbaza3LQPfd +FJ3UaoSBN9VO+M11pk+btlIaRDJqtde43YtBxWodaEA1B3YPvD1jEcPjrUMRxEyV +mtZfRi/091zak8buXiJqbb1BHBLkOISpyXDZTr+RbXhvZGf3zJu6lZPywHUJyGvk +GmmUN4rxKVWUZAHQgrxYWxT1JJI2ki/vKuY0g9c5EmHM2jZwBO7fGF3mqXR/KbPl +PQroImd1sdxxoCSgMO37r1s6g3QPTh3gsBuql5p7PTk +-> ssh-ed25519 QdXVbg DreLBG5eCw+D+quH7G9AamEOfVJz/3ZLu1xBg3kOdlc +7dNUe4URAsUrDxfANYsPAztuqcss+zDwFh0mcZ5LilM +-> b-grease 5'OM Lo J +KMtYSpaN5Y8I4f+TbaXIb8Y/Q0hW+bHCnjg7VwLGKpJORK2GaCC2BdcY +--- 9Sqj30Ww4CLdmgShuATYUmNV979lL2S4Cr4rty9ejC4 +m$1n5hCeyНb(2J)GU,Z+oQUc#aZ:I h3R \ No newline at end of file diff --git a/secrets/rock5b-wireguard-private-key.age b/secrets/rock5b-wireguard-private-key.age index d1c1a4a..f9a23ec 100644 --- a/secrets/rock5b-wireguard-private-key.age +++ b/secrets/rock5b-wireguard-private-key.age @@ -1,32 +1,33 @@ age-encryption.org/v1 -> ssh-rsa /AagBw -B/b52zRV6ydfeVAOYtFu5g8ysnRXpX8VJWweSTikfAdfRf2c/VZsyb9o2nL0veDp -i1vnhtf4X2LBWFi95ZLQX6gFBgxEnh3hwZwzItzlC6Qx984/8dQQLuTzK7FGUNh6 -QlH2g/Xuf20ddB08RQBo/oP8gHwjS45COXwzUVqRxR+I3HCwt+YitN0XEGXPnvKV -f7G1daRzaxNl4bky8uNOL8O4CKLLVJQclr/8P1J+URqAyXvFkGhxpcJwNxvm8JyP -Ha3mIY7ZTHWB6gjUeBXTFLAB7YbGvFSS2V54g4c1XuB7CStB48CZZaweJ5EJ3yyp -dKRumP+EtJKe+Er/vqZgry+WQmbXDw7ysupUzXXIZZWG8a0U7SzRBZqt80r6oS5K -RagRTODQIFDwGXvLTeB56s2a9/6C3uaXoJD5STSoR+cMKQhHczHOUyxzMYc8vkwl -hKHhdOSgEPAgHUMGGCRslTyznS4wZE7M2it97iENnb1LYlgxcrh3bspwiPw6iE98 -KoGz0G75Gto+rUBPWTc2kPD4Wtkosb7nC+ZQXor6sMYoT+fv9Ovpn/GwDkTR1ifS -0dBsXyhjgns4fKqJl9sWCz15NIXS9z6ATvQ2h7vE5xXvFl3Ugxv25arO6LRvM8Yv -HGrlwA/xTNTDiHKTULYfoqfPVHbBHI+iKFb7FGxaAB8 +nEt2XVPqkvrqgUEEMbIMLSv+3gVbB6lgFKfktCn5gRtDZ7kj+UeJXknsUAB0W6EE +l+VNWX+eDP+XVTODdrlhqNPbU8dh8v2V/oN3/v5rUMFWKiqdtgrgAhlJv1RUEK6i +1+0Tf3Jt/fWpC6deZowEyIRryE+n4jxqFW9AYkMpyopD3q2Wiz52yq9XProeUjQy +YhRUERG2JhJD7h7bAK4hP30yvPzpnn4uBqAl0k5U8VJu9hgwMUlld0ERe90OV2ya +KB8eCt+UHU0Aw9Z5wmx/Ta3sW1JGkxWKWcW53qtE2eqtQ3q9V9keCe+Hfz/aXjon +jwig7rz2hvq35XI32QDEyPpqlVXSKj3BpIplUcmbgFjOhfaLrU5bkpHNmUrKwRZx +FRTRK4UGA3acBbCcL26Kb8G4hG+SL5XR/bfUe2iT4jvYf80WiqHrhrXJDU8Mn8bV +kaOe/uB3GXJ/4Rc0TCE/xVdbyXCcllq9RD3Fr2qLXhekQWjQohT3P68MPWiKdGf6 +8WTwLcChcBWrX8o6lwhGpvIr5rQfGSlYmJDQRQ9CpAJ+q42MbojKl1i0bBn6Se9M +rK6KQgXFqfyJeU3B6O9VcPl2TwcLf1FfZxjLBHsCyEDMKlVSdzVLBCTgNLX2C437 +fOghbUVbjGnLF1FKtPiB3MZ+i/DEsMuD9AsgMgkOVls -> ssh-rsa QHr3/A -q8m9pqOuIhGOaTx2ZQx3v36NSeFCh+X/cUOyhGR1Xr9se9Tc+om3GPcxfzKCOHSf -Mg00J+8D28TXMfp/tThFvWcK6oTYNesFqB2EK0xRaF4JLHE8PpdU1Y+nYgXznSfD -+nCmTwMtrx71Hts+aAAJuQsIm4y1/oVQLmtw86SHtCF6uYzOL8oTYXByy17YJtpB -M9Lh63eFNXWBOjFotGN4I4pdrEXzo7aDmWnp2c8U2cDik23IrPTm59taF2fLXVlM -0l3J65RGzZKqgop7wX9WWfqLtmelcaPHtReO5rCy1AGXCxjchSXfbn+iE+glXwhi -7NBvoFZIcCEA4FiR7m9CFaBbTJBpVy5TmCBTXuXMOIFVOeryTdkIuvbCOxxchrTw -u0R5YyD0yFbLq2hL5JCQZDPMKK+5GH2wbuXg29pSayCk8Pmg+8RCJzY2imtfHzHV -u80QMoRnEvFfhJB2sVZ6ugxLLxVxE90wZVILzQK31xyOL9lQuisCnPVEVrc0PBVz -7q86HtLgd3wASbK7ylZUu+DO6EsmGERhR4jZnnBXyTxGoLJbJKp8OsN3cWYZdilx -sGtjX7Pi19IzWh7Rp5kFXaj+5r//6+kBDt97IiY/DSDgspqdRydJL1cw8jbhBVOX -QIKllFjiY00Y5ou7fM9z3kePC5qEP/Q+iGi0K+PnEcM --> ssh-ed25519 EJftvQ pDgNqx9ZlL+7Yo3CPYKNX5VJxwEEo66RoMLLjhrdtRo -hlSG0ryo4UiycLUDHABOrSxFG63N3VVX04wtw6sNYdc --> +^-grease gsd \a.-,gx# S@ 4' -AFDfkKtGuVSs3AECvjr2H88xEAJU9NONhxdXwz5KjHJO3PV05KV1b5f3RIZ8PgHc -6V8yzgN2mB0bAA ---- qkw9kh+EGzr8F3LFieA06BoOPkGmiI3Si05l4YfIgLQ -TS5`|Cp'7AMCRS+{jj,{.a6'`D39( ipc+\ \ No newline at end of file +fEbJdHtZmTqNkuYaKBUXCIPDX9ro8qJ+Ya8KTUXsHlnITAUCIiY+m7t7TaHGsQ3y +MN3ysQy6fNwt0YemjJ7rZDe7VD0YkfY5ZRo1BqjSyrfAbsnXdBYgSiTNgLncvBJ+ +VN/RI1TmGAi4xlwX4i5cYPUsgs/AdhlpmrgezTOaIktFSscfnIGe+mIJmkR+H5/F +seWzmLCIMxIQ3McBtpqa+/utwoBOsJ6uqKN36HWEeuOTe5btyTCCk/tUM2tLbFld +Hjlgu2BvUM0g1wB9b45Si8x1k5BM8mYH6PqPnYUklH6wNgGDDwLqbxPFn8IBvtPl +evyrmWjE033OmrA+1bfrVpaZO2pXzXa+WxQjEfEjjEmKWVq1gPB3Tm1bVktQ13Yp +jXbH+rjS+Xmjh0L3p7xTDj6nmhbS8du7LT1zJKcJwCcT9YaGBw+FLZTcPuPfr0zG +OrE90+4zzrxYYVk5agraAFazRrIsrdEdHBh4u9HBGrBlCQllOJ68JU3fe0aGRuFy +NhhXYVRwxd+1439vTBhtY5J/c2yDsIfJn9DLo0xCnEp47KsnEPUqpTLtNEgrVcfg +VIT8rHwpxrQXzI3My6cSrr/AvG/AZ4sY9caca7vAuE90gtg5IG02P5PlCvQZsJ62 +Fc6Aa06YCcY5F7nLEcEco++KLeb0FB5qwEODVSMRcuc +-> ssh-ed25519 EJftvQ rnQxzjY7jzxxqvDkBZNhJTYY3lCETbDZkk/yFH61RGU +IlbVhjJpxo2BvwadKr8KeGURQJVab2fyjmdwSCw40GQ +-> r-grease x;.PfQP :D-g*XmM !^o%l^I ,RA +aocdcA5oPweDGp1zOg62Uhn4DoBKztvCDdCRA9FM8gKVjFtlFnaOu3Eaqo9l/cz6 +s9myQpnSeFBKJrW+HEDk+9xk6TiS4DJiRy0HjXLSDwmUv3GQeQt2kLziPW2s +--- sPWkDTReAemacGmuPiAf2bzV87c2rvebWA6zsyn7lv4 +~Уh +8=ɟ73P:*Mw ssh-rsa /AagBw -niXJPzU/BA3kBrRJjPJgNggQjz2xL/kTLsYmMYqk4cmTZDM8Itr3vIfNT1zS5CO1 -BBOydqNNsC6ELXxmZ66lVTyPQA5IX5yb38yqKm00eDCTBvcIeY0tXdyGZX2l5gv8 -jHH5tdLZHNuhg3Bsdx9Lc41zeK51Ge8f+QZBJn5lcpeT8C6JI3eQBfOCJ3jlrSBD -z0rcA7Vi4VjmB/oGh5RCFU07rmK50fHu7/Zn3DDABTORslgEsBtpJDXhgwacO28r -xP8Y3Z7G25bkBjkM3u9aLm1F3ztplmDVltiTEa5OValtk5dcLYkaFTzInbwnGIJS -b1/dr88QskKvdr9OQHeOIY55rvjWoN7WzVYzPJ2L7a4ZShfpwmr0oGF7ssaKTzwq -GG/o5BCn4qR5qONpnb696abjBb3dSCC5CAkj/Z82b9y+p8wBAMtrd8GphU6TxRMR -0CIEPJ81YcuYXwLlujw9F2S++ypEanOAxW5S8N0X2y34EIjRuKgE+JP5/MXJ8M5I -K3YXTanGQTfp63Ir6GgpM/+b4N6VqFFKNkoeX8RBFzuN/DPH7wHVlEYB9m15ENLC -5u3JPq/7zuykXLOgVqiewCRINAv55u9sbi60qq5N6XUY4Em5WCyotYXwt+odYMD5 -oxgOAOA1unfg68ni2FxlTJen2/vqzPNhCcM/eimE1pA +dEdlYxYTIYcF/wpNflSY7QCSqUSSHjQtXmhZML3mDAeB0P/3DNnCceIU/K+T/GkC +K5Yn+VVuIkON4MhojqgbUGJfbHZBKasIlT7x9oqcNWFRI4DFRaQpfX1PuTLqLWu7 +cuFarm8Fv50HT0XcxhJq4icbnh/qhu0vkXB4wFjInLbYp9Vf/yIjkriImlY2eUEf +095j/piaEcBUwTzWX9Ii4MIOnBTYroBC6O6EBd+nWBBF7pffVTVO1yUHeeyCfE8M +NYhbdxTdWZxj/KIOPQRBhvi1KxkSE5Qyuw+Yp5NfHxQh43+V0Matyfywa5dhDgIj +bPLJZJCqyLP4JUz2+XWp4Hl2L5y8vNZD7YZ+oKkwqCTcgn8gcBTGGAt7quZVdwAS +ss4o44xZPFbWulPgVdav9Mk6s2XoSpZSLxYe54UQ0Nwbi9rR8l4wGu8cgiOqq8a+ +/k6/Nj81EkaufxDblOq5pZJA5EQ/IK6SGSuAa+U3TpBi6sDF6xCX32nHoN1jNqr3 +fZOMb7BoK/VFGgQ1+b57JrYWsAd9mRsDkTtqkRMdbznN+9ODFyfOEnP5LYKfbtZT +ZfLiUlOrAY+UziscQXKiLYyhmd9URSKC+ZReSTMse2BM15Ruah31rg0XdVYnsrg8 +NHYQWjf7SpvTFc5XVWfUl7IrPw2IpTIwWZ5Oxj/BILY -> ssh-rsa QHr3/A -oDVcokWirXH5BnASkJg8PT6F5qjq6MBaCcpPxVYKitVVr07rs+rQm/zsTW8ld0Po -4Dq6E8RLlwxorRYaAzxdZLlLj/JlztNV/1uXC1raYsVE/4F2s+Ak5zjI73HdiMjT -O0SLRw/7wEk494XhHxmdBZa/YuB/fwrA0oEHuXfc3q/wH4dpTVPziYylqVCZR1x6 -6tKINC9U1K6f+AsyY9eyA7rPSuK4rJMly8dmVB5LAseMdqokqhd90RSJ2m09SM+p -k8SK9ApgS1IK0DLYgpt8mpCNe48mq3arBNdJGs/8tT9EqILsRdo/H8nE5bRjnRx/ -2vvqo0i5MaWr8aUMnjQU69pfmBZhMU+UmKilvUU6wBBskIPH9x8qPj2iGLZxykux -iB0JdXV+KMdFFrl7ixZDOGE9KS7kgpoKBxCW/EhD8Lp6KyifqANKQXT2FowNld9z -RUDDiT7BvjGCHyIyXyVSQJvmRHXqficG6sZHUKXRux5wpSX2hNukZesFmfuUOV58 -kRs3Z7gKeYuslL7uxtXZWduvtKA1wCECWjxCd9HqDINZ17/zBBmhLNVPla0vv+yR -w9DdD5cPQAQnP0PW0IIpgOmyJBiZm2gp0orxN5LyC+to1k0AjfjjuO/EJqQPVZKC -w4euHianbxYgcAXv/5XaHFU+fuq5+acVKFLyRc96Eog --> ssh-ed25519 GVMLQg MoY04NrRrk8O2g33IoJDQ7TvkhZ5R4/NEWgbh0OclWM -Q0pY7z9eYUr9vC63zexXwB34zDyoz0vycrSqu7ktK60 --> }m-grease g -ujgP68SYg6LsIPUSZV8m4tgudJw+slyUt84MVt8+bc2RiH8zhiBojkxZBG9KLahh -uyUbJbnAA+MPKG/R ---- LXATOIzqIHUjhUSWy2PHY17WNIyAPIajrT3fdTzgVkc -q~&=CJI.G6=l_yN\\ilա ,=*T|#BJ \ No newline at end of file +aSNamwfMqGb5x3U9kDuSxvTe4ICjC3GaPvOnYrecJgvKE2V6iqj8tHkmL9KpgbUC +pWN2OFTOKdaIibVjXi1p3hW8jVg+wPapcjYB/XOxe3IMhRPDjrhU4HvohL3aFL84 +wCdRi0q14eKB2Tzg3GY5uagMSUZfWjfA0UAAcp4eWKDUbgZ9LKb9z9SWflCuA9Vk +ofAcjuG8ZcQXWjNI04mcKWFXiyCay9SMgp9MTaeCbJatwYpmHdBBW3wG5kVqzoIp +2PoFe9bPHuA6NUYTWNlRweXAh3anM8Vf6uaO70ZshcG2af+xN+DWiInYRzbTN5sh +QeggyCIscrToPmYSai2NtJwRJ+pXa5N/C8DQ7Cn2JjtuMHqF2qRsMwLMTooQFxFS +aU+4Q+0o0RUqXynoHVgbNljE0GWP0WBOcMR4u3nmUyU33M6ex3HrvHbaIDbmjulQ +qyxKWDCehqZsPgkQPEBcXUpHagJw2cyj4I24/4XGAgUETJ5veowey3ui5G1l357H +7+G3MMZg7kv56/c1K6TYqgbND3cmTlC3fAYwL9fDQ86e9bOk+xWvuGi6edXrW66C +WVTz3M4VhK3CFEsea8JjH0Pv5BN/rweU6S0kt+E0oYGSQq5Z4BYbufKn21bLKq3j +3wMGfFNKaNBx5BL0MS942adYOIbA+6U9mVwpcDZqkrA +-> ssh-ed25519 GVMLQg 8/+zuAlv7DSmOpgO6ulpQSkDxDWqJIh0gJEmr8uEPCY +40yFX3/O5t1vFbYeoYj0aZbG2i0MJ4R1t88J43taLtU +-> ^S-grease = +RJ7w1xO39i6BlR/2CRwWCBXKANAD6Bgd6UDKKn+KmHBiTY8HgNA6RRmhj6+fQ332 +IFkrM4k +--- CtJU7vkH5Lk/ee7X1QxoKu8MXo31Xw2BHA6c8RZOQUU +^PCkvRަY?ssgMu4pDf P<%3X0!'6 + mT" \ No newline at end of file