From 56fed868b0d16982bf479e3b07d16bf673dfe259 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 29 May 2024 09:50:32 +0200 Subject: [PATCH] Streamline formatting of function arguments --- home.nix | 7 ++++++- home/accounts.nix | Bin 2850 -> 2855 bytes home/dconf.nix | 4 +++- home/gtk.nix | 5 ++++- home/modules/programs/cmus.nix | 7 ++++++- home/modules/programs/khal-notification.nix | 7 ++++++- home/modules/programs/languagetool.nix | 7 ++++++- home/modules/programs/mailhog.nix | 7 ++++++- home/modules/programs/my-pidgin.nix | 6 +++++- home/packages.nix | 5 ++++- home/packages/custom/backup/default.nix | 8 ++++---- home/packages/custom/default.nix | 2 +- .../packages/custom/dmenu-scripts/default.nix | 14 +++++++------- .../custom/nextcloud-sync/from-local.nix | 4 ++-- .../custom/nextcloud-sync/from-remote.nix | 4 ++-- home/packages/custom/project/default.nix | 8 ++++---- .../custom/push-etckeeper/default.nix | 4 ++-- .../default.nix | 4 ++-- .../typo3-documentation-rendering/default.nix | 4 ++-- .../custom/update-nixos-system/default.nix | 4 +++- .../packages/custom/update-system/default.nix | 4 +++- .../custom/update-ubuntu-system/default.nix | 2 +- .../custom/vpn-reuter-dynamics/default.nix | Bin 558 -> 557 bytes .../packages/custom/zcat-progress/default.nix | 4 ++-- home/packages/purple-events/default.nix | 14 +++++++------- home/packages/purple-libnotify/default.nix | 16 ++++++++-------- home/packages/purple-mattermost/default.nix | 16 ++++++++-------- .../purple-microsoft-teams/default.nix | 12 ++++++------ home/packages/sqlformat/default.nix | 4 ++-- home/programs/fzf.nix | 2 +- home/programs/git.nix | 4 +++- home/programs/gpg.nix | 4 +++- home/programs/htop.nix | 4 +++- home/programs/jq.nix | 5 ++++- home/programs/khal.nix | 4 +++- home/programs/nix.nix | 4 +++- home/programs/tmux.nix | 4 +++- home/programs/zsh.nix | 5 ++++- home/qt.nix | 4 +++- home/services.nix | 6 +++++- home/services/batteryicon.nix | 4 +++- home/services/dunst.nix | 4 +++- home/services/gpg-agent.nix | 4 +++- home/systemd.nix | 5 ++++- home/xdg.nix | 4 +++- home/xsession.nix | 6 +++++- 46 files changed, 168 insertions(+), 88 deletions(-) diff --git a/home.nix b/home.nix index 1d33ef8..c3146c5 100644 --- a/home.nix +++ b/home.nix @@ -1,4 +1,9 @@ -{ config, pkgs, lib, ... }: +{ + config + ,pkgs + ,lib + ,... +}: let ownLib = import ./home/packages/lib; diff --git a/home/accounts.nix b/home/accounts.nix index 8006af3dc60a0e84ba2745164f12ca967a4a78f3..265ce85b2fffe2ba871ca1744fb78bfee37130fc 100644 GIT binary patch literal 2855 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 FP*)snlf(c3 literal 2850 zcmV+-3*GbpM@dveQdv+`065sOq3;aI6)g)Y)!!==wx}j~=H5NjaxjjJ;YP>N57ck2 z{)06|;wl__UWWU+WL#*M0+>pMj2d0mP4|FOM-s;u+Rub(>6=v^$)RYsQA;ryuF z4_8>g@^dQn?!Tgv4rePE^ku+S+YfwammQQv1A^|zOCnX= zZb$FKmee9A8<0*VHV(R{-Mh|{!LwStehgFr05GI~D%;Yc|0rVRM-G5PL>8bqKOXQ| zYdGZ_r)Bd&VAPt>K(fmi(bWu1#fs!77Cl8z9@~k2X zjdb;DK#}BNl9-yo&;o#h)FLJIr)q<9m8Y=@Bh_E7>(}o!J6i}=QG|HSWKZauZ606f zerg}@*-spyiz))+9Tl5e|4aiu2+@wz^@jzAxns(Oc& z3$tUdF~ZPkxi5Nue2|_%#DewBP&N_=YOPVqrdoU3kvEEhoiQ)uYOPu~=&Su;0 zyb*75dL#mYENQiO*YQZ$fa#2)g@$qi-6M=7Cg9jGq>cH7Gs6rJz2+4e6-hY zfFHxm5lHZlxhsrDRgKy3^-WPleQg6hA5{H3^$YhP9_Mb2s678C~1Y%Z>fP z>$4o2D-`7F{+L2=Q9_%G@1E z4IhrLqAFD|NbvK$2(vW-gxFi&B2T()dKm@^s0$24cIRHrC{RE0IjGD@B%by5ek0e0 z%;FR=DnUip$-SBXu-6yq_9eznRCGIq z5lWI5`aPI+mD=P2%JsuhVjVd9SHos$`uHyT7h$;?=(z>5A|!`yH4tj9q}cPeo0@S-f= z3kd`6Fst$_u%|AZbh!WW8$1uwYZN`Qyj;uF2|x5Sff=QDK0}Ll6p;<+ga2W})VqIx zPBZC&22L25$*kgP!1-g9A|!ltHy!8(X6$V*XCB5TLD=)kAQ9$4&Aw#$D;aCY3SYN} zM7wsio&>Gx>HVkUh1`-EX5D~C1FSQvQGG2U-sr!*izAF$d!Twt!lt9_UHUebL;P0) z(jF{=q;p^mo`V>!hC{D|fP6l5$-{I(?(?Xygl_5^+-ICLyr4Ue%6J;qL`(<7aM~(k4txw4>*bZb?*4A|?%_Kf-YP!Rp3Cd0DmuC8{A!A?t z)I?bAu~+`p?u@K?15VUam6)+=Z0Dzxwb2iT4jwmKrm&EcS=RNu_ny zKyD!u;e7}};KPUY*boz5$GzZwJU<0Mia@-K={oLjY2H1X=S@B{!>QJ(cKX~R0Iy|M zwl$X*D+gf{6A0%#QenFxsfI{8Dj&ZgjIfQiS-y0>j{1{M6Cc@9lM^}@0H}(?if1`; zl`M1PtNbq)_PN2^aB)A^8;sVdz|Hr&`Eo1Cn(gd23N3$iWZ^3xIBS0Qc4&YH#tj5# zWMPOVV-ceEs(qtwKQiYP$`M$l~rEx77d$UEgTqlMx|>?v4kjl*4Lhh$fSNAni$ zu$vb~@28zL{ITG_uHzObrI54@u^wG=DK+-~BxAYMCOd^Y9gn`|bG9}W#ynH-qp;Pw zLNA+C4W0&pc4mw80w?XhHWb=8kx724nH!pV6Zzchxc2|^w|?H@S`N}geA14l!Jci8 AhyVZp diff --git a/home/dconf.nix b/home/dconf.nix index d6f5697..dc90c13 100644 --- a/home/dconf.nix +++ b/home/dconf.nix @@ -1,4 +1,6 @@ -{ lib }: +{ + lib +}: { enable = true; diff --git a/home/gtk.nix b/home/gtk.nix index 6eec37b..9211fd7 100644 --- a/home/gtk.nix +++ b/home/gtk.nix @@ -1,4 +1,7 @@ -{ config, pkgs }: +{ + config + ,pkgs +}: # Possible alternatives: # https://github.com/FedoraQt/adwaita-qt diff --git a/home/modules/programs/cmus.nix b/home/modules/programs/cmus.nix index 0ec267d..a7be242 100644 --- a/home/modules/programs/cmus.nix +++ b/home/modules/programs/cmus.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config + ,lib + ,pkgs + ,... +}: with lib; diff --git a/home/modules/programs/khal-notification.nix b/home/modules/programs/khal-notification.nix index 71b64ee..2d40203 100644 --- a/home/modules/programs/khal-notification.nix +++ b/home/modules/programs/khal-notification.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config + ,lib + ,pkgs + ,... +}: with lib; diff --git a/home/modules/programs/languagetool.nix b/home/modules/programs/languagetool.nix index b3d3535..cec1e16 100644 --- a/home/modules/programs/languagetool.nix +++ b/home/modules/programs/languagetool.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config + ,lib + ,pkgs + ,... +}: with lib; diff --git a/home/modules/programs/mailhog.nix b/home/modules/programs/mailhog.nix index 080e3ba..b58c03b 100644 --- a/home/modules/programs/mailhog.nix +++ b/home/modules/programs/mailhog.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config + ,lib + ,pkgs + ,... +}: with lib; diff --git a/home/modules/programs/my-pidgin.nix b/home/modules/programs/my-pidgin.nix index a31dd6b..af7d044 100644 --- a/home/modules/programs/my-pidgin.nix +++ b/home/modules/programs/my-pidgin.nix @@ -1,4 +1,8 @@ -{ config, pkgs, ... }: +{ + config + ,pkgs + ,... +}: { config = { diff --git a/home/packages.nix b/home/packages.nix index e437809..1ae5432 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -1,4 +1,7 @@ -{ pkgs, ownLib }: +{ + pkgs + ,ownLib +}: with pkgs; [ nix diff --git a/home/packages/custom/backup/default.nix b/home/packages/custom/backup/default.nix index 8cf576c..e00de7f 100644 --- a/home/packages/custom/backup/default.nix +++ b/home/packages/custom/backup/default.nix @@ -1,9 +1,9 @@ { writeShellApplication - , borgbackup - , git - , rsync - , callPackage + ,borgbackup + ,git + ,rsync + ,callPackage }: writeShellApplication { diff --git a/home/packages/custom/default.nix b/home/packages/custom/default.nix index 8a97d38..f9b5702 100644 --- a/home/packages/custom/default.nix +++ b/home/packages/custom/default.nix @@ -1,6 +1,6 @@ { callPackage - , ownLib + ,ownLib }: [ diff --git a/home/packages/custom/dmenu-scripts/default.nix b/home/packages/custom/dmenu-scripts/default.nix index c4efd12..62048eb 100644 --- a/home/packages/custom/dmenu-scripts/default.nix +++ b/home/packages/custom/dmenu-scripts/default.nix @@ -1,11 +1,11 @@ { - writeShellApplication, - dmenu, - dunst, - libnotify, - bc, - i3, - xdg-utils + writeShellApplication + ,dmenu + ,dunst + ,libnotify + ,bc + ,i3 + ,xdg-utils }: let diff --git a/home/packages/custom/nextcloud-sync/from-local.nix b/home/packages/custom/nextcloud-sync/from-local.nix index da04bda..84cc129 100644 --- a/home/packages/custom/nextcloud-sync/from-local.nix +++ b/home/packages/custom/nextcloud-sync/from-local.nix @@ -1,6 +1,6 @@ { - writeShellApplication, - rclone + writeShellApplication + ,rclone }: writeShellApplication { diff --git a/home/packages/custom/nextcloud-sync/from-remote.nix b/home/packages/custom/nextcloud-sync/from-remote.nix index 44be9d4..84a2447 100644 --- a/home/packages/custom/nextcloud-sync/from-remote.nix +++ b/home/packages/custom/nextcloud-sync/from-remote.nix @@ -1,6 +1,6 @@ { - writeShellApplication, - rclone + writeShellApplication + ,rclone }: writeShellApplication { diff --git a/home/packages/custom/project/default.nix b/home/packages/custom/project/default.nix index 91ea56b..539156b 100644 --- a/home/packages/custom/project/default.nix +++ b/home/packages/custom/project/default.nix @@ -1,8 +1,8 @@ { - writeShellApplication, - bash, - gnused, - ownLib + writeShellApplication + ,bash + ,gnused + ,ownLib }: let diff --git a/home/packages/custom/push-etckeeper/default.nix b/home/packages/custom/push-etckeeper/default.nix index e136ce2..275f397 100644 --- a/home/packages/custom/push-etckeeper/default.nix +++ b/home/packages/custom/push-etckeeper/default.nix @@ -1,6 +1,6 @@ { - writeShellApplication, - git + writeShellApplication + ,git }: writeShellApplication { diff --git a/home/packages/custom/typo3-documentation-rendering-old/default.nix b/home/packages/custom/typo3-documentation-rendering-old/default.nix index eaf5cac..3f54ce6 100644 --- a/home/packages/custom/typo3-documentation-rendering-old/default.nix +++ b/home/packages/custom/typo3-documentation-rendering-old/default.nix @@ -1,6 +1,6 @@ { - writeShellApplication, - podman + writeShellApplication + ,podman }: writeShellApplication { diff --git a/home/packages/custom/typo3-documentation-rendering/default.nix b/home/packages/custom/typo3-documentation-rendering/default.nix index 20419b9..28e39aa 100644 --- a/home/packages/custom/typo3-documentation-rendering/default.nix +++ b/home/packages/custom/typo3-documentation-rendering/default.nix @@ -1,6 +1,6 @@ { - writeShellApplication, - podman + writeShellApplication + ,podman }: writeShellApplication { diff --git a/home/packages/custom/update-nixos-system/default.nix b/home/packages/custom/update-nixos-system/default.nix index a659388..1ecdae3 100644 --- a/home/packages/custom/update-nixos-system/default.nix +++ b/home/packages/custom/update-nixos-system/default.nix @@ -1,4 +1,6 @@ -{ writeShellApplication }: +{ + writeShellApplication +}: writeShellApplication { name = "custom-update-operating-system"; diff --git a/home/packages/custom/update-system/default.nix b/home/packages/custom/update-system/default.nix index bf43bdd..8f9bbf6 100644 --- a/home/packages/custom/update-system/default.nix +++ b/home/packages/custom/update-system/default.nix @@ -1,4 +1,6 @@ -{ writeShellApplication }: +{ + writeShellApplication +}: writeShellApplication { name = "custom-update-system"; diff --git a/home/packages/custom/update-ubuntu-system/default.nix b/home/packages/custom/update-ubuntu-system/default.nix index dfc2ba1..29ab25d 100644 --- a/home/packages/custom/update-ubuntu-system/default.nix +++ b/home/packages/custom/update-ubuntu-system/default.nix @@ -1,6 +1,6 @@ { writeShellApplication - , callPackage + ,callPackage }: writeShellApplication { diff --git a/home/packages/custom/vpn-reuter-dynamics/default.nix b/home/packages/custom/vpn-reuter-dynamics/default.nix index a8ae5424b12dc0e7b65b7d0a11861fca9713eccf..31d2a6412312544b18daf648a26696c3ffc658ac 100644 GIT binary patch literal 557 zcmV+|0@D2eM@dveQdv+`0Bw3#wwb*^Ok2YDmlKN$XxVn5Oe@FRy$n?^G zw_q8C8SdtD5C}ha2EE#(;Yp5AaV_pdbDALf*ob?DAseQ&X9V+jjkXpfLIXauS%~dw zm|4po0m!3;^EUMrpRAw0+E40dPmri&=g30$BdEU1t2sS3YT4$qW*dTGK<9>5E*|@` zi@y{1|DDS;$|e)x$m>z4A2Y_Fm~GMykj03;9*F3ulE)?{<$I#9j>?72@L%C@Q>AML zWuX<|1HYJh2Xaul4^z18dG{DigqX!)U`4${l~cbMoAaG?kLt9u4O$MY=ohiByrBmTqmz$lrp(5*;oV`_1ZMuz*%%mx*%B84ch+DDi z;d3VdYriI3=^+b7Kq&fVduu#knF!L6X=9#N9(6y*AE1DcO{~Sa+~W*6LJ?X_-s%C< z0|NvGjsh^hQqp{;t;-v>+1WjFKA4^%?ZYsV4-QV0Mwxo{<8`Ly(G%53Jozn9nhK-@ zTuuP>#nZ50JPKq8YYstPrFEvBNXNhfM7GX;?v9C5NBKhC`IA#+8-{!bYqz_A+UFY}Ph@ZhSZy6`nM}C`YmbM18!ypx8 literal 558 zcmV+}0@3{dM@dveQdv+`0GGVqgKx{uFpYK=zpM`Wns}<Zf8E9CSeG=_V6r+ zeQz^K`%h{SBWf}E55*)HHOUT8JvEaH+Ek1Ne#J0FEgJJA+6<&%9~i2PD8s^Dslssc zTQwcZ?&fxnLagha+!4-a)*;9mse=fzipv#V}bbBFfTzDYdj-u`=Ix^hc4ZHC2G&p}*I7sSxsVlKw!GSBn;dRNQwq5$}~tUly$L12#z ziO6EJ@@fSOsGX7iKLMG;h-J1Mnc>A0%dmoDuWJ2;yZ(IphEq=3E)fPfmN6|(F*fP} z;bo4VYQ<7N8b*FB%P6i;mR)8(-ATpNA#dKQH^7{yEFqpTZ7!?vT=;Tbr5UPjtuOF% zPGk%@ZrIB3lewyb9DdWKS+0;mJbFNuTUALo8Ny5XYi~G7W{teum}AYp>%7uC!Ij=t zeNOD{VA<)Fc+tf)!n)iruW}>U`hp%>R+eP2lUcN%cYk-e8OTet zL9F-mfSg$QN9`yF=!35NC3-GvNW{NiO1bgti1vf0jpr~df6DaQ&Q7*J-OEu=TFfq^ ww*WVdxLI-1+BEYH-5ja56s