From df98a718a37319d8220ff21d96ac1c571621eecb Mon Sep 17 00:00:00 2001 From: Andre Date: Mon, 23 Sep 2024 13:12:56 -0500 Subject: [PATCH] Shura: screw it, re-enable experimental Gnome stuff --- flake.lock | 18 +++++++++--------- hosts/Shura/default.nix | 2 +- hosts/Shura/hardware-configuration.nix | 3 +++ modules/secrets/default.nix | Bin 4619 -> 4622 bytes modules/services/netdata.nix | 1 + packages/freight-pro.nix | 2 +- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 7319088..41ef6c2 100644 --- a/flake.lock +++ b/flake.lock @@ -252,11 +252,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1726905744, - "narHash": "sha256-xyNtG5C+xvfsnOVEamFe9zCCnuNwk93K/TlFC/4DmCI=", + "lastModified": 1727040444, + "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b493dfd4a8cf9552932179e56ff3b5819a9b8381", + "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", "type": "github" }, "original": { @@ -300,11 +300,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", "type": "github" }, "original": { @@ -316,11 +316,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1726838390, - "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", + "lastModified": 1726969270, + "narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", + "rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075", "type": "github" }, "original": { diff --git a/hosts/Shura/default.nix b/hosts/Shura/default.nix index 7625c8a..a4e380d 100644 --- a/hosts/Shura/default.nix +++ b/hosts/Shura/default.nix @@ -72,7 +72,7 @@ in user = config.users.users.aires.name; }; netdata = { - # FIXME: getting an error "remote node response is not understood, is it Netdata?". Disabling for now + # Disabled until I get Nginx configured to provide a streaming endpoint enable = false; type = "child"; url = config.secrets.services.netdata.url; diff --git a/hosts/Shura/hardware-configuration.nix b/hosts/Shura/hardware-configuration.nix index 460c260..4fc8480 100644 --- a/hosts/Shura/hardware-configuration.nix +++ b/hosts/Shura/hardware-configuration.nix @@ -51,4 +51,7 @@ in AttrKeyboardIntegration=internal ''; }; + + # Limit the number of cores Nix can use + nix.settings.cores = 12; } diff --git a/modules/secrets/default.nix b/modules/secrets/default.nix index 8e8c01b22ff4dcbb1af4952fd5a8b5ea120a1ce7..59b16cf2c3b61905a9c7f10f7671fe7dc997e2a2 100644 GIT binary patch literal 4622 zcmV+p67lT-M@dveQdv+`07t5~xz_Dc)5u8YHrUA;^&`8bhBnF?S7`blujz2~P@oqT z{L!~fS`386+VzNU>WVjJ~VYf#zyKiKZFGZG@6d(g)= z7No)tj@wmE!2m&aC`$Gn6S-S@Z9Wm;xucym%lI!@S{@-R_!9M86T>Q9T(HE96 zWWcSFxksr?``*I^PACww=m+;{!&it%<-gw&pjAm#iICmbg9xwUA|pw>lwA60F#q)~ z$>vMAeF|YFfg;BA$pZJiSmca7kk9fk;zXPyL_Qa2ChkFt@{$mg>cgMEp*s=%@dYz53vKxC7%QGg{g2PtN{qilYu#HoIJo_-;hu3X~*M4nsAmu=> z37rbQ?M`4u>koTXO?<&y zwsohxFldxRjeA8q>1reluNg2dJsluPj4JLSNVr_{hoawMOKU2sVJ=hjvxZa~QW&pZ z;YNldspX-drkc}KY$=+CSbtiqmU{(3T#+0Qj;gj$S(>`g4JrF3HvXOTWH2y->WE_& z^Nb~xekdaB9R@j)SB;6=vyRls;lcT&ADy7$$A{U(U|Wt>*ZfY$BoQZQ9-EoK;2!7A z@swvq@N+o%qnspKPlRu7Y^*OIKa~~DP&{C3$;dJ3P3XtSiF5{Jn7Ju?iy$X|av%Wi zdpgVR>X2~FVgYvHqpCH>c@ZUr1?8<`cdn`bm4s7+x>je437lw;5PEN+K)omVR*3-J zD<+OtpJopKk@9A4(4Ge~xA&iS0nL~G{%A1{gXr??IZi0;%SnqJU7^fFr<3~G=lp9< z!k)&3q`C9>W2nhbSlh?Snzcfa0WL|HeO9Dg$?o0Z3T~McwG@J{eAXWk32`1xo*`Y8 z_qxu46M>J`)9l3c5YxXbKR}!;FkQ%c9`&FJTh|q%K!FF3*_Ns%9}J%0AXIVL6_-ZX zR4+d=^?EJ=c2_l%B29lSaDY)*Y}FavQMsfT$;H(;dWOt5DW<-0m`{#W%C8~Jibs)* zdFs$dgx^I9CEyVd_7kXOvG2bD-V_rp(~FqW1!`9;J#)7K3$BO&+Tfz{K- zf&P^SDUfz%7vuMz<`nWhjDuNi+bdKGsv@9CLtrOYPWX42mEQl+)~#;xF~3_DXCP7& zMmUG*ile@Hz|^1wuq~tpt3LfX@;kNq2`r@Y`ltPjIB3m4^<_rU#=4}{39{2~) z0BB3clU|D8UjsR4Ah%phurU(Z^Xa5Kl#~d1jf)~KdOzZB2o~A~Luq28H6^u)J+oEl zx`?LqG4egE!3<1XnJ6k|y+1JF06T~9IL*vdU!6uz-VVHFH3lPaeoXa_9#^y`go5?4 z#Zhskb7urc|2ej`MH?Y|7d}Bx{?my>w<+tIytCX}Qu+Dj7Sy&2MV|_n>0p;+Od&8vh;lA0 zbx^UtEoBL0v&qcy(h6Dvc>a4r(k;db8Z?b}-Ua7%tJ&(S18ZFw;f)s1d`^3jHPIN~fQa?br@TipA4>f9eRSEst2~d> zafpvABk4mTuSiRmD#Pjo(B6;d&$?uc83a*envvDWr|7cBT`3oXhC|kyME# zSN5z~8O@A78bO;mlML&a=yq4gRYW<70M}LeT~Nl?1!Kiji3(=@;~j5RW{!u%Mp=DH z5X=>X8>=Mbeg`9v8cc@poJ_*P+?YUI%kao}4#Dg97CciET`*3qU~BAjeP*{Rdzl|6QDlPX}u0 z8-68xJs|UxzYlJb__iIuWWCHORPn8!?Xzs;om}{uMeG5u6n>j9Foqvd_H+y{0NQL@ zQM8LO5E)EbBugsc-c_}#hgD469=AqXP|0yzH@B`>sY{|clnp?BF+}tGAiSGksAT~xJ2Al|&8&H~JbN7) zndY*_eSi6QjV`=#MAHfGB=Vmmt6i=#W_$QUfgU~bfsM2 zTc3+J5sFeZ!Z7^QfAWlN{1aLR`raP{3AvmndGfzX4%@ge)H$Zq71Y7=#2+%jO9>5s zPAQeiu`KuV{0MZU$ZD1vh8sHL2K@+M#j>#nUJN!N*ypIKpDORRjFA zosQ2+Pk=Ezzm1tpvxnsjkBc=v(A*u&up7v&$hV{+_8vz3oIPk)6>U2rGIjS)Oh%*v z^t5Cs>TO#1cj>I61@qgco_NuB_$iD&bIBA&sA4|t5PTqa*ovyiTZ_Sl9J@i#;mmA~ zF-EdEd>0V{O??)107`dZY)L>mF<^?c5n1?0)iS>Uc3ts?qww2-8BOi0F3KoCsDOZe zyYZmYEJnBLlBi!s0c=?d-%eulpAs*oR){jX$E)1dWxzj9dyxmu#pjSjWvh)USCYAQ zGo?QYSb524DJhk7-f%vnbg!&gSYqsTz|$Lc68nDExk<)BjxpW_If=M(_R`W_z35N} zrq}IgD3x=OC8^0!GU9(#Jt1R%3AOObY_8tgOLTAc!DL}&WbqJ^! z%UnGNIJfS%i8G)Yw`LU$WOspm#aSx+eNJW|TJlHehfL-{p&3Pqx7D{G$EgByx)W~o_XhRk;Sd+E)To?R=8mdCK_ z2MR|p4bF6|S{gNFUy6F;c)>*|v7Beh^*)itsITvih*R%o4C*!hJ${l8;!#z+2>mlT z@49*>wp^&I$6`y3L^hL^xX)W?Do!hSm@p-U&@hpv?m1fgB?V_mO3&q~9mNayRo^Vr zJZ-_(Qm0YR z2Ym?a%;bqDKQe=+E}J^9VOqJ5?dAL#Y4jV5yt_>7^S|fxZo+Cbyh2}vBO@5cYqa{* zjPc_Fw8Z7){{+o}A!Oe~!@H1brjym07CFMUp^yHngolVF&FN*VCj|=33>s7ln1Bx# zC?u0(V$Q5JiR{zbW!LW`-KXYd0QlOYaefeWPCKsHgOtcoo27nbr01cWmr*KZm&t2#J>$FLCfk z%P+Dfo2a*jI6BK?kCAj@BFh`nUuz?Uh4%8aN=owy`QH593eOwYZuXv2o5|3>W z`WtKjv`aRqv?LoW{9Q&b#VSmQ_qk7eM%l~~xi!kP2pJnQ*!(qNM;&>Rl85%G{TP8F zuz&@vp}K_;07I@utriN#_^&)YKC?I3n3Yn76T2ti%lNNQOt9PS);**-W3#b@ug^ic z>Ei}WaB_d80v&oL!G51A4l?E3erpy?50XXU|Gbxh$>qE#w1;!DPz7eqeRMmA$A9zVu6adG( zq70Zo^k=!q_)HtcQOVhc`cKTrbK8!m0ggrfwOB0>QwOov#IZ(}R@*5Ys|%~UmT|Gc z_HF9x-dh&E80lXbfn*ACjw%G)4}Pnv+TtDDJemVjMgR;7xXke^RD)@F*8|CiZkbGj;An z$!v2F(X{SH>TH>}p=wbzM-9f(12eW~Y=JInLk>Paa9VB)_5Ro}KUv~VHBm7+GI|FK zcMOVJq5p8he7K)vTi6<80%i__|YwIs`&9& z(>t`>4C4B8z)=4S*C9xvbtZizr1YH6N|^BTNfR)1+o6|ij*i)^>qrO&%P;7MnrZ2I zfBbq4N-~7zt?TpI->J1zU;WNQ1|ii65=!ZvpS{S(W#>RZRnnRIGVXt;Q9x~&uoIR9 z?4cH4482Q96y@(aIQU_pEs;;In4pDCVuKZ;Dg1pFp6x>AkQ8ge*%D&Gf+{(@2R8h* z3NN0Df%swHW?ScOPaFEg{Gen2QxTw_d`TIb!P6qU=@7YO10+d~Py%|P1dyX22vFa_ z4ln-MsYY{fC;X!rZ!8bWM>Ihi2&EMNND9vn=}AQLOKhc@12I-Hgq{o2bNSerAV|jV z)9tWwAjA?ELyk}pBrG31VF80K|AQ?bciV#?-cey;KlL=TF41uFF5s6CdEwaWzPl?m zyL=7#PCcYcH(7IKC(b|a4IYvA?8c7QXYCiDnUKzb_kpJSKB{Q4*oxUhd6|%tzn;cw zr!s{Bdw-;pvs$~x=pJ9+{1g&3Bm9)ktdb&%TZz71W{)wX%9T^jc)=lA0GC^xh@vtC zqRVIG?rLbswdEWJ#mH0#&0%#gj}O0@@y;LUqEaVCe~Py<#I%kGEd3{;Gt5tV0z_k2 zl0ziUi=uEIjWQ0dj?-c6-W13VC|8DNNWi=$Rw5>al;1&?l+=nWWAls z4p?NHG^v{^onMt(+oH7^m)!0%ryy770%--1xG2oC2De?8n{3ZGAe)DW`mz!_%EFUT z=wnvxb5=cuS!p;|=#-vq&A9%9bm~ufr*R1!=ce<(@niP;3Vgw3t=sT>3sPwL(Z+1J EE($~N!Tx_1OD_ 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 B>Z1Sv diff --git a/modules/services/netdata.nix b/modules/services/netdata.nix index f35ab60..03e88a3 100644 --- a/modules/services/netdata.nix +++ b/modules/services/netdata.nix @@ -109,6 +109,7 @@ in }; }; # Set up streaming + # FIXME: Requires a non-HTTP port. See https://community.netdata.cloud/t/properly-running-parent-child-nodes/1417/4 configDir = { "stream.conf" = pkgs.writeText "stream.conf" '' [stream] diff --git a/packages/freight-pro.nix b/packages/freight-pro.nix index fe4dd67..f62af38 100644 --- a/packages/freight-pro.nix +++ b/packages/freight-pro.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm644 ${pname}-${version}/*.otf -t $out/share/fonts/opentype + install -m 644 -D Freight-${version}/*.otf -t $out/share/fonts/opentype runHook postInstall '';