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

desktop: switch to alacritty as a terminal

Browse source
This commit is contained in:
steveej 2019-07-17 10:02:36 +02:00
parent f480ac74a3
commit 9bfeb193df
3 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -360,6 +360,8 @@ in {
gnome3.dconf gnome3.dconf
picocom picocom
glib.dev # contains gdbus tool glib.dev # contains gdbus tool
alacritty
roxterm
# Screen recording # Screen recording
# gtk-recordmydesktop # can't select the window # gtk-recordmydesktop # can't select the window

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

@ -31,8 +31,11 @@ let
exit 1 exit 1
;; ;;
esac esac
''; '';
# FIXME: alacritty's reflow on grow is currently broken (on my system)
terminalCommand = "${pkgs.alacritty}/bin/alacritty";
# terminalCommand = "${pkgs.roxterm}/bin/roxterm";
qtileConfig = pkgs.writeScript "qtile_config.py" '' qtileConfig = pkgs.writeScript "qtile_config.py" ''
from libqtile.config import Key, Screen, Group, Drag, Click from libqtile.config import Key, Screen, Group, Drag, Click
@ -97,9 +100,9 @@ key_control = "control"
keys = [ keys = [
# https://github.com/qtile/qtile/blob/develop/libqtile/xkeysyms.py # https://github.com/qtile/qtile/blob/develop/libqtile/xkeysyms.py
Key([key_super], "Return", lazy.spawn("${pkgs.roxterm}/bin/roxterm")), Key([key_super], "Return", lazy.spawn("${terminalCommand}")),
Key([key_super], "backslash", lazy.spawn("${pkgs.roxterm}/bin/roxterm")), Key([key_super], "backslash", lazy.spawn("${terminalCommand}")),
Key([key_super], "apostrophe", lazy.spawn("${pkgs.roxterm}/bin/roxterm")), Key([key_super], "apostrophe", lazy.spawn("${terminalCommand}")),
Key([key_super], "r", lazy.spawncmd()), Key([key_super], "r", lazy.spawncmd()),
Key([key_super], "w", lazy.window.kill()), Key([key_super], "w", lazy.window.kill()),

17
nix/overlay.nix
View file

@ -1,10 +1,8 @@
self: super: self: super:
let let
nixpkgs-master = import (builtins.fetchTarball { nixpkgs-master = import <nixpkgs-master> {};
url = "https://github.com/NixOS/nixpkgs-channels/archive/de5fd9e6110489722e8667664dce9fdc17331866.tar.gz";
sha256 = "0z1j2pmvn15m2ir2i9l2prr81cq7f1x8xs4cv2s7q4fslz586ghn";
}) {};
# one application requires php5 # one application requires php5
nixpkgsWithPhp5 = super.fetchFromGitHub { nixpkgsWithPhp5 = super.fetchFromGitHub {
owner = "nixos"; owner = "nixos";
@ -14,6 +12,7 @@ let
}; };
in { in {
alacritty = nixpkgs-master.alacritty;
podman = nixpkgs-master.podman; podman = nixpkgs-master.podman;
conmon = nixpkgs-master.conmon; conmon = nixpkgs-master.conmon;
@ -23,6 +22,16 @@ in {
slirp4netns = super.callPackage ./pkgs/slirp4netns.nix {}; slirp4netns = super.callPackage ./pkgs/slirp4netns.nix {};
staruml = super.callPackage ./pkgs/staruml.nix { inherit (super.gnome2) GConf; libgcrypt = super.libgcrypt_1_5; }; staruml = super.callPackage ./pkgs/staruml.nix { inherit (super.gnome2) GConf; libgcrypt = super.libgcrypt_1_5; };
roxterm = super.stdenv.mkDerivation {
name = "roxterm-custom";
buildInputs = [ super.makeWrapper ];
phases = "installPhase";
installPhase = ''
makeWrapper ${super.roxterm}/bin/roxterm $out/bin/roxterm \
--add-flags "--separate"
'';
};
busyboxStatic = super.busybox.override { busyboxStatic = super.busybox.override {
enableStatic = true; enableStatic = true;
extraConfig = '' extraConfig = ''