1
0
Fork 0

Switch to foot

This commit is contained in:
Malte Brandy 2022-03-07 19:40:12 +01:00
parent 5e60962725
commit 1cbf5684dc
8 changed files with 35 additions and 13 deletions

View file

@ -66,7 +66,7 @@ let
./roles/git-sign.nix ./roles/git-sign.nix
./roles/gnome.nix ./roles/gnome.nix
./roles/hoogle.nix ./roles/hoogle.nix
./roles/kitty.nix ./roles/terminal.nix
./roles/mpclient.nix ./roles/mpclient.nix
./roles/mpd.nix ./roles/mpd.nix
./roles/pythia.nix ./roles/pythia.nix

View file

@ -227,13 +227,13 @@ in
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/terminal" = "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/terminal" =
{ {
binding = "<Super>Return"; binding = "<Super>Return";
command = "kitty mytmux"; command = "foot mytmux";
name = "Terminal"; name = "Terminal";
}; };
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/hotkeys" = "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/hotkeys" =
{ {
binding = "<Super>space"; binding = "<Super>space";
command = "kitty ${pkgs.haskell-dialog}/bin/hotkeys ${pkgs.writeText "hotkeys.yaml" (builtins.toJSON hotkeys)}"; command = "foot ${pkgs.haskell-dialog}/bin/hotkeys ${pkgs.writeText "hotkeys.yaml" (builtins.toJSON hotkeys)}";
name = "Hotkeys"; name = "Hotkeys";
}; };
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/standby" = { "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/standby" = {

View file

@ -4,7 +4,7 @@
m-0 = { m-0 = {
hostName = lib.mkOption { type = lib.types.str; }; hostName = lib.mkOption { type = lib.types.str; };
terminal = lib.mkOption { terminal = lib.mkOption {
default = "kitty"; default = "foot";
type = lib.types.str; type = lib.types.str;
}; };
colors = lib.mkOption { colors = lib.mkOption {

View file

@ -19,7 +19,7 @@ in
Zotero = fork "zotero"; Zotero = fork "zotero";
Open = fork "evince ~/git/promotion/out/print.pdf"; Open = fork "evince ~/git/promotion/out/print.pdf";
Build = "sh -c 'cd ~/git/promotion; flix develop -c flix run'"; Build = "sh -c 'cd ~/git/promotion; flix develop -c flix run'";
Directory = fork "kitty -d ~/git/promotion"; Directory = fork "foot -d ~/git/promotion";
Edit = "codium ~/git/promotion"; Edit = "codium ~/git/promotion";
}; };
} }
@ -33,7 +33,7 @@ in
{ {
SSH = SSH =
let let
ssh = host: "kitty +kitten ssh ${host}"; ssh = host: "ssh ${host}";
in in
[ [
{ "hera via vpn" = ssh "hera.vpn.m-0.eu"; } { "hera via vpn" = ssh "hera.vpn.m-0.eu"; }
@ -47,7 +47,7 @@ in
{ "nixbuild.net" = "${pkgs.rlwrap}/bin/rlwrap ssh eu.nixbuild.net -i /etc/nixos/private/id_ed25519-nix-builder shell"; } { "nixbuild.net" = "${pkgs.rlwrap}/bin/rlwrap ssh eu.nixbuild.net -i /etc/nixos/private/id_ed25519-nix-builder shell"; }
{ "fluffy via local network" = ssh "fluffy.lo.m-0.eu"; } { "fluffy via local network" = ssh "fluffy.lo.m-0.eu"; }
{ "hera via public v4" = ssh "hera-v4"; } { "hera via public v4" = ssh "hera-v4"; }
{ "TU Tunnel" = fork "kitty sshuttle --python python3.8 -r gw 130.83.0.0/16"; } { "TU Tunnel" = "sshuttle --python python3.8 -r gw 130.83.0.0/16"; }
]; ];
} }
{ {
@ -67,7 +67,7 @@ in
Editor = fork "codium"; Editor = fork "codium";
Config = "codium ~/git/config"; Config = "codium ~/git/config";
Files = fork "nautilus"; Files = fork "nautilus";
DarkKitty = fork "kitty -o 'background #000000' -o 'foreground #ffffff'"; DarkTerminal = fork "foot -o 'color.background=000000' -o 'foreground=ffffff'";
Games = { Games = {
Steam = fork "steam"; Steam = fork "steam";
Minecraft = fork "minecraft-launcher"; Minecraft = fork "minecraft-launcher";

View file

@ -10,7 +10,7 @@ let
echo "Git repo up-to-date, not doing anything." echo "Git repo up-to-date, not doing anything."
exit 0; exit 0;
else else
${pkgs.kitty}/bin/kitty --hold ${config.home.profileDirectory}/bin/maintenance ${pkgs.foot}/bin/foot --hold ${config.home.profileDirectory}/bin/maintenance
fi fi
''; '';
in in

View file

@ -4,13 +4,35 @@ let
theme = my-lib.themes.default; theme = my-lib.themes.default;
in in
{ {
home.sessionVariables.TERMINAL = "${pkgs.kitty}/bin/kitty"; home.sessionVariables.TERMINAL = "${pkgs.foot}/bin/foot";
home.packages = [ home.packages = [
(pkgs.runCommandLocal "fake-gnome-terminal" { } '' (pkgs.runCommandLocal "fake-gnome-terminal" { } ''
mkdir -p $out/bin mkdir -p $out/bin
ln -s ${pkgs.kitty}/bin/kitty $out/bin/gnome-terminal ln -s ${pkgs.foot}/bin/foot $out/bin/gnome-terminal
'') '')
]; ];
programs.foot = {
enable = true;
settings = {
csd = {
preferred = "none";
};
main = {
term = "xterm-256color";
font = "monospace:size=6";
include = toString (pkgs.fetchurl {
url = "https://codeberg.org/dnkl/foot/raw/commit/6e536e7ed8f1de2615fa323123ddb2b06a45a179/themes/paper-color-light";
sha256 = "sha256-20gnYRPQ5vB2IP/epPLm4gvx/j4P/MnCPiTuDDexpuw=";
});
};
mouse = {
hide-when-typing = "yes";
};
scrollback = {
lines = 100000;
};
};
};
programs.kitty = { programs.kitty = {
enable = true; enable = true;
keybindings = { keybindings = {

View file

@ -56,7 +56,7 @@ self: super: {
inherit (self.pythonPackages) yapf jsbeautifier; inherit (self.pythonPackages) yapf jsbeautifier;
inherit (self) inherit (self)
go gdb mpc_cli ncmpcpp shfmt htmlTidy astyle nodejs tasksh magic-wormhole go gdb mpc_cli ncmpcpp shfmt htmlTidy astyle nodejs tasksh magic-wormhole
nixfmt nixpkgs-fmt rnix-lsp tmate rustup kitty nix-top ghcWithPackages ghcid matrix-commander upterm nixfmt nixpkgs-fmt rnix-lsp tmate rustup foot kitty nix-top ghcWithPackages ghcid matrix-commander upterm
lazygit gh lazygit gh
; ;
obelisk = (import self.sources.obelisk { }).command; obelisk = (import self.sources.obelisk { }).command;

@ -1 +1 @@
Subproject commit 9bd09a982b3ce73f6b1ab87046c20546f8752885 Subproject commit 9782c148aedcc49620480983197fa54a16c29244