From ed11295417225c0347a7922205729ee67419f867 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 17 May 2021 17:25:10 +0200 Subject: [PATCH 1/3] flake.lock: Update Flake input changes: * Updated 'emacs-overlay': 'github:nix-community/emacs-overlay/b717ab8d43ecabd27aa884c278a4edd1caa642db' -> 'github:nix-community/emacs-overlay/a8663485e83d0975f9ef0288194838078dab90cd' * Updated 'home-manager': 'github:nix-community/home-manager/64c5228c0828fff0c94c1d42f7225115c299ae08' -> 'github:nix-community/home-manager/6a471f1b1111408d541caf04e64650813bfb22ac' * Updated 'nixpkgs-unstable': 'github:NixOS/nixpkgs/7cb76200088f45cd24a9aa67fd2f9657943d78a4' -> 'github:NixOS/nixpkgs/83d907fd760d9ee4f49b4b7e4b1c6682f137b573' --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 3c0298c..8b9726d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs-overlay": { "locked": { - "lastModified": 1620124711, - "narHash": "sha256-6tsbwx6zynxSbwzfCrezGVpBum9UT+nlUV/XIc/uMms=", + "lastModified": 1621245326, + "narHash": "sha256-tGsrUnp3Zl8rvDq/JXOSK9IPkT0ZRqaXTZddix/V16Q=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b717ab8d43ecabd27aa884c278a4edd1caa642db", + "rev": "a8663485e83d0975f9ef0288194838078dab90cd", "type": "github" }, "original": { @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1620138697, - "narHash": "sha256-8Mgj+Fj4zGEI7oA9wbyqvdwq+46kAyd3barMIedWkho=", + "lastModified": 1621227293, + "narHash": "sha256-eLBymCG2AvHpex58S3NdDueUWydQgnv3Jzm+Ec+aIWw=", "owner": "nix-community", "repo": "home-manager", - "rev": "64c5228c0828fff0c94c1d42f7225115c299ae08", + "rev": "6a471f1b1111408d541caf04e64650813bfb22ac", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1620074890, - "narHash": "sha256-4Z8Zwpg0gPvqKbSsck1g9ql4E5NClGZdjyxbYoaXA4s=", + "lastModified": 1621073999, + "narHash": "sha256-Cp99YreSFedcWovxNmO8g8qFYltQQJPRLfuot6Z7iGE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7cb76200088f45cd24a9aa67fd2f9657943d78a4", + "rev": "83d907fd760d9ee4f49b4b7e4b1c6682f137b573", "type": "github" }, "original": { From fabeb10f8a2f45813de4e0747e9e4ab2b263d8dc Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 18 May 2021 15:39:31 +0200 Subject: [PATCH 2/3] home: emacs: use emacsGcc package temporarily --- home/emacs.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/emacs.nix b/home/emacs.nix index 34d4dab..3ce995b 100644 --- a/home/emacs.nix +++ b/home/emacs.nix @@ -23,7 +23,9 @@ programs.emacs = { enable = true; - package = pkgs.emacsPgtkGcc; + # FIXME: revert when pgtk branch merged master + # package = pkgs.emacsPgtkGcc; + package = pkgs.emacsGcc; }; }; } From 52a405d9edb9a121375c13b10d54d6b5804c5a1f Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 18 May 2021 15:39:49 +0200 Subject: [PATCH 3/3] home: i3bar: adapt config to v0.20 --- home/x/i3bar.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/home/x/i3bar.nix b/home/x/i3bar.nix index c4b1e5a..d75951f 100644 --- a/home/x/i3bar.nix +++ b/home/x/i3bar.nix @@ -38,12 +38,10 @@ in warning = 20.0; alert = 10.0; } - # TODO: update to new format when i3status-rust updates to v0.20: - # https://github.com/greshake/i3status-rust/blob/4d55b1d94ee09cbdefd805841fb54a2a4a0663a4/doc/blocks.md#available-format-keys-11 { block = "memory"; display_type = "memory"; - format_mem = "{Mug}/{MTg}GB"; + format_mem = "{mem_used;G}/{mem_total;G}"; warning_mem = 70.0; critical_mem = 90.0; # don't show swap @@ -72,8 +70,7 @@ in block = "bluetooth"; mac = config.my.secrets.bluetooth-mouse-mac-address; hide_disconnected = true; - # TODO: use format when i3status-rust updates to v0.20 - # format = "{percentage}"; + format = "{percentage}"; } { block = "music";