steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'pr/bump' into 'master'

Browse source 
Pr/bump

See merge request steveeJ/infra!19
This commit is contained in:
steveej 2019-09-06 10:37:32 +00:00
commit 91136b27b0
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nix/home-manager/configuration/graphical-fullblown.nix
View file

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

1
nix/home-manager/profiles/qtile-desktop.nix
View file

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

14
nix/overlay.nix
View file

@ -12,7 +12,19 @@ let
}; };
in { 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; podman = nixpkgs-master.podman;
conmon = nixpkgs-master.conmon; conmon = nixpkgs-master.conmon;