diff options
| -rw-r--r-- | share/cfg/default.nix | 2 | ||||
| -rw-r--r-- | share/cfg/foot.nix | 28 | ||||
| -rw-r--r-- | share/cfg/hyprland.nix | 6 | ||||
| -rw-r--r-- | share/cfg/kitty.nix | 32 | ||||
| -rw-r--r-- | share/cfg/tofi.nix | 2 | ||||
| -rw-r--r-- | share/hm-modules/hyprdesktop.nix | 2 |
6 files changed, 34 insertions, 38 deletions
diff --git a/share/cfg/default.nix b/share/cfg/default.nix index d3b9437..902c43f 100644 --- a/share/cfg/default.nix +++ b/share/cfg/default.nix @@ -8,7 +8,6 @@ ./waybar.nix ./git.nix ./mpv.nix - ./kitty.nix ./firefox ./helix.nix ./gallery-dl.nix @@ -16,5 +15,6 @@ ./hyprland.nix ./jujutsu.nix ./emacs.nix + ./foot.nix ]; } diff --git a/share/cfg/foot.nix b/share/cfg/foot.nix new file mode 100644 index 0000000..310283c --- /dev/null +++ b/share/cfg/foot.nix @@ -0,0 +1,28 @@ +{ config, pkgs, ... }: +let + cfg = config.programs.foot; + foot-pkg = pkgs.symlinkJoin { + name = "foot-wrapped"; + paths = [ + pkgs.foot + (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; }) + ]; + }; +in +{ + programs.foot = { + server.enable = cfg.enable; + package = foot-pkg; + settings = { + main = { + term = "xterm-256color"; + dpi-aware = "yes"; + font = "CaskaydiaCove Nerd Font:11"; + }; + + mouse = { + hide-when-typing = "yes"; + }; + }; + }; +} diff --git a/share/cfg/hyprland.nix b/share/cfg/hyprland.nix index 91eeacb..26dc36f 100644 --- a/share/cfg/hyprland.nix +++ b/share/cfg/hyprland.nix @@ -15,7 +15,7 @@ let increase = "brightnessctl set +5%"; decrease = "brightnessctl set 5%-"; }; - terminal = "kitty"; + terminal = "foot"; }; in { @@ -89,8 +89,8 @@ in rounding = 10 } - # set opacity to 0.9 active and 0.5 inactive for kitty - windowrule = opacity 0.9 override 0.5 override,^(kitty)$ + # set opacity to 0.9 active and 0.5 inactive for foot + windowrule = opacity 0.9 override 0.5 override,^(foot)$ # Move windows to their designated workspaces windowrulev2 = workspace 3,class:(firefox) diff --git a/share/cfg/kitty.nix b/share/cfg/kitty.nix deleted file mode 100644 index ce15cbd..0000000 --- a/share/cfg/kitty.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ pkgs, ... }: -{ - programs.kitty = { - theme = "Mayukai"; - - font = { - package = pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; }; - name = "CaskaydiaCove Nerd Font"; - size = 11; - }; - - settings = { - cursor_shape = "beam"; - disable_ligatures = "never"; - }; - - keybindings = { - "ctrl+tab" = "new_tab"; - - "alt+1" = "goto_tab 1"; - "alt+2" = "goto_tab 2"; - "alt+3" = "goto_tab 3"; - "alt+4" = "goto_tab 4"; - "alt+5" = "goto_tab 5"; - }; - }; - - home.shellAliases = { - s = "kitty +kitten ssh"; - icat = "kitty +kitten icat"; - }; -} diff --git a/share/cfg/tofi.nix b/share/cfg/tofi.nix index 433a911..de97cf4 100644 --- a/share/cfg/tofi.nix +++ b/share/cfg/tofi.nix @@ -29,7 +29,7 @@ padding-bottom = 0; padding-left = 0; drun-launch = true; - terminal = "kitty"; + terminal = "foot"; }; }; } diff --git a/share/hm-modules/hyprdesktop.nix b/share/hm-modules/hyprdesktop.nix index 3049c99..9032375 100644 --- a/share/hm-modules/hyprdesktop.nix +++ b/share/hm-modules/hyprdesktop.nix @@ -148,7 +148,7 @@ in programs.mpv.enable = true; programs.git.enable = true; programs.jujutsu.enable = true; - programs.kitty.enable = true; + programs.foot.enable = true; programs.waybar.enable = true; programs.firefox.enable = true; programs.tofi.enable = true; |