From 0347cb9eb2f21f1696d61268609c264db722d0d8 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 6 Sep 2019 12:35:14 +0200 Subject: [PATCH 1/3] home-manager/graphical-fullblown: disable homeshick the homeshick module currently requires online access which is undesired --- nix/home-manager/configuration/graphical-fullblown.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 0192c3f..3315702 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -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 From c4f4d2a5e734509ca46e7ae4f11251d1ebebc5f2 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 6 Sep 2019 12:36:07 +0200 Subject: [PATCH 2/3] remove stale comment --- nix/home-manager/profiles/qtile-desktop.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nix/home-manager/profiles/qtile-desktop.nix b/nix/home-manager/profiles/qtile-desktop.nix index da14963..f563181 100644 --- a/nix/home-manager/profiles/qtile-desktop.nix +++ b/nix/home-manager/profiles/qtile-desktop.nix @@ -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"; From 0a7ea1156862cff494ce6d7029201c9319a0309d Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 6 Sep 2019 12:36:21 +0200 Subject: [PATCH 3/3] pkgs/alacritty: globally disable HIDPI scaling --- nix/overlay.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/nix/overlay.nix b/nix/overlay.nix index 9d2e289..886dfa8 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -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;