diff --git a/flake.lock b/flake.lock
index 8b9726d..3c0298c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1621245326,
-        "narHash": "sha256-tGsrUnp3Zl8rvDq/JXOSK9IPkT0ZRqaXTZddix/V16Q=",
+        "lastModified": 1620124711,
+        "narHash": "sha256-6tsbwx6zynxSbwzfCrezGVpBum9UT+nlUV/XIc/uMms=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "a8663485e83d0975f9ef0288194838078dab90cd",
+        "rev": "b717ab8d43ecabd27aa884c278a4edd1caa642db",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1621227293,
-        "narHash": "sha256-eLBymCG2AvHpex58S3NdDueUWydQgnv3Jzm+Ec+aIWw=",
+        "lastModified": 1620138697,
+        "narHash": "sha256-8Mgj+Fj4zGEI7oA9wbyqvdwq+46kAyd3barMIedWkho=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6a471f1b1111408d541caf04e64650813bfb22ac",
+        "rev": "64c5228c0828fff0c94c1d42f7225115c299ae08",
         "type": "github"
       },
       "original": {
@@ -55,11 +55,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1621073999,
-        "narHash": "sha256-Cp99YreSFedcWovxNmO8g8qFYltQQJPRLfuot6Z7iGE=",
+        "lastModified": 1620074890,
+        "narHash": "sha256-4Z8Zwpg0gPvqKbSsck1g9ql4E5NClGZdjyxbYoaXA4s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "83d907fd760d9ee4f49b4b7e4b1c6682f137b573",
+        "rev": "7cb76200088f45cd24a9aa67fd2f9657943d78a4",
         "type": "github"
       },
       "original": {
diff --git a/home/emacs.nix b/home/emacs.nix
index 3ce995b..34d4dab 100644
--- a/home/emacs.nix
+++ b/home/emacs.nix
@@ -23,9 +23,7 @@
 
     programs.emacs = {
       enable = true;
-      # FIXME: revert when pgtk branch merged master
-      # package = pkgs.emacsPgtkGcc;
-      package = pkgs.emacsGcc;
+      package = pkgs.emacsPgtkGcc;
     };
   };
 }
diff --git a/home/x/i3bar.nix b/home/x/i3bar.nix
index d75951f..c4b1e5a 100644
--- a/home/x/i3bar.nix
+++ b/home/x/i3bar.nix
@@ -38,10 +38,12 @@ 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 = "{mem_used;G}/{mem_total;G}";
+              format_mem = "{Mug}/{MTg}GB";
               warning_mem = 70.0;
               critical_mem = 90.0;
               # don't show swap
@@ -70,7 +72,8 @@ in
               block = "bluetooth";
               mac = config.my.secrets.bluetooth-mouse-mac-address;
               hide_disconnected = true;
-              format = "{percentage}";
+              # TODO: use format when i3status-rust updates to v0.20
+              # format = "{percentage}";
             }
             {
               block = "music";