va a ciapa i ratt

This commit is contained in:
Andrea Ciceri 2023-06-16 10:07:37 +02:00
parent fac91af11a
commit 8346c9f02c
No known key found for this signature in database
43 changed files with 909 additions and 446 deletions

176
flake.lock generated
View file

@ -55,15 +55,15 @@
"locked": { "locked": {
"lastModified": 1683798766, "lastModified": 1683798766,
"narHash": "sha256-HY0Arq4uGqfMM0WiSKrOlVt7KTTN9jtpxCHDAtEp8Vs=", "narHash": "sha256-HY0Arq4uGqfMM0WiSKrOlVt7KTTN9jtpxCHDAtEp8Vs=",
"ref": "refs/heads/master", "owner": "aciceri",
"repo": "emacs",
"rev": "7f3ee2413d6b0756ade8435e0fa9ff3317e4c000", "rev": "7f3ee2413d6b0756ade8435e0fa9ff3317e4c000",
"revCount": 43, "type": "github"
"type": "git",
"url": "file:///home/ccr/.config/emacs"
}, },
"original": { "original": {
"type": "git", "owner": "aciceri",
"url": "file:///home/ccr/.config/emacs" "repo": "emacs",
"type": "github"
} }
}, },
"colmena": { "colmena": {
@ -115,15 +115,16 @@
"crane": { "crane": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1670900067, "lastModified": 1681175776,
"narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=", "narHash": "sha256-7SsUy9114fryHAZ8p1L6G6YSu7jjz55FddEwa2U8XZc=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b", "rev": "445a3d222947632b5593112bb817850e8a9cf737",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "ipetkov", "owner": "ipetkov",
"ref": "v0.12.1",
"repo": "crane", "repo": "crane",
"type": "github" "type": "github"
} }
@ -179,11 +180,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680146283, "lastModified": 1684783210,
"narHash": "sha256-YZSw3O6uv6NqOJP+dol/njmzblRFIsrmqqb0HsL4mcQ=", "narHash": "sha256-hxRbwwBTu1G1u1EdI9nEo/n4HIsQIfNi+2BQ1nEoj/o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "4d9c89abde7ccedf743a01119d41fb880793bcba", "rev": "f0b9f374bb42fdcd57baa7d4448ac5d4788226bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -250,11 +251,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680258209, "lastModified": 1683212002,
"narHash": "sha256-lEo50RXI/17/a9aCIun8Hz62ZJ5JM5RGeTgclIP+Lgc=", "narHash": "sha256-EObtqyQsv9v+inieRY5cvyCMCUI5zuU5qu+1axlJCPM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "dream2nix", "repo": "dream2nix",
"rev": "6f512b5a220fdb26bd3c659f7b55e4f052ec8b35", "rev": "fbfb09d2ab5ff761d822dd40b4a1def81651d096",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -285,11 +286,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680172861, "lastModified": 1680698112,
"narHash": "sha256-QMyI338xRxaHFDlCXdLCtgelGQX2PdlagZALky4ZXJ8=", "narHash": "sha256-FgnobN/DvCjEsc0UAZEAdPLkL4IZi2ZMnu2K2bUaElc=",
"owner": "davhau", "owner": "davhau",
"repo": "drv-parts", "repo": "drv-parts",
"rev": "ced8a52f62b0a94244713df2225c05c85b416110", "rev": "e8c2ec1157dc1edb002989669a0dbd935f430201",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -557,12 +558,15 @@
} }
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": {
"systems": "systems"
},
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1681202837,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -700,11 +704,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1680646269, "lastModified": 1685289082,
"narHash": "sha256-MRohWyeJJf3zwMWUt4XQnD1qbem0/3D0cbomvJ47YuE=", "narHash": "sha256-fryIaVSDYZAZWxlBQwldxGjINJnHh27DQRabOIx/oYI=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "531b745c54e5d316603601cc05ade50ab02066ab", "rev": "3334e7e4b2181590ddfa9aa72a19429b9b2381ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -717,15 +721,14 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgsUnstable" "nixpkgsUnstable"
], ]
"utils": "utils_3"
}, },
"locked": { "locked": {
"lastModified": 1680597706, "lastModified": 1685480784,
"narHash": "sha256-ZqJ3T+BxzjPH9TnmeUwS4Uu9ZQPeBXAFC9sUWlharT4=", "narHash": "sha256-pkk3J9gX745LEkkeTGhSRJqPJkmCPQzwI/q7a720XaY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ec06f419af79207b33d797064dfb3fc9dbe1df4a", "rev": "54a9d6456eaa6195998a0f37bdbafee9953ca0fb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -739,7 +742,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgsUnstable" "nixpkgsUnstable"
], ],
"utils": "utils_4" "utils": "utils_3"
}, },
"locked": { "locked": {
"lastModified": 1679846261, "lastModified": 1679846261,
@ -789,15 +792,16 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1681677208, "lastModified": 1685380658,
"narHash": "sha256-R9b2/SZfkxuv54YDo4FUp65wgLREQ4gfYxfJ9mSMTno=", "narHash": "sha256-LPih0Q//p8IurXG9kGRVGAqV4AUKVYj9xkk3sYYAj6I=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland", "repo": "hyprland",
"rev": "c62ab1bee72cc4bda16a0574a8c9de7d71da314a", "rev": "51a930f802c71a0e67f05e7b176ded74e8e95f87",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hyprwm", "owner": "hyprwm",
"ref": "v0.26.0",
"repo": "hyprland", "repo": "hyprland",
"type": "github" "type": "github"
} }
@ -810,11 +814,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1681065697, "lastModified": 1684265364,
"narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -879,11 +883,11 @@
"mk-naked-shell": { "mk-naked-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1676572903, "lastModified": 1681286841,
"narHash": "sha256-oQoDHHUTxNVSURfkFcYLuAK+btjs30T4rbEUtCUyKy8=", "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "mk-naked-shell", "repo": "mk-naked-shell",
"rev": "aeca9f8aa592f5e8f71f407d081cb26fd30c5a57", "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -951,11 +955,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680329418, "lastModified": 1683699050,
"narHash": "sha256-+KN0eQLSZvL1J0kDO8/fxv0UCHTyZCADLmpIfeeiSGo=", "narHash": "sha256-UWKQpzVcSshB+sU2O8CCHjOSTQrNS7Kk9V3+UeBsJpg=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "nix-cargo-integration", "repo": "nix-cargo-integration",
"rev": "98c1d2ff5155f0fee5d290f6b982cb990839d540", "rev": "ed27173cd1b223f598343ea3c15aacb1d140feac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1011,7 +1015,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgsUnstable" "nixpkgsUnstable"
], ],
"utils": "utils_5" "utils": "utils_4"
}, },
"locked": { "locked": {
"lastModified": 1677512347, "lastModified": 1677512347,
@ -1167,11 +1171,11 @@
"nixpkgs-lib_3": { "nixpkgs-lib_3": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1678375444, "lastModified": 1682879489,
"narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=", "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e", "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1234,11 +1238,11 @@
}, },
"nixpkgsStable": { "nixpkgsStable": {
"locked": { "locked": {
"lastModified": 1680498889, "lastModified": 1686656800,
"narHash": "sha256-4nGFBm+oILOO6DPoKTPxVlfkZSxCOY4W25zSRHESK48=", "narHash": "sha256-duScdQZNeZcde0JwmQ9W4XfqlO/Z24MDhlTq2MokuSM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "799d153e4f316143a9db0eb869ecf44d8d4c0356", "rev": "2b273c2351fe1ab490158cf8acc8aafad02592ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1250,11 +1254,11 @@
}, },
"nixpkgsUnstable": { "nixpkgsUnstable": {
"locked": { "locked": {
"lastModified": 1680487167, "lastModified": 1686592866,
"narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=", "narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "53dad94e874c9586e71decf82d972dfb640ef044", "rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1313,11 +1317,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1680213900, "lastModified": 1683408522,
"narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e3652e0735fbec227f342712f180f4f21f0594f2", "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1464,11 +1468,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1679737941, "lastModified": 1683560683,
"narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", "rev": "006c75898cf814ef9497252b022e91c946ba8e17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1482,11 +1486,11 @@
"nixpkgs-lib": "nixpkgs-lib_3" "nixpkgs-lib": "nixpkgs-lib_3"
}, },
"locked": { "locked": {
"lastModified": 1679737941, "lastModified": 1683560683,
"narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", "rev": "006c75898cf814ef9497252b022e91c946ba8e17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1648,11 +1652,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680315536, "lastModified": 1683771545,
"narHash": "sha256-0AsBuKssJMbcRcw4HJQwJsUHhZxR5+gaf6xPQayhR44=", "narHash": "sha256-we0GYcKTo2jRQGmUGrzQ9VH0OYAUsJMCsK8UkF+vZUA=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "5c8c151bdd639074a0051325c16df1a64ee23497", "rev": "c57e210faf68e5d5386f18f1b17ad8365d25e4ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1707,6 +1711,21 @@
"type": "github" "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": { "tow-boot": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1796,21 +1815,6 @@
} }
}, },
"utils_3": { "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": { "locked": {
"lastModified": 1676283394, "lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
@ -1825,7 +1829,7 @@
"type": "github" "type": "github"
} }
}, },
"utils_5": { "utils_4": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -1844,11 +1848,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1680810405, "lastModified": 1685491729,
"narHash": "sha256-LmI/4Yp/pOOoI4RxLRx9I90NBsiqdRLVOfbATKlgpkg=", "narHash": "sha256-YfpP8tKpcr0Lxlr3PdoMaY3GD/uJRl6E5pp5KQCEuzg=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "7abda952d0000b72d240fe1d41457b9288f0b6e5", "rev": "3f0487d310974f6ff889ca80e4fb4005553814ed",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -1870,11 +1874,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1681127512, "lastModified": 1685385764,
"narHash": "sha256-vklOOhBj5W8fii6yN4L2WY5ZeifBmsq3+mJ2wC1Pk9U=", "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "04f579377a32781ce57c9cf4ba2a5bcb7f53fa97", "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -30,10 +30,10 @@
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
comma.url = "github:nix-community/comma"; comma.url = "github:nix-community/comma";
rock5b.url = "github:aciceri/rock5b-nixos"; rock5b.url = "github:aciceri/rock5b-nixos";
# ccrEmacs.url = "github:aciceri/emacs"; ccrEmacs.url = "github:aciceri/emacs";
ccrEmacs.url = "/home/ccr/.config/emacs"; # ccrEmacs.url = "/home/ccr/.config/emacs";
hyprland = { hyprland = {
url = "github:hyprwm/hyprland"; url = "github:hyprwm/hyprland/v0.26.0";
inputs.nixpkgs.follows = "nixpkgsUnstable"; inputs.nixpkgs.follows = "nixpkgsUnstable";
}; };
hyprpaper = { hyprpaper = {

129
hmModules/aerc/binds.conf Normal file
View file

@ -0,0 +1,129 @@
# Binds are of the form <key sequence> = <command to run>
# To use '=' in a key sequence, substitute it with "Eq": "<Ctrl+Eq>"
# If you wish to bind #, you can wrap the key sequence in quotes: "#" = quit
<C-p> = :prev-tab<Enter>
<C-n> = :next-tab<Enter>
<C-t> = :term<Enter>
? = :help keys<Enter>
[messages]
q = :quit<Enter>
j = :next<Enter>
<Down> = :next<Enter>
<C-d> = :next 50%<Enter>
<C-f> = :next 100%<Enter>
<PgDn> = :next 100%<Enter>
k = :prev<Enter>
<Up> = :prev<Enter>
<C-u> = :prev 50%<Enter>
<C-b> = :prev 100%<Enter>
<PgUp> = :prev 100%<Enter>
g = :select 0<Enter>
G = :select -1<Enter>
J = :next-folder<Enter>
K = :prev-folder<Enter>
H = :collapse-folder<Enter>
L = :expand-folder<Enter>
v = :mark -t<Enter>
V = :mark -v<Enter>
T = :toggle-threads<Enter>
<Enter> = :view<Enter>
d = :prompt 'Really delete this message?' 'delete-message'<Enter>
D = :delete<Enter>
A = :archive flat<Enter>
C = :compose<Enter>
rr = :reply -a<Enter>
rq = :reply -aq<Enter>
Rr = :reply<Enter>
Rq = :reply -q<Enter>
c = :cf<space>
$ = :term<space>
! = :term<space>
| = :pipe<space>
/ = :search<space>
\ = :filter<space>
n = :next-result<Enter>
N = :prev-result<Enter>
<Esc> = :clear<Enter>
[messages:folder=Drafts]
<Enter> = :recall<Enter>
[view]
/ = :toggle-key-passthrough<Enter>/
q = :close<Enter>
O = :open<Enter>
S = :save<space>
| = :pipe<space>
D = :delete<Enter>
A = :archive flat<Enter>
<C-l> = :open-link <space>
f = :forward<Enter>
rr = :reply -a<Enter>
rq = :reply -aq<Enter>
Rr = :reply<Enter>
Rq = :reply -q<Enter>
H = :toggle-headers<Enter>
<C-k> = :prev-part<Enter>
<C-j> = :next-part<Enter>
J = :next<Enter>
K = :prev<Enter>
[view::passthrough]
$noinherit = true
$ex = <C-x>
<Esc> = :toggle-key-passthrough<Enter>
[compose]
# Keybindings used when the embedded terminal is not selected in the compose
# view
$noinherit = true
$ex = <C-x>
<C-k> = :prev-field<Enter>
<C-j> = :next-field<Enter>
<A-p> = :switch-account -p<Enter>
<A-n> = :switch-account -n<Enter>
<tab> = :next-field<Enter>
<backtab> = :prev-field<Enter>
<C-p> = :prev-tab<Enter>
<C-n> = :next-tab<Enter>
[compose::editor]
# Keybindings used when the embedded terminal is selected in the compose view
$noinherit = true
$ex = <C-x>
<C-k> = :prev-field<Enter>
<C-j> = :next-field<Enter>
<C-p> = :prev-tab<Enter>
<C-n> = :next-tab<Enter>
[compose::review]
# Keybindings used when reviewing a message to be sent
y = :send<Enter>
n = :abort<Enter>
v = :preview<Enter>
p = :postpone<Enter>
q = :choose -o d discard abort -o p postpone postpone<Enter>
e = :edit<Enter>
a = :attach<space>
d = :detach<space>
[terminal]
$noinherit = true
$ex = <C-x>
<C-p> = :prev-tab<Enter>
<C-n> = :next-tab<Enter>

View file

@ -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;
};
};
}

View file

@ -3,52 +3,67 @@
secrets, secrets,
... ...
}: { }: {
home.packages = with pkgs; [mu]; # home.packages = with pkgs; [mu];
programs.mbsync.enable = true; # programs.mbsync.enable = true;
programs.msmtp.enable = true; # programs.msmtp.enable = true;
programs.notmuch = { # programs.notmuch = {
enable = true; # enable = true;
hooks = { # hooks = {
preNew = "mbsync --all"; # preNew = "mbsync --all";
}; # };
}; # };
services = { # services = {
mbsync = { # mbsync = {
enable = false; # enable = false;
# FIXME this requires `pass` every 5 minutes that run `pinentry` # # FIXME this requires `pass` every 5 minutes that run `pinentry`
frequency = "*:0/15"; # frequency = "*:0/15";
preExec = "${pkgs.isync}/bin/mbsync -Ha"; # preExec = "${pkgs.isync}/bin/mbsync -Ha";
# First time run: mu init --maildir ~/.mail --my-address andrea.ciceri@autistici.org # # First time run: mu init --maildir ~/.mail --my-address andrea.ciceri@autistici.org
# TODO Nixify this # # TODO Nixify this
postExec = "${pkgs.mu}/bin/mu index"; # postExec = "${pkgs.mu}/bin/mu index";
}; # };
}; # };
accounts.email = { accounts.email = {
maildirBasePath = ".mail"; # maildirBasePath = ".mail";
accounts.autistici = { accounts.autistici = {
address = "andrea.ciceri@autistici.org"; address = "andrea.ciceri@autistici.org";
gpg = { gpg = {
key = "7A66EEA1E6C598D07D361287A1FC89532D1C565"; key = "7A66EEA1E6C598D07D361287A1FC89532D1C565";
signByDefault = true; signByDefault = true;
}; };
imap.host = "mail.autistici.org"; imap = {
mbsync = { host = "mail.autistici.org";
enable = true; port = 993;
create = "maildir";
}; };
msmtp.enable = true; # mbsync = {
notmuch.enable = true; # enable = true;
# create = "maildir";
# };
# msmtp.enable = true;
# notmuch.enable = true;
primary = true; primary = true;
realName = "Andrea Ciceri"; realName = "Andrea Ciceri";
signature = { signature = {
# text = ''''; text = ''
Andrea Ciceri
'';
showSignature = "append"; showSignature = "append";
}; };
passwordCommand = "${pkgs.pass}/bin/pass show autistici/password"; passwordCommand = "${pkgs.coreutils}/bin/cat ${secrets.autistici-password.path}";
smtp = { smtp = {
host = "smtp.autistici.org"; host = "smtp.autistici.org";
}; };
userName = "andrea.ciceri@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";
};
}; };
} }

View file

@ -28,7 +28,7 @@
# fx_cast # TODO make PR to rycee NUR repo # fx_cast # TODO make PR to rycee NUR repo
]; ];
settings = { settings = {
"browser.startup.homepage" = "https://google.com"; "browser.startup.homepage" = "https://google.it";
"browser.search.region" = "IT"; "browser.search.region" = "IT";
"browser.search.isUS" = false; "browser.search.isUS" = false;
"distribution.searchplugins.defaultLocale" = "it-IT"; "distribution.searchplugins.defaultLocale" = "it-IT";
@ -54,6 +54,19 @@
} }
]; ];
}; };
"Google IT" = {
urls = [
{
template = "https://www.google.it/search";
params = [
{
name = "q";
value = "{searchTerms}";
}
];
}
];
};
}; };
}; };
}; };

View file

@ -4,7 +4,7 @@
email = "andrea.ciceri@autistici.org"; email = "andrea.ciceri@autistici.org";
}; };
in { in {
home.packages = [pkgs.gitoxide]; imports = [../gitui ../lazygit];
programs.git = { programs.git = {
enable = true; enable = true;
package = pkgs.gitAndTools.gitFull; package = pkgs.gitAndTools.gitFull;
@ -18,6 +18,8 @@ in {
user.signingKey = "/home/ccr/.ssh/id_rsa"; user.signingKey = "/home/ccr/.ssh/id_rsa";
gpg.format = "ssh"; gpg.format = "ssh";
commit.gpgsign = true; commit.gpgsign = true;
core.editor = "hx";
}; };
userName = config.name; userName = config.name;
@ -35,7 +37,7 @@ in {
}; };
delta = { delta = {
enable = true; enable = false; # Playing with difftastic at the moment
options = { options = {
features = "decorations"; features = "decorations";
delta = { delta = {
@ -43,5 +45,10 @@ in {
}; };
}; };
}; };
difftastic = {
enable = true;
background = "dark";
};
}; };
} }

View file

@ -0,0 +1,3 @@
{
programs.gitui.enable = true;
}

View file

@ -1,13 +1,12 @@
{ {
config, config,
lib, lib,
pkgs,
... ...
}: { }: {
programs.helix = { programs.helix = {
enable = true; enable = true;
settings = { settings = {
theme = "onedark"; theme = "dracula";
editor = { editor = {
indent-guides.render = true; indent-guides.render = true;
cursor-shape = { cursor-shape = {
@ -15,7 +14,10 @@
normal = "block"; normal = "block";
select = "underline"; 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;
} }

View file

@ -57,12 +57,17 @@ in {
exec-once = ${config.programs.waybar.package}/bin/waybar exec-once = ${config.programs.waybar.package}/bin/waybar
exec-once = ${config.services.mako.package}/bin/mako exec-once = ${config.services.mako.package}/bin/mako
exec-once = ${pkgs.hyprpaper}/bin/hyprpaper exec-once = ${pkgs.hyprpaper}/bin/hyprpaper
exec-once = ${config.programs.thunderbird.package}/bin/thunderbird
windowrulev2 = tile, class:^(Spotify)$ windowrulev2 = tile, class:^(Spotify)$
windowrulev2 = workspace 9, class:^(Spotify)$ windowrulev2 = workspace 9, class:^(Spotify)$
windowrulev2 = workspace 8, class:thunderbird
bind = SUPER , F, exec, firefox bind = SUPER, b, exec, firefox
bind = SUPER , RETURN, exec, ${config.programs.kitty.package}/bin/kitty ${config.programs.kitty.package}/bin/kitty +kitten ssh mothership.fleet 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, x, exec, emacsclient -c
bind = SUPER, y, exec, ${pkgs.waypipe}/bin/waypipe --compress lz4=10 ssh mothership.fleet 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 bind = SUPER, d, exec, ${pkgs.fuzzel}/bin/fuzzel --background-color=253559cc --border-radius=5 --border-width=0
@ -116,14 +121,14 @@ in {
rounding = 4 rounding = 4
blur = true blur = true
blur_size = 3 blur_size = 8
blur_passes = 1 blur_passes = 1
blur_new_optimizations = true blur_new_optimizations = true
drop_shadow = true drop_shadow = true
shadow_range = 4 shadow_range = 4
shadow_render_power = 3 shadow_render_power = 3
col.shadow = rgba(1a1a1aee) col.shadow = rgba(a8cfee11)
} }
animations { animations {

View file

@ -1,4 +1,4 @@
{ {pkgs, ...}: {
programs.kitty = { programs.kitty = {
enable = true; enable = true;
font = { font = {
@ -9,5 +9,49 @@
disable_ligatures = "cursor"; disable_ligatures = "cursor";
confirm_os_window_close = 0; 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
# ''}
# '';
}; };
} }

View file

@ -0,0 +1,12 @@
{pkgs, ...}: {
programs.lazygit = {
enable = true;
settings = {
git.paging = {
colorArg = "always";
useConfig = true;
pager = "${pkgs.delta}/bin/delta --dark --paging=never";
};
};
};
}

View file

@ -0,0 +1,3 @@
{pkgs, ...}: {
home.packages = [pkgs.remmina];
}

View file

@ -76,7 +76,7 @@
case_sensitive: false # set to true to enable case-sensitive completions 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 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 partial: true # set this to false to prevent partial filling of the prompt
algorithm: "prefix" # prefix or fuzzy algorithm: "fuzzy" # prefix or fuzzy
external: { 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 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 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) 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 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 thefuck
htop-vim htop-vim
dig.dnsutils dig.dnsutils
lsof
zsh-completions zsh-completions
nix-zsh-completions nix-zsh-completions
carapace # used by nushell carapace # used by nushell

View file

@ -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 = {};
};
};
};
}

View file

@ -20,6 +20,11 @@
type = lib.types.str; type = lib.types.str;
default = "x86_64-linux"; default = "x86_64-linux";
}; };
colmena = lib.mkOption {
description = "Set colmena.<host>";
type = lib.types.attrs;
default = {};
};
secrets = lib.mkOption { secrets = lib.mkOption {
description = "List of secrets names in the `secrets` folder"; description = "List of secrets names in the `secrets` folder";
type = lib.types.attrsOf (lib.types.submodule ({name, ...}: { type = lib.types.attrsOf (lib.types.submodule ({name, ...}: {
@ -79,6 +84,7 @@
config.overlays = with inputs; [ config.overlays = with inputs; [
agenix.overlays.default agenix.overlays.default
comma.overlays.default comma.overlays.default
helix.overlays.default
nur.overlay nur.overlay
]; ];
})); }));
@ -169,6 +175,7 @@
secrets = { secrets = {
"thinkpad-wireguard-private-key" = {}; "thinkpad-wireguard-private-key" = {};
"cachix-personal-token".owner = "ccr"; "cachix-personal-token".owner = "ccr";
"autistici-password".owner = "ccr";
}; };
}; };
rock5b = { rock5b = {
@ -180,6 +187,7 @@
secrets = { secrets = {
"rock5b-wireguard-private-key" = {}; "rock5b-wireguard-private-key" = {};
}; };
colmena.deployment.buildOnTarget = true;
}; };
pbp = { pbp = {
system = "aarch64-linux"; system = "aarch64-linux";
@ -239,10 +247,12 @@
nodeSpecialArgs = builtins.mapAttrs (name: value: value._module.specialArgs) self.nixosConfigurations; nodeSpecialArgs = builtins.mapAttrs (name: value: value._module.specialArgs) self.nixosConfigurations;
}; };
} }
// builtins.mapAttrs (name: config: { // builtins.mapAttrs (name: host:
imports = config._module.args.modules; lib.recursiveUpdate {
deployment.targetHost = "${name}.fleet"; imports = self.nixosConfigurations.${name}._module.args.modules;
}) deployment.targetHost = "${name}.fleet";
self.nixosConfigurations; }
host.colmena)
config.fleet.hosts;
}; };
} }

View file

@ -19,6 +19,7 @@
"nix-serve" "nix-serve"
"cgit" "cgit"
"docker" "docker"
"binfmt"
]; ];
ccr = { ccr = {
@ -32,6 +33,7 @@
"shell" "shell"
"xdg" "xdg"
"git-workspace" "git-workspace"
"firefox" # used with waypipe
]; ];
packages = with pkgs; [ packages = with pkgs; [
comma comma
@ -59,7 +61,7 @@
nixpkgs.config.joypixels.acceptLicense = true; nixpkgs.config.joypixels.acceptLicense = true;
environment.systemPackages = with pkgs; [waypipe firefox]; environment.systemPackages = with pkgs; [waypipe];
home-manager.users.ccr.gtk = { home-manager.users.ccr.gtk = {
enable = true; enable = true;

View file

@ -12,7 +12,6 @@
format = "gpt"; format = "gpt";
partitions = [ partitions = [
{ {
type = "partition";
name = "ESP"; name = "ESP";
start = "0"; start = "0";
end = "960MiB"; end = "960MiB";
@ -25,7 +24,6 @@
}; };
} }
{ {
type = "partition";
name = "zfs"; name = "zfs";
start = "1GiB"; start = "1GiB";
end = "100%"; end = "100%";
@ -45,7 +43,6 @@
format = "gpt"; format = "gpt";
partitions = [ partitions = [
{ {
type = "partition";
name = "zfs"; name = "zfs";
start = "1GiB"; start = "1GiB";
end = "100%"; end = "100%";
@ -69,7 +66,7 @@
options.acltype = "posix"; options.acltype = "posix";
datasets = { datasets = {
root = { root = {
zfs_type = "filesystem"; type = "zfs_fs";
options = { options = {
mountpoint = "legacy"; mountpoint = "legacy";
autotrim = "on"; autotrim = "on";

View file

@ -9,7 +9,6 @@ _: {
partitions = [ partitions = [
{ {
name = "root"; name = "root";
type = "partition";
start = "1MiB"; start = "1MiB";
end = "-4G"; end = "-4G";
part-type = "primary"; part-type = "primary";
@ -22,7 +21,6 @@ _: {
} }
{ {
name = "swap"; name = "swap";
type = "partition";
start = "-4G"; start = "-4G";
end = "100%"; end = "100%";
part-type = "primary"; part-type = "primary";
@ -42,7 +40,6 @@ _: {
format = "gpt"; format = "gpt";
partitions = [ partitions = [
{ {
type = "partition";
name = "ESP"; name = "ESP";
start = "1MiB"; start = "1MiB";
end = "1024MiB"; end = "1024MiB";
@ -55,7 +52,6 @@ _: {
} }
{ {
name = "home"; name = "home";
type = "partition";
start = "1024MiB"; start = "1024MiB";
end = "100%"; end = "100%";
part-type = "primary"; part-type = "primary";

View file

@ -6,12 +6,16 @@
config, config,
... ...
}: { }: {
imports = fleetModules [ imports =
"common" fleetModules [
"ssh" "common"
"ccr" "ssh"
"wireguard-client" "ccr"
]; "wireguard-client"
]
++ [
./disko.nix
];
ccr.enable = true; ccr.enable = true;
@ -26,64 +30,62 @@
generic-extlinux-compatible.enable = true; generic-extlinux-compatible.enable = true;
}; };
disko = import ./disko.nix {}; # fileSystems."/mnt/film" = {
# device = "//ccr.ydns.eu/film";
fileSystems."/mnt/film" = { # fsType = "cifs";
device = "//ccr.ydns.eu/film"; # options = let
fsType = "cifs"; # credentials = pkgs.writeText "credentials" ''
options = let # username=guest
credentials = pkgs.writeText "credentials" '' # password=
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"];
''; # };
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";
fileSystems."/mnt/archivio" = { # fsType = "cifs";
device = "//ccr.ydns.eu/archivio"; # options = let
fsType = "cifs"; # credentials = pkgs.writeText "credentials" ''
options = let # username=guest
credentials = pkgs.writeText "credentials" '' # password=
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"];
''; # };
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; [ environment.systemPackages = with pkgs; [
kodi-rock5b # kodi-rock5b
cifs-utils cifs-utils
]; ];
users.extraUsers.kodi = { # users.extraUsers.kodi = {
isNormalUser = true; # isNormalUser = true;
uid = 1002; # uid = 1002;
extraGroups = ["video" "input"]; # extraGroups = ["video" "input"];
}; # };
networking.firewall.allowedTCPPorts = [ # networking.firewall.allowedTCPPorts = [
8080 # kodi control # 8080 # kodi control
80 # 80
]; # ];
programs.bash.loginShellInit = '' # programs.bash.loginShellInit = ''
[[ "$(tty)" == '/dev/tty1' ]] && \ # [[ "$(tty)" == '/dev/tty1' ]] && \
[[ "$(whoami)" == 'kodi' ]] && \ # [[ "$(whoami)" == 'kodi' ]] && \
${pkgs.kodi-rock5b}/bin/kodi-standalone # ${pkgs.kodi-rock5b}/bin/kodi-standalone
''; # '';
# Waiting for https://github.com/NixOS/nixpkgs/issues/140304 # Waiting for https://github.com/NixOS/nixpkgs/issues/140304
services.getty = let # services.getty = let
script = pkgs.writeText "login-program.sh" '' # script = pkgs.writeText "login-program.sh" ''
if [[ "$(tty)" == '/dev/tty1' ]]; then # if [[ "$(tty)" == '/dev/tty1' ]]; then
${pkgs.shadow}/bin/login -f kodi; # ${pkgs.shadow}/bin/login -f kodi;
else # else
${pkgs.shadow}/bin/login; # ${pkgs.shadow}/bin/login;
fi # fi
''; # '';
in { # in {
loginProgram = "${pkgs.bash}/bin/sh"; # loginProgram = "${pkgs.bash}/bin/sh";
loginOptions = toString script; # loginOptions = toString script;
extraArgs = ["--skip-login"]; # extraArgs = ["--skip-login"];
}; # };
} }

View file

@ -1,5 +1,10 @@
{emmc ? "/dev/mmcblk0", ...}: { let
devices = { 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 = { disk = {
emmc = { emmc = {
type = "disk"; type = "disk";
@ -9,14 +14,12 @@
format = "gpt"; format = "gpt";
partitions = [ partitions = [
{ {
type = "partition";
start = "32.8kB"; start = "32.8kB";
end = "12.6MB"; end = "12.6MB";
name = "uboot"; name = "uboot";
bootable = true; bootable = true;
} }
{ {
type = "partition";
name = "NIXOS_ROOTFS"; name = "NIXOS_ROOTFS";
start = "13.6MB"; start = "13.6MB";
end = "100%"; 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"
# ];
# };
# };
# };
# };
}; };
}; };
} }

View file

@ -15,7 +15,6 @@
"adb" "adb"
"audio" "audio"
"battery" "battery"
# "binfmt"
"bluetooth" "bluetooth"
"ccr" "ccr"
"common" "common"
@ -43,7 +42,8 @@
"digikam" "digikam"
"discord" "discord"
"element" "element"
"email" # "thunderbird"
"aerc"
"emacs" "emacs"
"firefox" "firefox"
"git" "git"
@ -67,6 +67,7 @@
"steam-run" "steam-run"
"lutris" "lutris"
"wine" "wine"
"remmina"
]; ];
packages = with pkgs; [ packages = with pkgs; [
comma comma
@ -90,7 +91,7 @@
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback]; 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 # 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 # (the default) this is the recommended approach. When using systemd-networkd it's

View file

@ -35,14 +35,14 @@
users.users.root.initialHashedPassword = "$6$EqXfyFLxUZfpmJ8F$UH3pLcHwgLpOZwiSDhdq/iR/p.uyZZYlk6G4Q0S8BtYr3Qt2xKU56Fwv3Mgco.J0i3cx1Nm8XMfvythSuv8gh/"; users.users.root.initialHashedPassword = "$6$EqXfyFLxUZfpmJ8F$UH3pLcHwgLpOZwiSDhdq/iR/p.uyZZYlk6G4Q0S8BtYr3Qt2xKU56Fwv3Mgco.J0i3cx1Nm8XMfvythSuv8gh/";
# TODO: remove this when it will be no more necessary # TODO: remove this when it will be no more necessary
boot.zfs.enableUnstable = true; # boot.zfs.enableUnstable = true;
nixpkgs.overlays = [ # nixpkgs.overlays = [
(self: super: { # (self: super: {
linuxPackages_zen = super.linuxPackages_zen.extend (lpSelf: lpSuper: { # linuxPackages_zen = super.linuxPackages_zen.extend (lpSelf: lpSuper: {
zfsUnstable = lpSuper.zfsUnstable.overrideAttrs (_: { # zfsUnstable = lpSuper.zfsUnstable.overrideAttrs (_: {
meta.broken = false; # meta.broken = false;
}); # });
}); # });
}) # })
]; # ];
} }

View file

@ -18,5 +18,6 @@
oneplus6t = "10.100.0.3"; oneplus6t = "10.100.0.3";
rock5b = "10.100.0.4"; rock5b = "10.100.0.4";
pbp = "10.100.0.5"; pbp = "10.100.0.5";
babbo = "10.100.0.6";
}; };
} }

View file

@ -15,6 +15,7 @@
"ccr" "ccr"
"@wheel" "@wheel"
]; ];
netrc-file = "/etc/nix/netrc";
# Disabled all the substituters, this should be managed at flakes level # Disabled all the substituters, this should be managed at flakes level
# trusted-public-keys = [ # trusted-public-keys = [
# "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" # "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="

View file

@ -1,7 +1,8 @@
{ {
# config,
pkgs, pkgs,
lib, # lib,
fleetFlake, # fleetFlake,
... ...
}: { }: {
security.polkit.enable = true; security.polkit.enable = true;
@ -28,19 +29,78 @@
]; ];
}; };
boot.kernelParams = [ # boot.kernelParams = [
"intel_iommu=on" # "intel_iommu=on"
"iommu=pt" # # "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.kernel.sysctl = {
boot.initrd.preDeviceCommands = '' # "devices/pci0000:00/0000:00:02.0/sriov_numvfs" = 7;
echo "vfio-pci" > /sys/bus/pci/devices/0000:00:02.0/driver_override # };
modprobe -i vfio-pci
'';
# -vnc :0 \ # -vnc :0 \
# -audiodev alsa,id=snd0,out.try-poll=off -device ich9-intel-hda -device hda-output,audiodev=snd0 \ # -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 systemd.services.vm-mara = let
start-vm = pkgs.writeShellApplication { start-vm = pkgs.writeShellApplication {
@ -52,14 +112,14 @@
qemu-system-x86_64 \ qemu-system-x86_64 \
-enable-kvm \ -enable-kvm \
-cpu host,kvm=off \ -cpu host,kvm=on,hv-vendor_id="GenuineIntel" \
-smp 2 \ -smp 4 \
-m 4096 \ -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 \ -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 \ -cdrom /var/lib/vm-mara/virtio-win.iso \
-device nec-usb-xhci,id=usb,bus=pci.0,addr=0x4 \ -device nec-usb-xhci,id=usb,bus=pci.0,addr=0x4 \
-device usb-tablet \ -device usb-tablet \
-device vfio-pci,host=00:02.0 \ -vnc :0 \
-nographic \ -nographic \
-drive file=/var/lib/vm-mara/w10.qcow2 -drive file=/var/lib/vm-mara/w10.qcow2
''; '';

View file

@ -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
# ''

View file

@ -25,17 +25,17 @@
initial-config = fleetFlake.inputs.nixos-generators.nixosGenerate { initial-config = fleetFlake.inputs.nixos-generators.nixosGenerate {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
fleetFlake.inputs.nixos-vscode-server.nixosModule # fleetFlake.inputs.nixos-vscode-server.nixosModule
({ ({
modulesPath, modulesPath,
lib, lib,
config, config,
... ...
}: { }: {
services.vscode-server = { # services.vscode-server = {
enable = true; # enable = true;
enableFHS = true; # enableFHS = true;
}; # };
system.build.qcow = lib.mkForce (import "${toString modulesPath}/../lib/make-disk-image.nix" { system.build.qcow = lib.mkForce (import "${toString modulesPath}/../lib/make-disk-image.nix" {
inherit lib config pkgs; inherit lib config pkgs;
diskSize = 50 * 1024; diskSize = 50 * 1024;

View file

@ -48,6 +48,7 @@
oneplus6t = "O6/tKaA8Hs7OEqi15hV4RwviR6vyCTMYv6ZlhsI+tnI="; oneplus6t = "O6/tKaA8Hs7OEqi15hV4RwviR6vyCTMYv6ZlhsI+tnI=";
rock5b = "bc5giljukT1+ChbbyTLdOfejfR3c8RZ4XoXmQM54nTY="; rock5b = "bc5giljukT1+ChbbyTLdOfejfR3c8RZ4XoXmQM54nTY=";
pbp = "jvfAfQ2ykBndpnoLQTBJzDOhpjMOtIyCufEw+BxMxSc="; pbp = "jvfAfQ2ykBndpnoLQTBJzDOhpjMOtIyCufEw+BxMxSc=";
babbo = "mb1BsvGurWVA6s3uXP1hdEi3YPpzM0vtXD/7Vfsw2HI=";
}; };
mkPeer = hostname: { mkPeer = hostname: {
publicKey = publicKeys."${hostname}"; publicKey = publicKeys."${hostname}";

View file

@ -1,17 +1,32 @@
age-encryption.org/v1 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 -> ssh-rsa QHr3/A
khUhJFKpmTuzviFWehb/ccdgtFfWytGg1+E//EAyvioE4P+M1ZL4LMGG2RQvUdw+ K49Z1HvsQfitU9PNoEjSsaNYEGGnwmZ8SRqTqBht4+JHwRhWSDtG4h9KIiEBmC19
MXdBD0ZCC7f0ImGgRrbmcO19vvaXOYD97ScCJpkS0rFA3nwvpMJuSYuisTO5vvm2 LEczh/9uHpNGUq10xRY/9//tNN96L27DozIthXXyivWN3Oqrb7jDxyW1+mOjUBUK
4GJXzCdwEUCX+DWFlgrLp+aBMb6qZZizkDUOlIePJdEemkgTqCjL2IyVcq33H6zw 3UUOiq55LcYfpO/+6XwAs0NK3iwxhNYw0wYouVGgYDcr7azyL04qjy9GDzR7+12A
uNvk6R7wqharmOz1f4Vy+bliDzWlDh5Y+i/siK07VUtPoVW6MDkQMEvvvPW1/b0I i+WPBesFXi2dkcaCNy28pStYI1dOhrzfYb6aSb3RGMK97OvNyrOri3hHw4pCHqAh
SQ+iZpmZq0MKtH/kmJG6uk347XO1+Sd8bFlNp5iO4qnCFI+iH4fvoxDKL4746/Ak /tfi7dnpd+wluunjrVpoyd/KcSsLgbOgh9F5dZf4a15VP0ZXzRL6ZomXpNRvj1pm
YzLu/4i7LOV90hCFOjNZXgLjFhXdEFEmXv9bAdvNlm7/EgSx918ZEI+ERbCLbwAX HBUb0n1Afl3noddCvHnDHcIZeC8Y40oJMIMXn5qNr8YVISFQ5GfnT5H+GpVUV6C9
lWXwpfEuAiTjvdqIZeyZM7ndFoAnp5Py3rLoQ7AZ5LW2qHIOEcYj9/5LZ6o16ps/ fLvGb0snmno5buDLhEuImiqFbijhYuRX48HYuhOTIh5r25zPrQYnaFR2zwe3PHIG
oNgBeeqjCIWYcHlAGJUh36PU/jGix/ofQFEYaZQvIYzRjYbceg2jJMgoKvwzYbkh c+2FmIuAvXzE2CHndlyzPsHvBp7a8f6J/2ONFSuJLtd6VzfjDBbbnxRO8lj/g6ww
wGzhQRgcjH1bdbYjtHqK8VXtyUC72wnRZ/KD9V9pfgu0ZoUilpjZZpuCxHmaI6y/ Rl8wWLedVSL1bRQVk86vFNcbI4mLkuE1riQJtGcfVvL7cFtyVyMABKc2cKqUiLdV
maW0U1/U87DkGevuV5obD176MfpKYxYb2F6GKgPIl8/Or3ckdqLDWbVKkGBV30yv 2F80lng80yRuDgr8n0VXNjKM+QXG6tnywvznw14dmbHuW+b7t7ejnRFtaDZrj5cF
R/y0S+PJACTly/mFiZSQfOr0oTY8e6I6P7S0UV+ij50 q3VioSN90xPyp/shJrjNxfOdpvJDed9jwCgN9a/uzsA
-> }"^%>-grease I=Ef?N -> ssh-ed25519 GVMLQg 6sMtU+v5Rp8UMxQwecd1czc2fqTJvWc9q9a+Cx0/fFU
lOO/QaBLoVNDwcBSwb4gaIT9QdAlTLQsBv2nmx9TPdVg 7W/E5wbxWlNxgGHsRDTrVtT9IdXTN8cwEH5YsGBJbiU
--- vx7UPleUi1TPlCF/vKQSiRzb+UHyGERUfNPEYz0Ulew -> q-grease 7a< g@'qz# "@lER>}
ä2¥tû<EFBFBD>nrGIÿR»R¾ºU)ßAYhCG0&M4ã~è- q5BEbj5jYAd+eU+dzYOTcOCWiVykVJrl8zXO7rJ5jYYXHA+z4VZj9jA1WeNXhAwc
m41au3hDN4qyZJR7KFeAraU7/vDOP8h8uMNz8r1DzKu7ci0T+Q
--- VZh/APHPZQLIJ2uc5P0ult8Hyijf9hlClEDVhP6HMnM
t-Ž©â‰]ßò‡‘êKÄj&þô}—åå…ÔYê‚ F°v´â :

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -9,6 +9,7 @@ in
"hydra-admin-password.age".publicKeys = [ccr-ssh ccr-gpg mothership]; "hydra-admin-password.age".publicKeys = [ccr-ssh ccr-gpg mothership];
"hydra-github-token.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]; "cache-private-key.age".publicKeys = [ccr-ssh ccr-gpg mothership];
"autistici-password.age".publicKeys = [ccr-ssh ccr-gpg thinkpad];
# WireGuard # WireGuard
"thinkpad-wireguard-private-key.age".publicKeys = [ccr-ssh ccr-gpg thinkpad]; "thinkpad-wireguard-private-key.age".publicKeys = [ccr-ssh ccr-gpg thinkpad];

View file

@ -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„Ò=w0£1˜ìÑäSS±7Šf®€ÎtÕR9_ùz»
K¾ÔŸaáÔWíãy¹üÙ?8a ¶F!¨<>âC(k&Ÿ™Þ'Q±<51>~áX

Binary file not shown.

View file

@ -1,32 +1,32 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-rsa /AagBw -> ssh-rsa /AagBw
MsGA8REbYjo3l2mHo4Gi71x0qgZf5811+/x/is5BAjJj6/U15il4rs7zr9D8XucS bPD7pqnDI+Kl4ywyWsk/Li6wZShB8NgVG5BLNp1b2/hHgisR8ZLCR4UYSIcGJ4G8
pXHdDxCf+/M+M19WG1ch0rzqx8rvERCshFg8NJ8THac/bgeppVhFVkWvOTSw5naj hakiLWQy5xXVJ+Aq/vEBJnFYXxr6OKcHpSnhxaBENuYBKSTnEyH423IEuQJDmf7B
xRIJWlDrllUGY7JHeo07TyUGM9RSyr0lYW8biGQYjmVl6cWidN8vss5chOyOP5wb Inj8fic37q6k+O4XHypBqWJp6mmXJfCX0P0/jJUn81n95Z4Qs2FOlDXaX4fuA6Z3
vy7BPMjBhaXsByu7Qf8CKQQkPynWFrchoJIPPpZXPmWm+EpG88e4CjVm7KlDHhnj VStSP5D7iyK0iAAVDrFzBLhSnwkko0/fQl3/0hQiFBREgAJIL+ucgJXJENhCsQUZ
lW4O/3GKJ4tN2xfIJoSRLCqd6KNXxCy6SSxuDKuhuV01Sy3tsnsT++1HeoVP6OoO uFP1vtpX99b84vCRgp6PJI+8wBd56BYbCTAIKkGoqMPQHEiNMhkSxcEGCoBjn4V/
o9ymDqD0+tlMPqfJpGyHpPvqR1vXNqrtUo8FbTjfH4eYS3F6EVxitreQZgT1jkVV A0EJZ2Xv0nxtXJH3je9Hew+N9Twf03vMcJk6kgH53bkpCj2dNQWHrSRg2ARlgeZU
hixwr/5X1WS1WEzMPPACyIp60cnI1t5KD3kDVWxAqTa4W/q54AnEGB9AViivCK46 GjWE4Vlm1frqNz1Mtm1XTrR9D0tmE/hfq+Do0YziLrf+NGYLoewES18qhwz8gaN/
JkoHqEG8deH0FAcAsUn8R0URiAB+rtB91apcTkjOuOZnU6k76rOZhzr9aeWpe/Td gtxko4/HTD6g0l0J9v0p2LXKGVSamy1EdyVCQT4FG80yGa7aF4qQXSLeZwggO8cv
FMnN/Ywsjz19lm6OWbR/rpGLGCBswgqSV3mho/xH+bfhKLmimhAi1tGKLI0hqXWW t5Q1iRe1eneUEJZuxEFTrpiI4aDazo69dQq9o7pXrdOk2s5yb/woKshjw7JILehy
6r5Bb4e3qhyjkgWGiV3iKBaqq2BqR4PpmiipS5VobDQ+Wpn8WB5d3h5MfW/PvkdH tqvEIRNQkYiYbC7NSFILgarmy7zIXEB5L+UVMMZYknMdLXR/f3ZKQTbc9IH9m08T
nxaF0EQx+Xd+XFeOt8aMSs/yMfia2pfr8CuLSQO35Jg sM5JLtcvsi76x3fXUviejCIBpUZ1slXd0TKTMDcc59k
-> ssh-rsa QHr3/A -> ssh-rsa QHr3/A
JXMKby4Kmsj85jtLZOiYgm7kohB+fVKgu+kHskK5/G7NoxBboOQZSEi7/w1Y1aGX YBeZ2VtymMZ9sXKcKWj1JsWpyCuERj0WXzHNZaMsgIMsmIkM44DFxIc2V1XeDehA
RfT861unu++upcimZOMLvHn2AX81HNqIQzDg5jK+RYja32fZbxCcEsoOoysdp3yD m2OTKCxr3C8hHbhWJAzBqFG7ff2sU1mG0W9iH902hHCDcyOX0cbfsludEQg/cuWH
AjPlsdx/WhsSc2qNgGqhNrB9xyDG/NS3mNVEnHHy2z+3J3VHzjmTho8SU7U8p/tA elbQ7QN+RUysIP8o1fUP4sM1HcZ1ASfarw0bUhiTLvjecFGjEQzS1vGrd7YLqVbx
NLVqaSvJWLl6TJ4+9YMyebQ0MXctDes7V2+UA3Wpq8vUmscBYkwcuJpLMfHnQuKn BtjijHEdgpfQMbqCsy7ItMRwWCo4Ip76eSArJXOFnwW5NkMU7wmGTfknlH3Sej9R
0iaN2fn1+bwK0u4J/1CoMddyzrGL9cd3K00Auf4eRzOC9k7W01RezLwVkJb9RQxD u36+mRY4I1I37JcUK4amjvp+w8thVcN/KsnHgY/6OVZjefLXPxj3i2cQNvB4phqk
TZZsuHWaYhghOQaiubiebk/fyhkKNNsxgD3nwMlAn/TQzLy6NBBrrYHSKH1LkKBl MifWKCTeSj94RFITKh28fUttrVHpOHdTMQb1wxCzAUBE96crHuUGayPTvzSA9xbN
wEW6puPXmG5NA/0lNuzZLT4D7ccNwTR9bTF/q3Jyxmkxq3lqE7ftv1Bd1Tt8DtJt UZqLaeshzE3b60cxxnum5swQ2kYuCx64XB9EzNdscRfPka0Ch4GqO54FlZ40lbL6
z8kSKH5ADE1YL9cHtuSuNXJIYuMHmG+Q2eBSONi6nQtzaRB8uF/9Rzgj5EOIVhx/ 6dH9ybERJZHVltfCSQD+jvJ+vNSbMyfzwrw6mh5ulJh1K1jhAl7Osa1te5RxXz0Z
C0LtRU853rydEBtQR8I1Q4iu4EUXs61GTPoNvG35I61PJSK4uoNedUmk7uV2lAei DHv7QvV/X4DYR5O3duguLWCGCx9l1dTKK0VdhgfZ2AWJKn73T7cH3H1tBNQOq90c
RrIx8RN3sxwoVTnL4FULCWq+PemfrELTTYsLL3IFFbfBBwAlu5+UEJXpH/NIe0O+ OjJih29oXR6utbjwZh2lweALb0P/3WRnqw82xNUL0YYE7gBjRZh95ZV5vAJANsUH
HwyhBp6UeTetc/pKG736MIbkT6i+a7vVLL0NUy8fJTE /3oTkkDBWstKByx4Q0H0XZobLR5DNjjcofnAXGv7hRE
-> ssh-ed25519 q+UPnA wo5ccVlqztN/oNcgzw1n/0HwxsEtnOf5k+9/CdhxCgc -> ssh-ed25519 q+UPnA fO2bIKiRceIJfdFCaN4kjFm6JFpW28JlmXGcEDDSYH8
aVWZ4xQTzZ5BECdxxvdSXocJU/gI1zAzPiYfHwviiuU S5a6wZlQzRTjEJjIcEaZGgLLnjET1k6rVy+iJiHZpsk
-> o2U<(k-grease @Hc&{PY -> >SJD;-u-grease voi9 @}?,:!
jlFeYSSSVqxHuELmo63p24S7YFa8SyoyAqRMiSNcSk08rbegyZqHudEJ00ttF2Zn il9bZwB5V7+rTG9P7qmjnz0woAYWxHMZQM9IqQA9FANmANoGziGgUqi8Jm9gIlfz
VWapzrVLWJp52ri2sEd+YeeDnx/XnFlZ8dU Z6oK6WcgBAuUk+aL8/kkc1rnbQ
--- 0V0dvEHBKMe0sbWmanCZj4akBUK8Lwj+/kga2Tleto4 --- b4DsGZVXpyCXbcswON9xWzMtlVwNlDmz8A23/19Q4y0
Ì`Ô˜¥.@$¡é¢ó-gD<+i<>ºïY‡f <0A>»<C2BB>Är—Mó%M "N, ÅJ§°×c¸ù÷œ´³?&ÎÃ!‡¡<E280A1>â`Ácl‡#æ†nRg§

Binary file not shown.

View file

@ -1,34 +1,35 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-rsa /AagBw -> ssh-rsa /AagBw
DbkYMdbPgGfDlXVKwmSROU5QUy+vdI5touz9rl1cDctmw3FV8pnPst2P0m2YEC1h UaDkuyzSSVgiuntPlEFp+73LDf5zeSi0B/GxTllWFZsz5d2KW/2IXcjxibtU7BP+
538Yax6rLOGO8R2vbs2d/cPVon0cvSlGxfcHCT0C3xqM+fiWCUGJEK3Ry824IhGo rngcpNSnbaeOiwvbhuefFPWs+zUrpvnCTHJMIz4x3wwNnDmof+8E3YG5mwxaKRhc
qq/USK7JckPYhMDy300Ko2bml9Jh2CojyLSy8TpIb7LBhD8Jdb9qg6PRJs6Hxewl Kp8aoecGTehwG6SO0jzZNEauiIZadqtJoRptzaz1OmWF8FZpE/vgapv8H+RJ4Y1h
dyMqLhvbgK8iYjPEFPLDhfB3usux6fqo5KX1ZyyMbQsOvmQfYYp9UfpOTDPcLyS3 Ibqb2v3i5dLl6bqcAt42HqVMioLteIMgElOWzt6ew5qiN864SESrv/XiBz2unGa8
lIiIBmKY3JSDLeRYWLwI+rTRT6u+rKo0oQ8f1Iy+Q05HEsM4eUZEJOqvezPTmseL 3ybINsxt1TYQmf9dTdM80IWAxg5e0ncnXlK/9d73/ZCSyROqo5MawsOX/Z4B46Hi
xyFa8UVkv4p7xAWe7x9i2Ne0bEW16h//Ve6/NWZDfcGHpB9SzhEYdVV/8ibzPfip E4p0IuB1up/OD/KbfswVXapVcCWDxoQN9ww7P1+ai9fIhQLBrsIseDWduq7PNf0d
7x852jBYVKsjHOSRlgug5SUPthSs1thWZkvPHAJlyX1jEiJNzg57PGy8bmCvQtcH z8bO1sIOOVV5dYiZqLzc7nd3QeZFq0XNOvI65dMaoG+jsWsrGgH5Wv15rTkvWjUV
4DAqyKBxEH1pf4gocEU+KcpJQAXjU7job3FHalrU76oAO44s1aK18y02yJnLGDQq 2KmJSmt3HVE6lvDEgKkAv/e5fJ8Fnx8CSE4tF8eANokVrl/c2868gK3v/q9pIf+6
JLe+5RHXXmOicZVZjC8T2eRVBzsXg8tEdGqZtg/umZeCSoCDTH1jJu5Q7Z8OaOp5 ZQNsy65gRjggy2GZoEBUgjFvCQSMcovMJjTlIW4k/JejxQ8FVOALeaylHT4vhkHU
jlEesAMJBVlqKcsC4obYjSRmltD0vYhz+LvnKRLhm5L1FhR2dwac7K9PHs31oBoe mSjKMLeu1heXdbwz5DMaa18eH8jfeSa7njdhjcju08S9JZWQuG8m9X2FYE0DCxfJ
aOwZ6VML2iVzTHHVSU0xEZ+m7SMket7mx5+cqmpzc10 NOdToAN+mXNQfhUNHTyEwIlhpTxQOTG04xW0dkPayyo
-> ssh-rsa QHr3/A -> ssh-rsa QHr3/A
XmQEkYfvXncYfpaqykzISiTHH6hvHJf96auW1sktUG8EjGxJZNgLVNc2jOk2PVH1 PVTZJqeRsm9/zMD/sGiTlMTC0pdVU6A8h0GHEiNVuTNcaDlPclGBEXC63+8PkWs1
PjgoVe4R3OKwgboRDPh/x0zUvPAVXEBE0jZzk9ztzSmdUKZJl83iL4Yp9R9Fp2lR TNicNG3lN/58PMO9dLlxmcZi5TSXK42enLe6Ts0KB7Ulivi6BhQEvUumMvzNXWSr
jyAnaKHgbc/nDMs9USleRS51HQPEHQQuUtsSoL8bikQ6fRvTCHwiQ9Sw3lbS5R0Y VzKj6WDcRjn/En/z+sDScVxgDy374wGFn2/fzhgmwH+jfwae/+XZgFZtuHKkXLRC
idCv5AKIxEj6yNrd+o4LOP2bD1jF2omIUMPX2wlO6EDvgcPT/cbG+WAMl0TrwWx6 oW5Fb75hGI9nMsabNuSjJWQN8lf3Wdc6GnVFDHkbPtDBEC0z/YXjRLVb7qS31JBs
Zbyrnpg2nLwbhnPTO9yoIOR24vu+6+2JKNu8P/qRqQKB/GUES21FRBrJdv7J71rm 37IH3m1UsDbv4IggWaQppSFn6+ngE4g2U1/1lnVYxu3WzcKOaabmbVjg90marTFi
d3/GGHogsNKzyzQDpDN7NsFNu2vxyJUyzfBnnMkLibkaAuGOMam/hGHePH+UiGGY F/QGfdXNmqixkuXOtXGUWIktu1eIIt5b9RmSvCzHOacLq5ougMkXYrGZKyLFClyE
AywMShzHX83yV9Gx0L/AUqiXuYqienPhxEvVF2zBGN+ewGHUt0MuBul6eWY9T5lb pSVufiJGVe4oiFxIPBebyjg2YgPz5oRu/I8McTUlzwuUM+yUzSGAVIqPqQMKR5tb
VMnwXc244IgbOKRWkU5/CZkahHHX+btsXmbu/9xMP1iyHnyoFOUqauThDrbs3Lol 6Yit6XTwOAN/rMzV7d172HC7mtdfCY+FRXeMURiiBNTmsN/gCGusJIFEeFNU0UuB
DH0fm7xe4aRfGxHVqblO7LbDyOb5Elj2UGfW67ep0xiXwO3A4bM5XFrFGMDUOSlJ 6A89l+uUjMQNuvNnKCHhWiSA9Y9DvmOgnmqiUMyEs//qHWC1FbwRBOfIUhKkC8Np
0cHXRnqlE1H4KG9a9VWchOohIv1uEIocm5W5XB9qAd4Pgg3QMwV/xoyXEHB9cR6p vJX4QDjTENOyqbGwAjqkl7Iv2Xcp/d6rgzw5Ej59B9kM5nEMVB3y1ytKegnSMU+m
EchARc9SUZxxH5upbp82BYY1XZTPMbT+pLajTHPjiw8 KXWnoFjM+pFyNF2W+wOyArwbFj+PPTZGluINQcd1ohA
-> ssh-ed25519 q+UPnA FWQNRXVrs2TlKV45LYSDzxcmUgjs7Qo4cyAb6onSNCM -> ssh-ed25519 q+UPnA FrsFa8oY8+T2dvMQ8/V77JrVUAeg9O3DpDnHqXfwLgY
xkeeCDpbGT8jrnWNEt5E4ROUs45+dbuDd3Dgr9uyqBk 7yV5+bjmP1B02/jHRU+s4riDVRE7y42czST1gytMOzg
-> ssh-ed25519 GVMLQg cCpgk4KfQjC9Z3gZ96WZiTRo2vnxa+qzTpD53aNYEHI -> ssh-ed25519 GVMLQg MzINbCmllcxECodOE42h6BL2zf0b3/EfzTE+r/34cwI
nQRe2pxNHdp4OUcCsJQCcXkczttUhca21vUG4tar2e4 QleTPo6m3A2H6dXZ+Ld2GkOPN7GlO1IQ/xswgLfo82E
-> rlWXWhU|-grease ; -> wQD-grease ;Xo|;~
K66M60IV1KtnNp2ZY1xQpsci3Tu744C7GotEC2ObSDkSCvQ5HHeGwgCHKkkYguOU tvXwTNGZyZV8E8uv/CsEpPyO9aEH892yTtZJbPeY+4PAmoSSdF5t3VoURPqsUSOQ
YHKt5DUc0Ww 2Uf4wHLYxwORBel7VZdOK3o4Ei/v
--- Q22uazEiOR61ZC/BLfptzDRsmbACcMX6DTxZTt2+dXU --- csL31FT+UPoGFA9GFYtjRZLcFlG9m+Cti42Z3wLL4kg
©¿¢Ë¿þ€7ë3ßFímïÔbßÔ$&”6|<7C>Òb_¢-Ò¨•£Jã\±3å¿òˆŠ¥ï+;qŽ•*î ªÜ]Î6Û}<7D>Ÿ !± C,ý«Šs¸Y<C2B8>½°Ð&ÒÿgÓQˆtU~ñ~Z<>ˆNkTŽÖ q+­ð®°ZêE…†Ø”0ÌÑù³U=
m~¯<C2BA>¾

View file

@ -1,32 +1,32 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-rsa /AagBw -> ssh-rsa /AagBw
m5zNTTFAfMg/uFR6K5ZQLzUtCHPaCJBGx5Fl1EncRjSCKWrDVfypBewDh14Dd+j7 mRCs3tCcRldQwQRKLfZ38ytXhqFInt2t8T39fvYqQHY5OUMjp3QmqUl+PLwN1ii0
mpzMw+60TLadMEBILbPMVP5Re9v62hWHfhaOuYRW4et1MEk6syd2Dciw72jW2Xb9 wl617MrFyXCVaAVNJjTxsEFg0ClhAqiXKQ1RbU17KgA8iNrTnZUnTeVvK5BI2cEs
ZZRy+zPjh8CulwZY5NM1beJ84DUJvQ0x/RMxmTciZ7COPNMKETLvaAwfUq1Ij4gR 92nOxFSxnhagX16IMPESia3M/uk+XDAFJZA4fPGa8ihwoxtCdTGeJKqSyl2++bP+
enX8DVeB6SQaXfy1S91vrtuINBIY+/XIvH+dgbFtxeBvt3eethmFWu845aDFqUjj /g+6cqt6mz4DGScOTwYN1dQHAVOvFmx+st1/a84LCFjCT2a9qb0XUfAP2EOO8Ylc
85qEIxTwYb4qAtIxrBcf5rFfAFd27wg05NzH8qWoGS/hIAv+pCbKSJSx2F+BaWys TWlfxSz3Z/8xlrIllm6wvTJlt8KZtT3r87O7KiiCzjAhzhkfwWPlhl6r5xSkV7yA
qh04JuSu0y2mIXxVikM85T9kMGRf5YXEDUKmfvgtOlYFgfiYSss12GBy6ed3AcBw YdgLBTv+8tllcOYPk4W7UYrCFJpz31DyoifV+mAVQsETm2HnC6/i5EIawHOcr8qU
41nndgcT6ok1cKQF7M63CQoTWYev32KDnW2Nogm6vWBQBRs48mbj6rDxwNeAv7/W 0PMYKqo6np0fBnRbBAzhf65mp72uIqzBtC43Sg3//ZE6wLB8zzQTfjPQc8E0Eu2B
6Zy2mcsTMcioJv+tCh6e15qbOz82KCzbn58q0eFKiG6OdjgbiPQ0nuBeuUStso5d eKFzdVlIa0seGeAl0DF25QxbLDyKbmBwW7/j0ITSsJAA5ls99x3C/Y8s12HSkbia
FqOFQ+WgCkQ9VtOmkjXG40Rsxp7/HjDSxUBmYpVdXscKD5fmDX5aUXIn0rW4MCO1 Ogbx/6NahlVX/2raRNz0cSggYVUZ9/oDPhkq0jFAN6bRjq8MpbQ48QIbMSpxL3dO
ya/3RGHu5FHXwTM9/O/5oWRf9dvimEPQRhP+19Xz2U7Rh76lKfBg3CyjduQ9zZ60 6jlfh8pbsbpgvUUpqb20/mh7J0h1zKze8682anrt+0aGIzV8oeNxAiMI9DQk+jc2
zTk2UgW6F4KcE+68/CjK5M2oKVYRYGDUYMRcVfFnO14 eOQfJol2Ah3xeJaLF4JM2YweGQwdM0zwRtGSByv4S3c
-> ssh-rsa QHr3/A -> ssh-rsa QHr3/A
IEeaxqUUPfpcKJmzSySq2382mw2dhg5zzzGyDuM6yccWohG9Mh1xok9+im8/7wv1 LjLsLelv0l7opuosBIQhuAfDbOHAIzs2sUGBz1ugargI1i7/pwWq79hyE1Yw2Zcg
rosxC9NDAo0V0FSrwJd3nzm6JiNAHY1Q2ctLLSZn8UmNPbAqh/mDIFF+8gzArJfJ MoM5vIw+P4s4IivOqeI9b05rABGnfTz6WpLra28m9+PfhfCKGEWZNmdrpZdPHddy
yeKR3gZ3w1OBtL1QP2YPvrRJA4sa8qifbqyRnSxQEScsS8xipq/XRFuBJvs5nJgp DqnpI7uY3SHbepU5aJ8DIoK78D8j6yPMzb4Xfb+bKuPTp+k3TAPPdLj/WMe9bNcg
lHrJL60aLRFKbdgXfrpxvSyrxpzXVP8sNZmCYVLwyKlbTOx8CeC19ZMTNioOcLI+ Xdqvi9eW+/YhXQEjYUwOsVR/Dqx6hT6EA/xm2wOgylz+nh3gCqsGY1Jawf+jaloY
n6Q8d8Iozj6wnCBcaVLzPl37klF7CHrOpmYfGtJpRjx/A/Up4IzcYmV1kENkrC53 DpUk5ANNpTgFxLTpxeFrRyU5Sr73d/m3tUk8+5oKvM+oreSgmsKP/MrOCEo45q39
v+WkBrVNw1C0vpqrMbUwEqu6KhFDmrRCJC/Dit/ydVwcqC7Xlk3MEFvrjvcomh8m 59hHXZcApIYel7/L/XZUG/iEgs+Q0rjY0C5DkhmfX9k17nvKMaRD/8JqQeHiy1XJ
Lg9P+jGOHwfWEETSDbnPwygfa0zBli0NdIw/2XoqrIKGplgoCZB0UkgsiwrRyErs tluGUgPigA1XEzaUACVFDLp4H/mPxAXrwpw59mb4/2BXXjbELZ5nL+XAUiHroBiV
Ux2U3q9JaXcvjodqSqClxTJk6BWUfo4pevNR+GYz+yoLMaCHrYZ/r/6huUbcDwru rx+asjfRNYRmI1hSc+IKTsdOLNgclyjCSSMYCeUdLlJv0cMZUNbt3EgsFDaOZWrH
sC6+g00S32gqqlk3uh3UzOEOBgroOqW+T4hxOc7/jMVpCdEgjCH8Z0UcKmXhUJJj SZoeKv0EwaNQO13L33UWByLIdrEc2oRkFviSMU5khYOuT6L1UmPquiwSTm0bbnKO
dlVH/L8Xm8JgwspMBhMBEgYGrn4qH+uWEHa8d81MBQ3GSWQQP5Q/EuBwPHxHdH2j kLRwUk1Z8BYU74SwPzyBUMpjvmRZ0OD0Lqy1ZrBqh7G27Ed82zr0YrtCN+rs0q0A
ZveRsxZzMljORVRKyHHqdRwQZLW529ANmv8xUt+cmjg gOgcVBU9kNNXb9wCM8Wu/wrZSKJiyVI17SOpiL5nJUA
-> ssh-ed25519 q+UPnA KCDnZWCLKS7DRiUFi8uPJgSme9dUtNl6yT6ImKlSa2k -> ssh-ed25519 q+UPnA SKOURuqmzF8WVbF64UwTnsPkRMaOHYeZIQYY3ooq3Ho
A2/mcyY8ZnIOd9z1XMXxCkW31P/A6vnmD0rx7DjNDK4 3oClRo7KuYNGfedEvLN/iRpAcaQjvRA3g+MfO1cTQPw
-> h%z,g.-grease qR*Jt6' C8Y m9CB -> \-grease ^U 6;@ *bF88
rZ28gnIQ06Bz3DluA24+zTNAwbD437Sv4kXKb8+VLveQ/J0c95a58qMOwrgyUUe0 TPvkBe/MvA90EZfXceEXWCeUxX0JfjZiFvQ6HA
CLAJ28w --- 0K++Y9AaDhPyLBvrjsiPzAwAF7E2/A/CxUVIMCGZnB8
--- clHOA1nUvcyaz6oaKcHx2kjLlCxpCDn32QmGZgGZOtM о«G 3m&3¿¿w³‹-X¯~šdÚwžÌÖ÷¯i.;l7®Â6DË
UÚúܪѯ!AÖÆe_/W LQ{ÒLD<4C>cš¶~#'#'fˆ>¸5³`òGä]˜ˆ®bB¿*¶¡.q.¸éÚH²4å q^PÄUµPÌ8>ŒçiؘSX

View file

@ -1,31 +1,31 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-rsa /AagBw -> ssh-rsa /AagBw
JVGa5Masi7sNK7Tx+xAbXqWGjNT6K77Tq1cKsb2yA8q1EAbheZ7bO7+RyizK2HR+ n8OU7HmSYmbVvjKawT2GUQz0f8jxP/q3EkTzS2XyhOmGrU6p0/08FoK7GBACRy92
esK24r1KpnxuSpfraaxQhRszzqKDuc2Wj5yM02LQ4UNxOizGNm5ny7FYtfmBrpx4 96QvGy3uDEYjs4LuEo0wt9GNaFkJ0JacX0epxZWJjYDXwBdlelNvMnqF1a0sEYMH
Uu9M6Svte2SSoJ5AamXxjsauvBaGD16+xhX4eUxJcFAbNDOWC39XlZ/XHngx5Tpu 6tqWFm2sa/qhvh+tOi4kQcaVix6KK0wCpFx3xV20Vgqx/8T0/ixm9eSB6PzQSUKz
QTvhuoV4VEefxPKjmHjBG7VNdvB2+UeAjqx/iGOp5OfzaacLTr2QeOpq+ddkLVaF I32kxhduTlSRFQg+Q5dPYPYcQKNkRbn8QPWp4CXTbV+BE0R97MwnTDs22lBZdZ/x
Bzy5JcZ1mOKAeN6Wc+7prq+LNLBoRWjfdxZv6UQzYLAHvm7d3TxPtpjZXQObrQ7G O/+i9YuWob6Zz4I2csIeABMdhp1yfLSb6yWkrbF67/Dyue1lnRbTKO3qXQ2mZzoj
ubv0W7UAF5J/tUVgX79lSMr2SlyZfcpM19CnboHbMvhvpB97syOKvGaDf9jMAPDU dv2Zu5HXbiOQn7I2Lab5/+G/DOyESf2s9WSp/51j1jFZWFQskbX9eAi6IF0gNjO1
3kUO33Rzmze+16VhisB3w6H0cXDqcgZdvM9stLNgrDOtthV7xKF7UxjbIwWCaNk+ UvIuQVffkaQj/+8huUOLGmPFTkc8uoOWvkb1+aazYssp8z9T30lyxxgnlI5WzmZ0
aTDJ76xbiiMyX9ARQ0J6/z28Z8tvYKBWktejpc+1TfoU2BZY/faiLDIzG57c6ECe X9dhZvg44XVacE74oSuNkTkF2iMC7UdPSZy8AEyFXFIITLsOTnhY+yIpXwS3dxY/
UM5iWrUI5wKqIs+06tC4M2otwwGrJOqC6U9BrCkos+nHZ2cFZwNLwkWcgHvjAFoJ BVWeSVWyPLWfJnjE+K6jT7calxEzwnIqZ8rQlQbekMdqBPBYYNmQJ1Y5Vt1ZlhzE
A/6QJ6nnD1zKDsvsqmpvX7N4rnTo4SNUNKGp6eNi/P7VZQ0fRpFhd/0139I5i3kD 70hj1B07FG6I4wMfhz7M9taDs4RMAcJHlzzo4oPqzWrFz6OlIv6duRxEesAO+gxU
CRQXxQILR8juW4c7YMkm1zQKzXkAV3jJm9fEZ0FVxe8 OYtFoR+Z4cU5wEE6aZGSZ6xz/9k9FJ2n9KqesnLL35s
-> ssh-rsa QHr3/A -> ssh-rsa QHr3/A
dssXG8BUFuAd8ec+8HD4K6YUIGwKFwTyOXEBj4106w21C0+g0ffIeRXJJG7N0v7d n00akF6dB27JrEo1mNV3eAKCQ+8B2AmBAFdNh9R4FMUSd20K1uBJan6PcN6rXjsE
vM3ycxDSJgOLmV/OXRQZCysnk6zdh2Aaz1FV9xFiXbZ1WUfMU/7FbeLjhNMzdf18 lNs0f8nM8iQC6TiHwXlLs03asmXJF+cfJXpLI4rN200ewGOe4va9iZu15FVHe7Cx
f4c1oO9+AYHEV0YhSH0JhTSUj9JkeQ1wG5LQ1Yafls9CCcg0EVNgjXCxTgHS/MzY g7K61thj0qdEpWamx5PUP1O8GS8wgycCHCVfjLrFQBH3HhKgdi/xVnAOG2rhinYw
rDGDokc2RzvqDz83g0ks0o/1M8wntCm3+iI+aCEXILz2AF6Il3Uce7qMmffNpYb2 Yd7yxPL4MHb90I6ovC+Z9bZwGl/HqjQq3Xg8PJGc/03b9TjcxeHZHGjcGcTzRCvj
9hCq7heTUxyewXv2g2F6+DThb/uG5JcRnilAMYnf3Q4LwgytCCfOh1vyvrc6kvqR OEeL8lTy7MY3tE/KFLJZw7q356xXLYVktqXAU9BsVH5q69fPLHR0KslLOXZDrdfM
LRIMjS5ggqD22hmcAwCTGPFN2Eeq3foXKtZ2gC+hXrbBpCC8c+rFElB/IzAT+sn4 rG18P36x8J5Ug75d5rPjEd7GL7w0xMLlUbJ33XCf9703zIJs+K6yb9MP69KQidCa
3K6QRa+Fku6VZrR28iCMffcBCMOXg1axr5aciKjKClOUw5DDyjHD7J75hNQkIe++ cAVvotVKf5Xux8udUEKHIluE60VdlyRAtl/0uEiZl7sqUpzFmgwLAlbaza3LQPfd
vUxnB8viGtnUC8yJNf/AeUG7COKE5ZulcMp4ZPPqvkLrA7c6alpAJCe9wK7AuIev FJ3UaoSBN9VO+M11pk+btlIaRDJqtde43YtBxWodaEA1B3YPvD1jEcPjrUMRxEyV
KlY39UK05Yakdezrj+Tr+FkrdQ5UGG5DbzBskQvoKo9T+sxEL1RMKrCVr34Ynyv3 mtZfRi/091zak8buXiJqbb1BHBLkOISpyXDZTr+RbXhvZGf3zJu6lZPywHUJyGvk
gZwR0Ckklk6aZPnqTC/UltrclOBsr08v01gRr9RE7w39pE4aINqigQbhXTYq8Obn GmmUN4rxKVWUZAHQgrxYWxT1JJI2ki/vKuY0g9c5EmHM2jZwBO7fGF3mqXR/KbPl
9MkEldH6j3119vXmHQ9lkyxIfyF3+kpK2gqZMCjwliM PQroImd1sdxxoCSgMO37r1s6g3QPTh3gsBuql5p7PTk
-> ssh-ed25519 QdXVbg rMspXmlQ2sJ2k0E7L3To2a4+nncH5gkNpVu1Guc2zhY -> ssh-ed25519 QdXVbg DreLBG5eCw+D+quH7G9AamEOfVJz/3ZLu1xBg3kOdlc
RSLNRHow8mP23cxA1irrbPBYUnczSY8xAdHKX/UWtTw 7dNUe4URAsUrDxfANYsPAztuqcss+zDwFh0mcZ5LilM
-> fR>']7s,-grease x -> b-grease 5'OM Lo J
ggBGn4n8gEq508WyofdRCRqDhy60McWIxHDwPbn8FFN4+ID6Wig KMtYSpaN5Y8I4f+TbaXIb8Y/Q0hW+bHCnjg7VwLGKpJORK2GaCC2BdcY
--- ts2g/OfRkv3A9JWQh54T4ve26jsqFKIvMyXXR5rJJYM --- 9Sqj30Ww4CLdmgShuATYUmNV979lL2S4Cr4rty9ejC4
[ Rw²vˆû¹×“MapòU Yžäã¡ÇÔWqr”§[¢F~¾©· Hì}u‡·<E280A1>e0„¦±æ‡^u<>·~•áæŸI> mƒê$1­n5œh€CÊeyÓÐ<C393>ŠÏb(Æ2ˆJ)¨ÎGýŠÖßUä,»ÍZù”+“áo¾QUc#èæ¥a·¤ãZ:I ŽÏºÝhœ3R

View file

@ -1,32 +1,33 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-rsa /AagBw -> ssh-rsa /AagBw
B/b52zRV6ydfeVAOYtFu5g8ysnRXpX8VJWweSTikfAdfRf2c/VZsyb9o2nL0veDp nEt2XVPqkvrqgUEEMbIMLSv+3gVbB6lgFKfktCn5gRtDZ7kj+UeJXknsUAB0W6EE
i1vnhtf4X2LBWFi95ZLQX6gFBgxEnh3hwZwzItzlC6Qx984/8dQQLuTzK7FGUNh6 l+VNWX+eDP+XVTODdrlhqNPbU8dh8v2V/oN3/v5rUMFWKiqdtgrgAhlJv1RUEK6i
QlH2g/Xuf20ddB08RQBo/oP8gHwjS45COXwzUVqRxR+I3HCwt+YitN0XEGXPnvKV 1+0Tf3Jt/fWpC6deZowEyIRryE+n4jxqFW9AYkMpyopD3q2Wiz52yq9XProeUjQy
f7G1daRzaxNl4bky8uNOL8O4CKLLVJQclr/8P1J+URqAyXvFkGhxpcJwNxvm8JyP YhRUERG2JhJD7h7bAK4hP30yvPzpnn4uBqAl0k5U8VJu9hgwMUlld0ERe90OV2ya
Ha3mIY7ZTHWB6gjUeBXTFLAB7YbGvFSS2V54g4c1XuB7CStB48CZZaweJ5EJ3yyp KB8eCt+UHU0Aw9Z5wmx/Ta3sW1JGkxWKWcW53qtE2eqtQ3q9V9keCe+Hfz/aXjon
dKRumP+EtJKe+Er/vqZgry+WQmbXDw7ysupUzXXIZZWG8a0U7SzRBZqt80r6oS5K jwig7rz2hvq35XI32QDEyPpqlVXSKj3BpIplUcmbgFjOhfaLrU5bkpHNmUrKwRZx
RagRTODQIFDwGXvLTeB56s2a9/6C3uaXoJD5STSoR+cMKQhHczHOUyxzMYc8vkwl FRTRK4UGA3acBbCcL26Kb8G4hG+SL5XR/bfUe2iT4jvYf80WiqHrhrXJDU8Mn8bV
hKHhdOSgEPAgHUMGGCRslTyznS4wZE7M2it97iENnb1LYlgxcrh3bspwiPw6iE98 kaOe/uB3GXJ/4Rc0TCE/xVdbyXCcllq9RD3Fr2qLXhekQWjQohT3P68MPWiKdGf6
KoGz0G75Gto+rUBPWTc2kPD4Wtkosb7nC+ZQXor6sMYoT+fv9Ovpn/GwDkTR1ifS 8WTwLcChcBWrX8o6lwhGpvIr5rQfGSlYmJDQRQ9CpAJ+q42MbojKl1i0bBn6Se9M
0dBsXyhjgns4fKqJl9sWCz15NIXS9z6ATvQ2h7vE5xXvFl3Ugxv25arO6LRvM8Yv rK6KQgXFqfyJeU3B6O9VcPl2TwcLf1FfZxjLBHsCyEDMKlVSdzVLBCTgNLX2C437
HGrlwA/xTNTDiHKTULYfoqfPVHbBHI+iKFb7FGxaAB8 fOghbUVbjGnLF1FKtPiB3MZ+i/DEsMuD9AsgMgkOVls
-> ssh-rsa QHr3/A -> ssh-rsa QHr3/A
q8m9pqOuIhGOaTx2ZQx3v36NSeFCh+X/cUOyhGR1Xr9se9Tc+om3GPcxfzKCOHSf fEbJdHtZmTqNkuYaKBUXCIPDX9ro8qJ+Ya8KTUXsHlnITAUCIiY+m7t7TaHGsQ3y
Mg00J+8D28TXMfp/tThFvWcK6oTYNesFqB2EK0xRaF4JLHE8PpdU1Y+nYgXznSfD MN3ysQy6fNwt0YemjJ7rZDe7VD0YkfY5ZRo1BqjSyrfAbsnXdBYgSiTNgLncvBJ+
+nCmTwMtrx71Hts+aAAJuQsIm4y1/oVQLmtw86SHtCF6uYzOL8oTYXByy17YJtpB VN/RI1TmGAi4xlwX4i5cYPUsgs/AdhlpmrgezTOaIktFSscfnIGe+mIJmkR+H5/F
M9Lh63eFNXWBOjFotGN4I4pdrEXzo7aDmWnp2c8U2cDik23IrPTm59taF2fLXVlM seWzmLCIMxIQ3McBtpqa+/utwoBOsJ6uqKN36HWEeuOTe5btyTCCk/tUM2tLbFld
0l3J65RGzZKqgop7wX9WWfqLtmelcaPHtReO5rCy1AGXCxjchSXfbn+iE+glXwhi Hjlgu2BvUM0g1wB9b45Si8x1k5BM8mYH6PqPnYUklH6wNgGDDwLqbxPFn8IBvtPl
7NBvoFZIcCEA4FiR7m9CFaBbTJBpVy5TmCBTXuXMOIFVOeryTdkIuvbCOxxchrTw evyrmWjE033OmrA+1bfrVpaZO2pXzXa+WxQjEfEjjEmKWVq1gPB3Tm1bVktQ13Yp
u0R5YyD0yFbLq2hL5JCQZDPMKK+5GH2wbuXg29pSayCk8Pmg+8RCJzY2imtfHzHV jXbH+rjS+Xmjh0L3p7xTDj6nmhbS8du7LT1zJKcJwCcT9YaGBw+FLZTcPuPfr0zG
u80QMoRnEvFfhJB2sVZ6ugxLLxVxE90wZVILzQK31xyOL9lQuisCnPVEVrc0PBVz OrE90+4zzrxYYVk5agraAFazRrIsrdEdHBh4u9HBGrBlCQllOJ68JU3fe0aGRuFy
7q86HtLgd3wASbK7ylZUu+DO6EsmGERhR4jZnnBXyTxGoLJbJKp8OsN3cWYZdilx NhhXYVRwxd+1439vTBhtY5J/c2yDsIfJn9DLo0xCnEp47KsnEPUqpTLtNEgrVcfg
sGtjX7Pi19IzWh7Rp5kFXaj+5r//6+kBDt97IiY/DSDgspqdRydJL1cw8jbhBVOX VIT8rHwpxrQXzI3My6cSrr/AvG/AZ4sY9caca7vAuE90gtg5IG02P5PlCvQZsJ62
QIKllFjiY00Y5ou7fM9z3kePC5qEP/Q+iGi0K+PnEcM Fc6Aa06YCcY5F7nLEcEco++KLeb0FB5qwEODVSMRcuc
-> ssh-ed25519 EJftvQ pDgNqx9ZlL+7Yo3CPYKNX5VJxwEEo66RoMLLjhrdtRo -> ssh-ed25519 EJftvQ rnQxzjY7jzxxqvDkBZNhJTYY3lCETbDZkk/yFH61RGU
hlSG0ryo4UiycLUDHABOrSxFG63N3VVX04wtw6sNYdc IlbVhjJpxo2BvwadKr8KeGURQJVab2fyjmdwSCw40GQ
-> +^-grease gsd \a.-,gx# S@ 4' -> r-grease x;.PfQP :D-g*XmM !^o%l^I ,RA
AFDfkKtGuVSs3AECvjr2H88xEAJU9NONhxdXwz5KjHJO3PV05KV1b5f3RIZ8PgHc aocdcA5oPweDGp1zOg62Uhn4DoBKztvCDdCRA9FM8gKVjFtlFnaOu3Eaqo9l/cz6
6V8yzgN2mB0bAA s9myQpnSeFBKJrW+HEDk+9xk6TiS4DJiRy0HjXLSDwmUv3GQeQt2kLziPW2s
--- qkw9kh+EGzr8F3LFieA06BoOPkGmiI3Si05l4YfIgLQ --- sPWkDTReAemacGmuPiAf2bzV87c2rvebWA6zsyn7lv4
ÙTSï5`¼|±…ÿC¿pµô'7AÿMCRSÍ+{£j“†j“,{Á.‡a6¼'`Dñ‡39Å( òÜì<10>ipåc‡Ž+\†¶ ~У­³´h
†8ÉŸ¨<1F>©7¹3P:*Mw<LßE#潾߫mÆ<6D>Œ U••šBÞÖo¡Êt“rŠ×MpØÆ

View file

@ -1,32 +1,33 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-rsa /AagBw -> ssh-rsa /AagBw
niXJPzU/BA3kBrRJjPJgNggQjz2xL/kTLsYmMYqk4cmTZDM8Itr3vIfNT1zS5CO1 dEdlYxYTIYcF/wpNflSY7QCSqUSSHjQtXmhZML3mDAeB0P/3DNnCceIU/K+T/GkC
BBOydqNNsC6ELXxmZ66lVTyPQA5IX5yb38yqKm00eDCTBvcIeY0tXdyGZX2l5gv8 K5Yn+VVuIkON4MhojqgbUGJfbHZBKasIlT7x9oqcNWFRI4DFRaQpfX1PuTLqLWu7
jHH5tdLZHNuhg3Bsdx9Lc41zeK51Ge8f+QZBJn5lcpeT8C6JI3eQBfOCJ3jlrSBD cuFarm8Fv50HT0XcxhJq4icbnh/qhu0vkXB4wFjInLbYp9Vf/yIjkriImlY2eUEf
z0rcA7Vi4VjmB/oGh5RCFU07rmK50fHu7/Zn3DDABTORslgEsBtpJDXhgwacO28r 095j/piaEcBUwTzWX9Ii4MIOnBTYroBC6O6EBd+nWBBF7pffVTVO1yUHeeyCfE8M
xP8Y3Z7G25bkBjkM3u9aLm1F3ztplmDVltiTEa5OValtk5dcLYkaFTzInbwnGIJS NYhbdxTdWZxj/KIOPQRBhvi1KxkSE5Qyuw+Yp5NfHxQh43+V0Matyfywa5dhDgIj
b1/dr88QskKvdr9OQHeOIY55rvjWoN7WzVYzPJ2L7a4ZShfpwmr0oGF7ssaKTzwq bPLJZJCqyLP4JUz2+XWp4Hl2L5y8vNZD7YZ+oKkwqCTcgn8gcBTGGAt7quZVdwAS
GG/o5BCn4qR5qONpnb696abjBb3dSCC5CAkj/Z82b9y+p8wBAMtrd8GphU6TxRMR ss4o44xZPFbWulPgVdav9Mk6s2XoSpZSLxYe54UQ0Nwbi9rR8l4wGu8cgiOqq8a+
0CIEPJ81YcuYXwLlujw9F2S++ypEanOAxW5S8N0X2y34EIjRuKgE+JP5/MXJ8M5I /k6/Nj81EkaufxDblOq5pZJA5EQ/IK6SGSuAa+U3TpBi6sDF6xCX32nHoN1jNqr3
K3YXTanGQTfp63Ir6GgpM/+b4N6VqFFKNkoeX8RBFzuN/DPH7wHVlEYB9m15ENLC fZOMb7BoK/VFGgQ1+b57JrYWsAd9mRsDkTtqkRMdbznN+9ODFyfOEnP5LYKfbtZT
5u3JPq/7zuykXLOgVqiewCRINAv55u9sbi60qq5N6XUY4Em5WCyotYXwt+odYMD5 ZfLiUlOrAY+UziscQXKiLYyhmd9URSKC+ZReSTMse2BM15Ruah31rg0XdVYnsrg8
oxgOAOA1unfg68ni2FxlTJen2/vqzPNhCcM/eimE1pA NHYQWjf7SpvTFc5XVWfUl7IrPw2IpTIwWZ5Oxj/BILY
-> ssh-rsa QHr3/A -> ssh-rsa QHr3/A
oDVcokWirXH5BnASkJg8PT6F5qjq6MBaCcpPxVYKitVVr07rs+rQm/zsTW8ld0Po aSNamwfMqGb5x3U9kDuSxvTe4ICjC3GaPvOnYrecJgvKE2V6iqj8tHkmL9KpgbUC
4Dq6E8RLlwxorRYaAzxdZLlLj/JlztNV/1uXC1raYsVE/4F2s+Ak5zjI73HdiMjT pWN2OFTOKdaIibVjXi1p3hW8jVg+wPapcjYB/XOxe3IMhRPDjrhU4HvohL3aFL84
O0SLRw/7wEk494XhHxmdBZa/YuB/fwrA0oEHuXfc3q/wH4dpTVPziYylqVCZR1x6 wCdRi0q14eKB2Tzg3GY5uagMSUZfWjfA0UAAcp4eWKDUbgZ9LKb9z9SWflCuA9Vk
6tKINC9U1K6f+AsyY9eyA7rPSuK4rJMly8dmVB5LAseMdqokqhd90RSJ2m09SM+p ofAcjuG8ZcQXWjNI04mcKWFXiyCay9SMgp9MTaeCbJatwYpmHdBBW3wG5kVqzoIp
k8SK9ApgS1IK0DLYgpt8mpCNe48mq3arBNdJGs/8tT9EqILsRdo/H8nE5bRjnRx/ 2PoFe9bPHuA6NUYTWNlRweXAh3anM8Vf6uaO70ZshcG2af+xN+DWiInYRzbTN5sh
2vvqo0i5MaWr8aUMnjQU69pfmBZhMU+UmKilvUU6wBBskIPH9x8qPj2iGLZxykux QeggyCIscrToPmYSai2NtJwRJ+pXa5N/C8DQ7Cn2JjtuMHqF2qRsMwLMTooQFxFS
iB0JdXV+KMdFFrl7ixZDOGE9KS7kgpoKBxCW/EhD8Lp6KyifqANKQXT2FowNld9z aU+4Q+0o0RUqXynoHVgbNljE0GWP0WBOcMR4u3nmUyU33M6ex3HrvHbaIDbmjulQ
RUDDiT7BvjGCHyIyXyVSQJvmRHXqficG6sZHUKXRux5wpSX2hNukZesFmfuUOV58 qyxKWDCehqZsPgkQPEBcXUpHagJw2cyj4I24/4XGAgUETJ5veowey3ui5G1l357H
kRs3Z7gKeYuslL7uxtXZWduvtKA1wCECWjxCd9HqDINZ17/zBBmhLNVPla0vv+yR 7+G3MMZg7kv56/c1K6TYqgbND3cmTlC3fAYwL9fDQ86e9bOk+xWvuGi6edXrW66C
w9DdD5cPQAQnP0PW0IIpgOmyJBiZm2gp0orxN5LyC+to1k0AjfjjuO/EJqQPVZKC WVTz3M4VhK3CFEsea8JjH0Pv5BN/rweU6S0kt+E0oYGSQq5Z4BYbufKn21bLKq3j
w4euHianbxYgcAXv/5XaHFU+fuq5+acVKFLyRc96Eog 3wMGfFNKaNBx5BL0MS942adYOIbA+6U9mVwpcDZqkrA
-> ssh-ed25519 GVMLQg MoY04NrRrk8O2g33IoJDQ7TvkhZ5R4/NEWgbh0OclWM -> ssh-ed25519 GVMLQg 8/+zuAlv7DSmOpgO6ulpQSkDxDWqJIh0gJEmr8uEPCY
Q0pY7z9eYUr9vC63zexXwB34zDyoz0vycrSqu7ktK60 40yFX3/O5t1vFbYeoYj0aZbG2i0MJ4R1t88J43taLtU
-> }m-grease g -> ^S-grease =
ujgP68SYg6LsIPUSZV8m4tgudJw+slyUt84MVt8+bc2RiH8zhiBojkxZBG9KLahh RJ7w1xO39i6BlR/2CRwWCBXKANAD6Bgd6UDKKn+KmHBiTY8HgNA6RRmhj6+fQ332
uyUbJbnAA+MPKG/R IFkrM4k
--- LXATOIzqIHUjhUSWy2PHY17WNIyAPIajrT3fdTzgVkc --- CtJU7vkH5Lk/ee7X1QxoKu8MXo31Xw2BHA6c8RZOQUU
qñ‰Û~&=ŽÁCJI.G6»£Ë=‡ÞÛÀl€_Áy“È÷­®<C2AD>N»\\ŸilÕ¡º½ ,„õ<12>²»=*<2A>ÂT|#B¯J ý^PÍCkvRðÞ¦Y¸?sÆsg¤MuìÕÏ4<C38F>pDf¯ ÝPø·<%ØãžæÈ¸3X0!¸'6øÉ
î Óm™ŸíT"â