Compare commits

...

3 commits

Author SHA1 Message Date
Antoine Martin 52a405d9ed home: i3bar: adapt config to v0.20 2021-05-18 15:39:49 +02:00
Antoine Martin fabeb10f8a home: emacs: use emacsGcc package temporarily 2021-05-18 15:39:31 +02:00
Antoine Martin ed11295417 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'
2021-05-17 17:25:10 +02:00
3 changed files with 14 additions and 15 deletions

View file

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

View file

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

View file

@ -38,12 +38,10 @@ 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 = "{Mug}/{MTg}GB"; format_mem = "{mem_used;G}/{mem_total;G}";
warning_mem = 70.0; warning_mem = 70.0;
critical_mem = 90.0; critical_mem = 90.0;
# don't show swap # don't show swap
@ -72,8 +70,7 @@ 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;
# TODO: use format when i3status-rust updates to v0.20 format = "{percentage}";
# format = "{percentage}";
} }
{ {
block = "music"; block = "music";