Pr/bump #25

Merged
steveej merged 3 commits from pr/bump into master 2019-09-06 10:37:32 +00:00
3 changed files with 15 additions and 3 deletions

View file

@ -15,7 +15,8 @@ in {
../programs/emacs.nix
../programs/firefox.nix
../programs/chromium.nix
../programs/homeshick.nix
# FIXME: fix homeshick when no WAN connection is available
# ../programs/homeshick.nix
../programs/libreoffice.nix
../programs/neovim.nix
../programs/pass.nix

View file

@ -32,7 +32,6 @@ let
;;
esac
'';
# FIXME: alacritty's reflow on grow is currently broken (on my system)
terminalCommand = "${pkgs.alacritty}/bin/alacritty";
# terminalCommand = "${pkgs.roxterm}/bin/roxterm";

View file

@ -12,7 +12,19 @@ let
};
in {
alacritty = nixpkgs-master.alacritty;
# alacritty = nixpkgs-master.alacritty;
alacritty = super.stdenv.mkDerivation {
name = "alacritty-custom";
buildInputs = [ super.makeWrapper ];
phases = "installPhase";
installPhase = ''
makeWrapper ${nixpkgs-master.alacritty}/bin/alacritty $out/bin/alacritty \
--set-default WINIT_HIDPI_FACTOR 1.0
'';
};
podman = nixpkgs-master.podman;
conmon = nixpkgs-master.conmon;