From cb56d31959ce3968091756b1d00a7fc1b48d247c Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Thu, 21 Apr 2022 21:54:29 -0400 Subject: [PATCH] powerline-gp: pull upstream version, remove bold patch --- modules/cli/bold.patch | 13 ------------- modules/cli/powerline.nix | 14 +++++++++++--- 2 files changed, 11 insertions(+), 16 deletions(-) delete mode 100644 modules/cli/bold.patch diff --git a/modules/cli/bold.patch b/modules/cli/bold.patch deleted file mode 100644 index fffde24..0000000 --- a/modules/cli/bold.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/powerline.go b/powerline.go -index 0b640ac..7778ebf 100644 ---- a/powerline.go -+++ b/powerline.go -@@ -177,7 +177,7 @@ func (p *powerline) color(prefix string, code uint8) string { - } - - func (p *powerline) fgColor(code uint8) string { -- return p.color("38", code) -+ return p.color("1;38", code) - } - - func (p *powerline) bgColor(code uint8) string { diff --git a/modules/cli/powerline.nix b/modules/cli/powerline.nix index 0755f9d..1a452f9 100644 --- a/modules/cli/powerline.nix +++ b/modules/cli/powerline.nix @@ -5,9 +5,10 @@ let theme = pkgs.writeText "powerline.json" (builtins.toJSON { + BoldForeground = true; CwdFg = 15; - PathFg = 15; PathBg = 24; + PathFg = 15; SeparatorFg = 16; }); @@ -38,9 +39,16 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = [ - (pkgs.powerline-go.overrideAttrs (old: { + ((pkgs.callPackage + (pkgs.fetchurl + { + url = "https://raw.githubusercontent.com/NixOS/nixpkgs/6ce4a720012398d451c21bc042d6740e92289615/pkgs/tools/misc/powerline-go/default.nix"; + sha256 = "7a8294ac9726da9531f1e506369233b051ecc6aa32c77a281f7167027a89977e"; + } + ) + { } + ).overrideAttrs (old: { patches = [ - ./bold.patch ./shlvl.patch ]; }))