From fc019d789523ce5f89436b8dbc458cf3b79abf43 Mon Sep 17 00:00:00 2001 From: aristote Date: Tue, 29 Jul 2025 15:25:11 +0200 Subject: reformat everything with nixfmt --- pkgs/barista/default.nix | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) (limited to 'pkgs/barista/default.nix') diff --git a/pkgs/barista/default.nix b/pkgs/barista/default.nix index 30f370a..d097996 100644 --- a/pkgs/barista/default.nix +++ b/pkgs/barista/default.nix @@ -1,7 +1,16 @@ -{ buildGoModule, fetchFromGitHub, wirelesstools, fontawesomeMetadata, materialDesignIconsMetadata, i3statusGo ? null }: +{ + buildGoModule, + fetchFromGitHub, + wirelesstools, + fontawesomeMetadata, + materialDesignIconsMetadata, + i3statusGo ? null, +}: -let useDefaultConfig = i3statusGo == null; -in buildGoModule { +let + useDefaultConfig = i3statusGo == null; +in +buildGoModule { name = "barista"; version = "autorelease"; @@ -14,23 +23,28 @@ in buildGoModule { patchPhase = '' mkdir main - '' + (if useDefaultConfig then # use samples/i3status/i3status.go as config '' - mv samples/i3status/i3status.go main/i3status.go - '' else # import config and patch font loading - '' - cp ${i3statusGo} main/i3status.go - substituteInPlace main/i3status.go \ - --replace 'fontawesome.Load()' 'fontawesome.Load("${fontawesomeMetadata}")' \ - --replace 'mdi.Load()' 'mdi.Load("${materialDesignIconsMetadata}")' - '') + # patch call to iwgetid - '' - substituteInPlace modules/wlan/wlan.go \ - --replace '/sbin/iwgetid' '${wirelesstools}/bin/iwgetid' - ''; + + ( + if useDefaultConfig then # use samples/i3status/i3status.go as config + '' + mv samples/i3status/i3status.go main/i3status.go + '' + # import config and patch font loading + else + '' + cp ${i3statusGo} main/i3status.go + substituteInPlace main/i3status.go \ + --replace 'fontawesome.Load()' 'fontawesome.Load("${fontawesomeMetadata}")' \ + --replace 'mdi.Load()' 'mdi.Load("${materialDesignIconsMetadata}")' + '' + ) + # patch call to iwgetid + + '' + substituteInPlace modules/wlan/wlan.go \ + --replace '/sbin/iwgetid' '${wirelesstools}/bin/iwgetid' + ''; subPackages = [ "main/i3status.go" ]; vendorHash = "sha256-gpzxwtGxHcidRYY8o1Lz0iboU5aNnwsWfOoGo6Lvefo="; } - -- cgit v1.2.3