Compare commits

..

No commits in common. "52a405d9edb9a121375c13b10d54d6b5804c5a1f" and "e2c77ed4e2028030538c627ff4f2e3ee71cca74a" have entirely different histories.

3 changed files with 15 additions and 14 deletions

View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"emacs-overlay": { "emacs-overlay": {
"locked": { "locked": {
"lastModified": 1621245326, "lastModified": 1620124711,
"narHash": "sha256-tGsrUnp3Zl8rvDq/JXOSK9IPkT0ZRqaXTZddix/V16Q=", "narHash": "sha256-6tsbwx6zynxSbwzfCrezGVpBum9UT+nlUV/XIc/uMms=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "a8663485e83d0975f9ef0288194838078dab90cd", "rev": "b717ab8d43ecabd27aa884c278a4edd1caa642db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,11 +23,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1621227293, "lastModified": 1620138697,
"narHash": "sha256-eLBymCG2AvHpex58S3NdDueUWydQgnv3Jzm+Ec+aIWw=", "narHash": "sha256-8Mgj+Fj4zGEI7oA9wbyqvdwq+46kAyd3barMIedWkho=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6a471f1b1111408d541caf04e64650813bfb22ac", "rev": "64c5228c0828fff0c94c1d42f7225115c299ae08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,11 +55,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1621073999, "lastModified": 1620074890,
"narHash": "sha256-Cp99YreSFedcWovxNmO8g8qFYltQQJPRLfuot6Z7iGE=", "narHash": "sha256-4Z8Zwpg0gPvqKbSsck1g9ql4E5NClGZdjyxbYoaXA4s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "83d907fd760d9ee4f49b4b7e4b1c6682f137b573", "rev": "7cb76200088f45cd24a9aa67fd2f9657943d78a4",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -23,9 +23,7 @@
programs.emacs = { programs.emacs = {
enable = true; enable = true;
# FIXME: revert when pgtk branch merged master package = pkgs.emacsPgtkGcc;
# package = pkgs.emacsPgtkGcc;
package = pkgs.emacsGcc;
}; };
}; };
} }

View file

@ -38,10 +38,12 @@ in
warning = 20.0; warning = 20.0;
alert = 10.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"; block = "memory";
display_type = "memory"; display_type = "memory";
format_mem = "{mem_used;G}/{mem_total;G}"; format_mem = "{Mug}/{MTg}GB";
warning_mem = 70.0; warning_mem = 70.0;
critical_mem = 90.0; critical_mem = 90.0;
# don't show swap # don't show swap
@ -70,7 +72,8 @@ in
block = "bluetooth"; block = "bluetooth";
mac = config.my.secrets.bluetooth-mouse-mac-address; mac = config.my.secrets.bluetooth-mouse-mac-address;
hide_disconnected = true; hide_disconnected = true;
format = "{percentage}"; # TODO: use format when i3status-rust updates to v0.20
# format = "{percentage}";
} }
{ {
block = "music"; block = "music";