From 23440c23d79a49d86fa20033d012f510736644cc Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Fri, 13 Jan 2023 16:58:46 +0100
Subject: [PATCH] Codroipo

---
 hmModules/firefox/default.nix |   3 +--
 modules/nix/default.nix       |   4 ++--
 secrets/cachix.age            | Bin 0 -> 1070 bytes
 secrets/default.nix           |   2 +-
 secrets/mlabs-cachix.age      | Bin 1067 -> 0 bytes
 5 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 secrets/cachix.age
 delete mode 100644 secrets/mlabs-cachix.age

diff --git a/hmModules/firefox/default.nix b/hmModules/firefox/default.nix
index c8a7da4..5e7ac8a 100644
--- a/hmModules/firefox/default.nix
+++ b/hmModules/firefox/default.nix
@@ -11,11 +11,10 @@
         cfg = {
           enableTridactylNative = true;
           enableBrowserpass = true;
-          enableFXCastBridge = true;
+          enableFXCastBridge = pkgs.system == "x86_64-linux";
         };
       };
     extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-      https-everywhere
       privacy-badger
       ublock-origin
       tridactyl
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index e0408f1..5b093ba 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -39,11 +39,11 @@
     optimise.automatic = true;
   };
 
-  age.secrets.mlabs-cachix.file = ../../secrets/mlabs-cachix.age;
+  age.secrets.cachix.file = ../../secrets/cachix.age;
   system.activationScripts = {
     populate-netrc.text = ''
       cat <<EOF> /etc/nix/netrc
-      machine mlabs.cachix.org login x password "$(cat ${config.age.secrets.mlabs-cachix.path})"
+      machine mlabs.cachix.org login x password "$(cat ${config.age.secrets.cachix.path})"
       EOF
     '';
   };
diff --git a/secrets/cachix.age b/secrets/cachix.age
new file mode 100644
index 0000000000000000000000000000000000000000..e09ae5da7bf6ac32b1eef813ab2e3ec24e49c9b0
GIT binary patch
literal 1070
zcmWmC+pF7j003aY8wR{EygbP8z>uk-Ym%m?Ejl$#(xgo<NpougQ*!y`(xge6G)Wto
ziio=5gD*N6D9%j|gE@Us(U&0}*kF$$2)a!X847|v$vGgX-{0^VE~tUXN;k>MkE0`T
z>edSssy)4xWnL}Kj4gpp8+8J*0uvYnaOePuWPrNG$f1X@s4Zia!M0JM)s1P-awnsD
zWi`;2<O&OOl4)rZp1_gr4IvJV$+W-S?Q}Y*&g*?i0sYZzX^~?i^xHwE1)J`0+!NvX
zvTfHlLb1r}T%qYe>n!6E<sq<EorEM%gkX3y^Cx`_E|G*@DsC=F6p|Ju$RgPHz;Zgr
zOuXJqjLCAe!UGdw{XjP$F~wag%$<IBg7C^FT1C^sR{|vrxw1WwBLf}kGcL7C5_DKs
z>E+GQkT%A&iqfM25w9Sz64xea8IukeO>7hM!-PY}9bKPC6(NQ!yUojt?N^Ol!#j<|
zW{gd{+B!=!dTjT*1qm%kM4={AY>J5;lTa11#ZOhN4VV?%Q<8on2bABlsUlN2IoSBT
zX+$H&4;Kra<CG>dhYEk35mlGSHYy;Dxn5=!JduzppUo9OQiT?fJcCa=4GK2(71zW)
zPjUL55R6;+V4Z7FH!~a$-foL2n2$YUDX6^-NGJ=*R4*t8^A6?UD`ZZ#tcFT&7$TUk
zv#MdF{BU4bhUGxjcBSXNdWMnzRgj`F+)h==--d18A%iI~MaYs;Dx35Agp7u(%`BEC
zaZEEqN5p5SI)sLNUue@3nTK9P2@8a8wgqP0s?#I3$rbYkNBW9PjAI}GgsEFuG>eO@
zYPMPeYA1tX3H6i#=gOi2+qq@HD(({vzuC*9kPEr~C`1GkEZ9PevswH9$49}D0OM+I
z3XBYFNfL)a#@ZRT4GN>FB+mo9H?%6ok{x`&M$DW}0u!e7xjJfiO9w%0pp_wS1QHcH
z4BK8y3j#7lx$IJ`7GeGpO-8s(O}U_iYPH&yXm-WepN3+xl4onlU4??=t&uK`aw}pm
z5GdD{aI_*!goae*8P5GnwAg(j`k6U*y!HOCzx-{!{L~xdy}Li1dHBTr&uN!lJ^JV^
zZ=c@(=+v(IgeDuGr58UwZ@zx&%E|JD9|pJcU%vF`wccUl$d3no^vy@!`<l7!^TXF4
zJaF}k=+e!d@3G>>flqf|Jb89!@AUG4YZqMp-G``m_Rm~C-vn2`dHlB<;O@8n*}3nY
y;dh5f_k)Xj-#&KywL=%~diImEH=n$+y8OpiCk}G(^SADOc;~TW$?tc(a{XV^^L@hr

literal 0
HcmV?d00001

diff --git a/secrets/default.nix b/secrets/default.nix
index 803273d..1e637d2 100644
--- a/secrets/default.nix
+++ b/secrets/default.nix
@@ -3,7 +3,7 @@ let
     agenix = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC5cEUx25pnZiH3eBrE2xNbJ92gJiKSznDUNRzcEL4ti6FlJm+75p4q0hgdqHwStR8+uCWBL6viVFCGutOVMFE5MX1Oc3A8fJdR6H9Rrwvk/1UQzqzc9tWxw1qPLKz+fnPDomjOvNofghCWQRwX3Xf1HnIqvRwELpNbR9i+/cHkDGzLJxkstbt4gol8ywMPkw02QdKk8s5MEd1vawxc+7Chs0JPW57RDqDYFErYys52JLeAViCBB9bofF+KT42LuRXKSjWlvCV9kR5TL49vUeBgzMQWMh++WQdN4m9lpqFqYyc75I49/E0HGf8LChDSS+hvRnb5MbtnVGjEA4WDHyldmJCvUNob5CUo4FjoSPRi+S/J3Ads8D4JVwaJOJEVqmMKEhiQ0Hzk4hwe3eV/VumlZj4U/QjaCrqqi4TW/iP0gNRfzcfiM+G/z5R7w1NMUpTX7oilyKjMQmGnXB857D3SSptS7dwh5OiKhVmrQMRCduooUsj236abqLU28K//RnxhOgh8kDGgoUHApnTiMZNKhgLiR42lKrubNcW1tAAqoNyFLMwwXeMLjh0iP1b5y8ntfNPNIcGb7vcwpS24z/aIjW7rQ4J7x5EBphHGhys6ne+irdhOM8c7kFr+c8+Q2oU0YAtFuMYztAFOHm1e20X00Zvys2nuee+hT9F1NungAQ==";
   };
 in {
-  "secrets/mlabs-cachix.age".publicKeys = [keys.agenix];
+  "secrets/cachix.age".publicKeys = [keys.agenix];
   "secrets/autistici-password.age".publicKeys = [keys.agenix];
   "secrets/magit-forge-github-token.age".publicKeys = [keys.agenix];
 }
diff --git a/secrets/mlabs-cachix.age b/secrets/mlabs-cachix.age
deleted file mode 100644
index 5f3f048b3973d69e40fccfa8fb3950b4ab9f7ea1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1067
zcmWmC&#T*X003~2=fHTGQ}7KuJVBq#*w-XY+w`!_G;NwTKboZ9q)A03Ns~0mn%`-g
zqB2lH{PAR<$WS+#CsCZvgNz~S;Z5-%bKnyd{Dt5_@ajWBod3dykKx)CJG9a=&b=ty
ziBh+^K%vTstt^{W(#+VBn6y?UA<IA)jd(TSuqo23HK`1T-TqVuYt72_K&JGG>rY~N
zmhrZ*G_19vnx;7ATXPq~DXm#Tyf(M`Sfb;eHBA}})3STSAmbE&(REj4J;dq`&a_Jz
zp|Ew5%RVKCbGnq55+A}GHXlKjtJLb9jPb{QC-9j`dJ4;Vuhm${D@$^F4C}Y0C04_m
z*;MhxP9$WB;nncgL@x*3By=FQ9e80;RD0YiU`O0sX({=T9ZKbjSehN$<%V!`ErLv@
zK#SqfKwEb@lW}7d0nm|pHVWDFik<Y$EMt)Y66-cnpgu@DFdZi%U<JdL2521QlsFqM
zsS==GKa|yG3`7`k0B{RvO;l%dGHQ4v#S+z8s1K&)IxM+bijfH3V+}+{3}GS86{69c
z4|4>`5Kby+x;vXnI>;f_L5!M{D_P3Uc-&QqoN&gYNK58QXBB0kR8A<yC2fijafg`^
zQ?HliemMine&MXvHK<CrqFPzUj2=I&qm(vxsz`qX1a6&TnB$8aLdqrEh*`{G97zsD
z0w{xkhY^Q?9o-@!dD_LWoK`23<@`n%P{(>Bx7kZAY+N;?7H%v6GM30@_f+Ea!8!?a
zcqYJReHD*O$!`szAPqFFs-mVpVTa3T<mt<#2(uQeSRpp^)pF4e((a%zJXN!a;j}jv
zKq6@IWQ0;TWV(>f_{F$j7GvE69Nr<M`WlJI0(FTljWZx_i+nqdV#i3M{~voND{g8V
znZ5P!adOLA=4`XjPe2Pr66<E(uQwCm2CEiQHrAA@29^uET^kv;+`j7Y{SGa+(UKM>
zWeQ5VLsWxOsc~BBK)mP)ZGueDD1a)J$`&!z@Old4%UmK>sxcUdQg<wn3|TOIZ$URW
z7x1e>QSicoE`G91f4S}K&gQ<t+<6t|-o3j0G<VOxhab53+0jGhI6u1g%%k6&|9<BY
zFT}X#b`D;-{?k_%?*8)9+nc9<H}?eQ++ANEf9vm`2S@%SUw!@x_I~y9L+ww$yZ_~n
zPM&#j@A~=O*H4FUEFOQe{mzpY)W`lIUOT+O{jl)`e$Kph@Ai?84-OTdzu-O_>$iNn
z|Hp&dyE=AL`^tw;{CaGIc<=U?j@_5?XK(%OuOD|4bz8f9$NmSi&6_VBTzl%we^PRI
A$N&HU