feat(gs/home): Bump alacritty version

Bump to alacritty 0.5.0 (which is happening by fetching YANNPP (Yet
Another Nixpkgs Pin) because overriding versions of rust packages is not
very well supported) and update the relevant home-manager version and
pin to get it installed and configured with vi-mode.

Change-Id: I4fd96bd0c0611ce76500c33bf0b2c680ee7f44c3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1583
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
This commit is contained in:
Griffin Smith 2020-08-02 15:58:26 -04:00 committed by glittershark
parent cc82d6e360
commit 56cba6e032
3 changed files with 34 additions and 11 deletions

View file

@ -6,8 +6,8 @@ rec {
nixpkgs = import pkgs.nixpkgsSrc {};
home-manager = (fetchTarball {
url = "https://github.com/rycee/home-manager/archive/5f189acce44dc39ea4055bfd8064adaf90d7fb5a.tar.gz";
sha256 = "0ibmvg3k9m9yzh8ln3jlh47nrvgg81iy8gpl112wjimlp6gagxw6";
url = "https://github.com/rycee/home-manager/archive/152769aed96d4d6f005ab40daf03ec4f5102c763.tar.gz";
sha256 = "10svwspmsf46rijzsh0h9nmz1mq2998wcml8yp36mwksgi8695pc";
});
home = confPath: import "${home-manager}/modules" {

View file

@ -1,17 +1,36 @@
{ config, lib, pkgs, ... }:
{
home.packages = with pkgs; [
alacritty
];
let
# TODO(grfn): Find a way to extract this to third_party without too much
# effort
alacrittyNixpkgs = import (pkgs.fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
rev = "cd9286194a5597e28b8bfb747418dd6af1567eb3";
sha256 = "0rwhq7cy4xy25gg2in6vah55psdizz7r187zy7z4c2a7pj2hs7ak";
}) {};
in
{
programs.alacritty = {
enable = true;
package = alacrittyNixpkgs.alacritty;
settings = {
font.size = 6;
font.normal.family = "Meslo LGSDZ Nerd Font";
draw_bold_text_with_bright_colors = false;
key_bindings = [
{
key = "Escape";
mods = "Control";
action = "ToggleViMode";
}
];
colors = with import ../common/solarized.nix; rec {
# Default colors
primary = {
@ -43,6 +62,8 @@
cyan = base1;
white = base3;
};
vi_mode_cursor.cursor = red;
};
};
};

View file

@ -55,6 +55,8 @@ with lib;
hyperfine
clj2nix
clojure
leiningen
pg-dump-upsert
@ -82,11 +84,11 @@ with lib;
delta = {
enable = true;
options = [
"--theme 'Solarized (light)'"
"--hunk-style" "plain"
"--commit-style" "box"
];
options = {
theme = "Solarized (light)";
hunk-style = "plain";
commit-style = "box";
};
};
};