From 1cbf5684dc6728899611f74fe133bb42e5665fb2 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 7 Mar 2022 19:40:12 +0100 Subject: [PATCH] Switch to foot --- home-manager/machines.nix | 2 +- home-manager/roles/gnome.nix | 4 +-- home-manager/roles/home-options.nix | 2 +- home-manager/roles/hotkeys.nix | 8 +++--- home-manager/roles/hourly-maintenance.nix | 2 +- .../roles/{kitty.nix => terminal.nix} | 26 +++++++++++++++++-- overlays/pkgSets.nix | 2 +- private | 2 +- 8 files changed, 35 insertions(+), 13 deletions(-) rename home-manager/roles/{kitty.nix => terminal.nix} (68%) diff --git a/home-manager/machines.nix b/home-manager/machines.nix index 01e36acd..22200929 100644 --- a/home-manager/machines.nix +++ b/home-manager/machines.nix @@ -66,7 +66,7 @@ let ./roles/git-sign.nix ./roles/gnome.nix ./roles/hoogle.nix - ./roles/kitty.nix + ./roles/terminal.nix ./roles/mpclient.nix ./roles/mpd.nix ./roles/pythia.nix diff --git a/home-manager/roles/gnome.nix b/home-manager/roles/gnome.nix index 213201d8..3d37e3ed 100644 --- a/home-manager/roles/gnome.nix +++ b/home-manager/roles/gnome.nix @@ -227,13 +227,13 @@ in "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/terminal" = { binding = "Return"; - command = "kitty mytmux"; + command = "foot mytmux"; name = "Terminal"; }; "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/hotkeys" = { binding = "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"; }; "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/standby" = { diff --git a/home-manager/roles/home-options.nix b/home-manager/roles/home-options.nix index 5493f662..1ece82ad 100644 --- a/home-manager/roles/home-options.nix +++ b/home-manager/roles/home-options.nix @@ -4,7 +4,7 @@ m-0 = { hostName = lib.mkOption { type = lib.types.str; }; terminal = lib.mkOption { - default = "kitty"; + default = "foot"; type = lib.types.str; }; colors = lib.mkOption { diff --git a/home-manager/roles/hotkeys.nix b/home-manager/roles/hotkeys.nix index 00e53304..0728f875 100644 --- a/home-manager/roles/hotkeys.nix +++ b/home-manager/roles/hotkeys.nix @@ -19,7 +19,7 @@ in Zotero = fork "zotero"; Open = fork "evince ~/git/promotion/out/print.pdf"; 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"; }; } @@ -33,7 +33,7 @@ in { SSH = let - ssh = host: "kitty +kitten ssh ${host}"; + ssh = host: "ssh ${host}"; in [ { "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"; } { "fluffy via local network" = ssh "fluffy.lo.m-0.eu"; } { "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"; Config = "codium ~/git/config"; Files = fork "nautilus"; - DarkKitty = fork "kitty -o 'background #000000' -o 'foreground #ffffff'"; + DarkTerminal = fork "foot -o 'color.background=000000' -o 'foreground=ffffff'"; Games = { Steam = fork "steam"; Minecraft = fork "minecraft-launcher"; diff --git a/home-manager/roles/hourly-maintenance.nix b/home-manager/roles/hourly-maintenance.nix index d97c0327..9242e57f 100644 --- a/home-manager/roles/hourly-maintenance.nix +++ b/home-manager/roles/hourly-maintenance.nix @@ -10,7 +10,7 @@ let echo "Git repo up-to-date, not doing anything." exit 0; else - ${pkgs.kitty}/bin/kitty --hold ${config.home.profileDirectory}/bin/maintenance + ${pkgs.foot}/bin/foot --hold ${config.home.profileDirectory}/bin/maintenance fi ''; in diff --git a/home-manager/roles/kitty.nix b/home-manager/roles/terminal.nix similarity index 68% rename from home-manager/roles/kitty.nix rename to home-manager/roles/terminal.nix index 69c19f6b..3c5db74d 100644 --- a/home-manager/roles/kitty.nix +++ b/home-manager/roles/terminal.nix @@ -4,13 +4,35 @@ let theme = my-lib.themes.default; in { - home.sessionVariables.TERMINAL = "${pkgs.kitty}/bin/kitty"; + home.sessionVariables.TERMINAL = "${pkgs.foot}/bin/foot"; home.packages = [ (pkgs.runCommandLocal "fake-gnome-terminal" { } '' 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 = { enable = true; keybindings = { diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix index 8340ffa5..41c7657a 100644 --- a/overlays/pkgSets.nix +++ b/overlays/pkgSets.nix @@ -56,7 +56,7 @@ self: super: { inherit (self.pythonPackages) yapf jsbeautifier; inherit (self) 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 ; obelisk = (import self.sources.obelisk { }).command; diff --git a/private b/private index 9bd09a98..9782c148 160000 --- a/private +++ b/private @@ -1 +1 @@ -Subproject commit 9bd09a982b3ce73f6b1ab87046c20546f8752885 +Subproject commit 9782c148aedcc49620480983197fa54a16c29244