diff --git a/i3/.config/i3status/config b/i3/.config/i3status/config index 96a7642..f5fd7c8 100644 --- a/i3/.config/i3status/config +++ b/i3/.config/i3status/config @@ -28,19 +28,19 @@ order += "load" order += "tztime local" wireless _first_ { - format_up = "☁:%quality@%essid,%ip" - format_down = "☁:☓" + format_up = "☁%quality@%essid,%ip" + format_down = "☁" } ethernet _first_ { # if you use %speed, i3status requires root privileges format_up = "E: %ip (%speed)" - format_down = "E:☓" + format_down = "E" } battery 0 { format = "%status %percentage %remaining" - hide_seconds = true + # hide_seconds = true } run_watch DHCP { diff --git a/nix/.nixpkgs/config.nix b/nix/.nixpkgs/config.nix index 8c9f34d..ae66885 100644 --- a/nix/.nixpkgs/config.nix +++ b/nix/.nixpkgs/config.nix @@ -17,6 +17,12 @@ mkEnv = name: paths: pkgs.buildEnv { inherit name paths; }; py3 = python35Packages; hs = haskellPackages; js = nodePackages; ml = ocamlPackages; py2 = python27Packages; emc = emacsPackages; emcn = emacsPackagesNg; elm = elmPackages; + + overrideOlder = original: override: let + newpkgver = lib.getVersion (override original); + oldpkgver = lib.getVersion original; + in if (lib.versionOlder oldpkgver newpkgver) then original.overrideDerivation override else original; + in rec { org = pkgs.emacsPackages.org.overrideDerivation (attrs: { nativeBuildInputs = [emacs texinfo tetex]; }); @@ -50,6 +56,15 @@ }; }); mpv = pkgs.mpv.override { vaapiSupport = true; }; + # this can be dropped once i3status-2.11 is in unstable + i3status = overrideOlder pkgs.i3status (attrs: rec { + name = "i3status-2.11"; + + src = fetchurl { + url = "http://i3wm.org/i3status/${name}.tar.bz2"; + sha256 = "0pwcy599fw8by1a1sf91crkqba7679qhvhbacpmhis8c1xrpxnwq"; + }; + }); yscripts = pkgs.callPackage ../dotfiles/bin {};