From acaa6dc4cfdc807531ca84658997c697673b4ebf Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 25 May 2023 11:30:03 +0200 Subject: [PATCH] chore(nix): use nixos-unstable-small --- .../configuration/graphical-fullblown.nix | 14 +++++++++----- nix/home-manager/profiles/wayland-desktop.nix | 5 +++-- nix/home-manager/programs/waybar.nix | 1 + nix/os/devices/steveej-t14/system.nix | 3 ++- nix/variables/passwords.crypt.nix | Bin 2371 -> 2437 bytes 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 8b8b9c6..2fc9a60 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -6,8 +6,8 @@ packages', ... }: let - pkgsUnstable = pkgs.callPackage nodeFlake.inputs.nixpkgs-unstable.outPath {}; - pkgsMaster = pkgs.callPackage nodeFlake.inputs.nixpkgs-master.outPath {}; + pkgsMaster = nodeFlake.inputs.nixpkgs-master.${pkgs.system}; + pkgsUnstableSmall = nodeFlake.inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system}; in { imports = [ ../profiles/common.nix @@ -40,6 +40,11 @@ in { home.sessionVariables.GOPATH = "$HOME/src/go"; home.sessionVariables.PATH = pkgs.lib.concatStringsSep ":" ["$HOME/.local/bin" "$PATH"]; + # required by logseq as of 2023-05-24 + nixpkgs.config.permittedInsecurePackages = [ + "electron-20.3.11" + ]; + home.packages = [] ++ (with pkgs; [ @@ -174,8 +179,7 @@ in { # Document Processing and Management mendeley evince - pkgsUnstable.logseq - # (pkgsUnstable.logseq.override (_: {electron = pkgs.electron_20;})) + (logseq.override (_: {electron = pkgs.electron_20;})) # File Synchronzation dropbox @@ -227,7 +231,7 @@ in { # openshot-qt # introduces python: screenkey - pkgsUnstable.ledger-live-desktop + pkgsUnstableSmall.ledger-live-desktop ]); systemd.user.startServices = true; diff --git a/nix/home-manager/profiles/wayland-desktop.nix b/nix/home-manager/profiles/wayland-desktop.nix index 4d00c62..c213410 100644 --- a/nix/home-manager/profiles/wayland-desktop.nix +++ b/nix/home-manager/profiles/wayland-desktop.nix @@ -9,6 +9,7 @@ inherit (import ../lib.nix {}) mkSimpleTrayService; nixpkgs-2211 = nodeFlake.inputs.nixpkgs-2211.legacyPackages.${pkgs.system}; + nixpkgs-unstable-small = nodeFlake.inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system}; nixpkgs-wayland' = repoFlake.inputs.nixpkgs-wayland.packages.${pkgs.system}; wayprompt = nixpkgs-wayland'.wayprompt; @@ -60,7 +61,7 @@ in { # xdg-desktop-portal xdg-desktop-portal-wlr # grim - (signal-desktop.overrideAttrs (old: { + (nixpkgs-unstable-small.signal-desktop.overrideAttrs (old: { preFixup = old.preFixup + '' gappsWrapperArgs+=( --add-flags "--enable-features=UseOzonePlatform" @@ -69,7 +70,7 @@ in { ''; })) - ((pkgs.session-desktop.override (old: { + ((nixpkgs-unstable-small.session-desktop.override (old: { inherit (nixpkgs-2211) appimageTools; })) .overrideAttrs(old: { diff --git a/nix/home-manager/programs/waybar.nix b/nix/home-manager/programs/waybar.nix index 00c91fb..c228404 100644 --- a/nix/home-manager/programs/waybar.nix +++ b/nix/home-manager/programs/waybar.nix @@ -4,6 +4,7 @@ home.packages = [ # required by any bar that has a tray plugin pkgs.libappindicator-gtk3 + pkgs.libdbusmenu-gtk3 ]; programs.waybar = { diff --git a/nix/os/devices/steveej-t14/system.nix b/nix/os/devices/steveej-t14/system.nix index 5f7fbf8..e91c806 100644 --- a/nix/os/devices/steveej-t14/system.nix +++ b/nix/os/devices/steveej-t14/system.nix @@ -19,7 +19,7 @@ in { ]; extra-experimental-features = ["impure-derivations"]; - system-features = ["recursive-nix"]; + system-features = ["recursive-nix" "big-parallel"]; }; networking.bridges."virbr1".interfaces = []; @@ -97,6 +97,7 @@ in { enable = true; joinNetworks = [ "93afae5963c547f1" + passwords.zerotier.dweb2023.networkId ]; }; } diff --git a/nix/variables/passwords.crypt.nix b/nix/variables/passwords.crypt.nix index 1cd71a94a47d8b1ccc1c2e6de2b7a52e855566bc..c86ddb12f0d0ed45d0767a431016ad4f33e7b7b7 100644 GIT binary patch literal 2437 zcmZQ@_Y83kiVO&0@I8Ck+o`>JZWoBES3tEb(sD+`R1RG$`e%Dmus#+ zevDs8*Stn-VovPQ&0+}~Ts|G?6Zt;t?_q}Cbgr5oOY2;k5*KGaKf1)|g`JN3bAg^8 zTD$npd)gJHEmyeX!P--#6uhGGv7Wm|!Hmili(UcltVQcr+WzjzyrL6-KIPd$scZfx zYy`X8Z(aGVd}PlorT2W zLIR#!d@z}&&%XQITb=zsH13#n>Ps6iw12;?6#hWFO8D39*H?@MK9^6I&6p!yViUN1 z{_?xGbHx(wZMuGGx7x#N)AD|X7MEWQmso#9Dsw-t`k%^anx;Ydx?2{XoMNh=aeC1M zyNBCtRc&vDe5#x9d4k`E2kSCKrrv0_Ll__C7FlzC|11W>GhlIQs6pMcK4AT-OpZC zIHdBQ?B$*NnLW(kp1G;ADDJmrUgY*Cr}d6;Yb*`C>9}a4#+@&D;yyE{G1gRBKk2nq zxVPZL`IF8kUx{#seM-N=88~;s;#cRqF8*O^Sg@b%*2Q&iN^IBuUKsd+kI#*z)+az# zIObEsw&yEjwpzTI6dU+y*|OyZ&tp9l&%`~}blEyFL;m5<6}O%XpG+=Q@!Pa9Tkc(N zf!l@kiO*HySZY81n(+GDH?!q=QL|J^+4{=Pt@?5ATgSro-m03VGYZb`xcvXBWz{az z7i+xbABPmYog;nk-6kFRhc2%5OJeL8OLZ^rw7k9dVn?~ote8#O4kdYaeVVxC9&dSG z=-B7HW4cO@MBL&<3zZESW3xXz3yrA%R1>IsZr{1ciB838tM~gm`gYgw^l79q7@ZHg znEL;(x>2%%aa&!*(gmNt)E}tZyx>9a)=M?vMkm&=9=TC)_JM8EBLklJ_05g^J~Q7x z^qsFY`R9i0Q1xXMkuLwQIOTWr>xCZqolzqp!Yvvp5f7rb*>HZ15V+jve@pQQC znX+YzMRtR`U(!(t&6vrX);o&3nlRU%UvzC%m*As`Yv*v-M-SRZ_KNBwolr1#MRn~@$QG1iP2w{ z9?0OWwv*^R!ND)#7n^cU>!QoQJC0ZVSEnalc_d<#{e&mR#$?+jvX}Y zbM|KM9}l}cSwFpL=qWDF?z-Nn7Wt{yTak#zU80jyqGD|jv358l&U&?O1a~9CNb0B>)vn$YRWt~ z)>oFtH)CqvhTXT#CndTqjQ7%(b#jlrZS%`{$+OMjDSP_e_q&y;2W<~r&($$`?S#d# z9_k{Yr3FV{O?%!r>1E3q-9N9wmKd=%ZsyFN_IRR>*Szon!`PZ_9b)v={i5z0fuLipm8Z7<0#{H+z?4!4}xI{98PQG9;TsBGW zx}SjOn-8uLYi7PI5erehc~8ziwuUQNROeiHTEc=LmFZ^kz12~@h0mVU&aoJO>PVwGi5c901WKCJM`RR{IQm=bXiTrhQaL?7VFSu4xyJm95y)Fk)ojEF= zdE3QyW_rAyF!}hS4i~`>*MBD*cpH)WJ?5c+nm~NDuXShPTeGfR@#c-c<~LO=JLLXn z*@R}h^amfEY}Pq_*Pc-rWh0O&!e9Bjh}-c`#u7o1484kL@ptQN8)T*=%RTDOQa$yP zeTTyGNKU=5zHpz5M|s;?CiBVd+!<)S&QF|IeCF?Lx$5G=)nVc+6W)4wIcay4{JZGs z{NnSZBhP<4at^Z%{8yr%Q!THM8flnrZYS(7-9@yLXKR zW_fBs@snog=(%25Vfu-Qp<3=p(u#_+S8mG5C9Re`v!G10{=l;h+c=)H`5!-X zDxm3jVnpnUwN~@wKHFAp@mt}aS#?)XK{iF{jKJLqDVeM7*Lq&uQD+uBcb<>YtzM4F zYo45}DxI}^-2ti7+Kz`cgSCtNiz^zxyx*~ar>3?;sF7ud^+CHoo0T8T-ZhPVa(c+u ze*TYtc00>_oAvwIY3Fx#t=ue@24~qe*}i>$?2hn-z|<37e!m27N40+6`AD8;Jv4|i_!zilX5KFv%-hc`gcV|mcW zqw?Qbqc?OOw_nG&`sCrAFE4&&+xSzmP(|HL@ApIb8Mki-`#v#D+P(bts~jP9Ya{8x zd4)@Te$KN}e|N{QaS48^|tlYsfDR;1to>zU3E+@q$E!h zWvuSg$>|lmVcF#9#WP{xK`F@UCw&vln-@YGg*x zo>@m`F28keVNS-!eN`=nn`@&44yuStcWM^Zl(e6B?@?m0zn7Mkx8d2BHT^qpSnqbz zTIo8!B=Y>_6YDHXm8Ta> zj6U8MyLhh!EV=sJ^G3PY`X!4rm>S~e&8us0iT+R#IP>nco3p;n&|f`2FZP?cP1$kd zm%9ArLCKDt@qbeN+Rjf~V3M&q?wWUgP|EuU#^r20)5WYg)`!1d>)gCBJ*_+c_$-$f z=Bfs7TMaWG)bdT2^6f~QTzY5T1Ev!T3%+yTy~Je^xVZe(!)um$`%Gg0MzFX(TQ4*lZ(MPFD`V8|U6&X5$EYPp)p!=M zIBC19g(oUDov`1!=Bi-4hS>K-Vr%}Nl+AVBa#XPYd8i~)uj%Pq*A`UPC9aCy?y>7l zTDkj86Vuu6eC_N4)ueu;)-O~QZHqs3>11ifO=Gs%ho@-9WZl?z;Kjeg36H#YE^t^? z|D>^Ql}G;U9@#02TiYF#HmKTo?Jk~p+TegnL}01ygaz40=EdB5V}9}1i`uFh^{%r1 zUbg&%9gmkj^LhT!uS}W~G#nit{5`g1+L?qy(Lqc+K>_`5N*l8{WlO(F zZ{GW$@7#wwA0}+Iadp*sUT0sqhHqcyQf?{v{@~hLA>T94FTeBK!7b?`DR0gteDID= z|Gw^b{&QEq@+wGOe>8dGiI-Zjwr`9#Ur~Lt>X^og8Q1D3`E1=c`SVA?Za!I_1LhX9 zgDe?JuT+IJSx0$VWxH(QeHdI@dXaVi8z0HC>E*|U`1^TZ7aA2`TD6}4k+_W8$Aah?*CWpNhI2U!IB#NY zd-q1=SSFY9k;-#Id-GSdvrbub$!}ZgqmYxT zb0^&jzu5IkT3J}=kepkL&+E+1wKL{dHn`NjRTDiq#VaSGz1Ael+B}kLuIy|*hofOV zTY1yXr@!?{i2tPbw0tdNBs;%5%g>pT5i)zK16$wjEuL5LoWHBAiv7H8g_hOP32V;l zAI&`^6=Yg@wK~V3$40NY%zD{^?e&*g{B7eZwQby0{Y4KfNLcu4z2uRb>PxQN$!}y1 z%c+0Q`9S1W^L?vFGqOv+UzA{C+W+%f%7>Yoa`ZHEr(e>O{IyT^NXGw{E8a=WXcB*M zwqSSk{EXRhXVnsCq*u?nAb8XNd*_*FRyCd;$J6%Q%Q&9C#i-##t$yJO>F|~Dx!e{V zd#HO~SUdatR3}zV5U#_3lW|O_)@zIv3io-8E-u{i@(VHM2 z`)w-kUDh`z>~{t(TbTD*-|Fki{iX%G&iAuf6paKS=X0U%zGYyKU|E`{Z&QTw??8 zi8tG3*8Y2~$h7X)j%yoc=mjQMukPJb>yz8}35ge)GE8dTG3VNk&WmP!rC0r?^dIkk_Cqte zUo|`VVprMflk*)}e((G{d-vyemNyzTiyMNyN+v{SB#J+9Dah)QZ8iGf@7a=VSggGM zq+G|U536^7%KRr8es%a{nTB7|E7!Q zsjc3ALbZVL_I>90&b-mlvyW|EccX&muCTX5wpbf3Y-s@BAO{=N)|&EOh_YwLfhy+O)&YnVp{DZ20D9 zc|cZJdWx#Q`tzIv)7Iu*m+i8AXT)T{7azLs_16&3g;KBXsrfIM@yF`^jRjZsJ=L?A z$ndQuXp@|AicHe_t*i}yy|z}&na)`8@69ih0H5s8m+jq*F;Q8fntQ7iGv8-lci$mZ z-`pwoaMHs3;{FP`v$x}g7ImiNU+FSFdpG;(T=l(v>|O_U+55eVVw`&GS1SXbWev;9 z+%&bMb65Q(mVY_H_x)vH{kAh3x3OI@bX`8xIbTLhyL8jb-OJxpRy^TP<2z@(k9Efu IgW23O0ZN^mVgLXD