diff --git a/instances/sif/hm.nix b/instances/sif/hm.nix index 74c2809..b5ffcde 100644 --- a/instances/sif/hm.nix +++ b/instances/sif/hm.nix @@ -98,6 +98,7 @@ # ../../modules/hm/mangohud.nix # ../../modules/hm/megasync.nix # ../../modules/hm/nautilus.nix + # ../../modules/hm/ncspot.nix # ../../modules/hm/obs-studio.nix # ../../modules/hm/pycharm.nix # ../../modules/hm/rofi.nix @@ -112,6 +113,7 @@ ../../modules/hm/cava.nix ../../modules/hm/easyeffects.nix ../../modules/hm/firefox.nix + ../../modules/hm/foot.nix ../../modules/hm/gtk_theme.nix ../../modules/hm/heif.nix ../../modules/hm/helix.nix @@ -119,7 +121,6 @@ ../../modules/hm/kitty.nix ../../modules/hm/libinput-gestures.nix ../../modules/hm/mpv.nix - # ../../modules/hm/ncspot.nix ../../modules/hm/noti.nix ../../modules/hm/nushell.nix ../../modules/hm/office.nix diff --git a/instances/thor/hm.nix b/instances/thor/hm.nix index f3bd57f..96bd093 100644 --- a/instances/thor/hm.nix +++ b/instances/thor/hm.nix @@ -114,6 +114,7 @@ ../../modules/hm/easyeffects.nix ../../modules/hm/firefox.nix ../../modules/hm/fonts.nix + ../../modules/hm/foot.nix ../../modules/hm/gtk_theme.nix ../../modules/hm/heif.nix ../../modules/hm/helix.nix diff --git a/modules/hm/foot.nix b/modules/hm/foot.nix new file mode 100644 index 0000000..3e03726 --- /dev/null +++ b/modules/hm/foot.nix @@ -0,0 +1,67 @@ +{ nixosConfig, ... }: +with nixosConfig.nix-rice.lib; +let + inherit (nixosConfig.nix-rice) rice; + strPalette = palette.toRGBShortHex { + inherit (rice.colorPalette) + background + foreground + color0 + color1 + color2 + color3 + color4 + color5 + color6 + color7 + color8 + color9 + color10 + color11 + color12 + color13 + color14 + color15 + ; + }; +in +{ + programs.foot = { + enable = true; + settings = { + main = { + term = "xterm-256color"; + font = "${rice.font.monospace.fc}:size=${toString rice.font.monospace.size}"; + dpi-aware = "yes"; + }; + mouse = { + hide-when-typing = "yes"; + }; + colors = { + alpha = rice.opacity; + inherit (strPalette) background foreground; + + # Normal/regular colors (color palette 0-7) + regular0 = strPalette.color0; # black + regular1 = strPalette.color1; # red + regular2 = strPalette.color2; # green + regular3 = strPalette.color3; # yellow + regular4 = strPalette.color4; # blue + regular5 = strPalette.color5; # magenta + regular6 = strPalette.color6; # cyan + regular7 = strPalette.color7; # white + + ## Bright colors (color palette 8-15) + bright0 = strPalette.color8; # bright black + bright1 = strPalette.color9; # bright red + bright2 = strPalette.color10; # bright green + bright3 = strPalette.color11; # bright yellow + bright4 = strPalette.color12; # bright blue + bright5 = strPalette.color13; # bright magenta + bright6 = strPalette.color14; # bright cyan + bright7 = strPalette.color15; # bright white + }; + }; + }; +} + diff --git a/modules/hm/gtk_theme.nix b/modules/hm/gtk_theme.nix index d57eced..03c13dc 100644 --- a/modules/hm/gtk_theme.nix +++ b/modules/hm/gtk_theme.nix @@ -2,7 +2,7 @@ { gtk = { enable = true; - font = nixosConfig.nix-rice.rice.font.normal; + font = { inherit (nixosConfig.nix-rice.rice.font.normal) name package size; }; iconTheme = { package = pkgs.qogir-icon-theme; name = "Qogir-dark"; diff --git a/modules/hm/hyprland.nix b/modules/hm/hyprland.nix index 0853465..1f7c075 100644 --- a/modules/hm/hyprland.nix +++ b/modules/hm/hyprland.nix @@ -6,7 +6,8 @@ let in { imports = [ - ./kitty.nix + # ./kitty.nix + ./foot.nix # ./nautilus.nix ./nemo.nix ./waybar.nix @@ -204,7 +205,7 @@ in "SUPER_SHIFT_L, L, exec, hyprctl keyword general:layout dwindle" "SUPER_ALT_L, L, exec, hyprctl keyword general:layout master" - "SUPER, RETURN, exec, kitty" + "SUPER, RETURN, exec, foot" "SUPER, W, killactive," "SUPER, M, exec, ${config.programs.hyprlock.package}/bin/hyprlock" "SUPER_ALT_L, Q, exit," diff --git a/modules/hm/kitty.nix b/modules/hm/kitty.nix index 10999d1..cd4580c 100644 --- a/modules/hm/kitty.nix +++ b/modules/hm/kitty.nix @@ -46,6 +46,6 @@ in "ctrl+shift+up" = "previous_window"; "ctrl+shift+down" = "next_window"; }; - font = rice.font.monospace; + font = { inherit (rice.font.monospace) name package size; }; }; } diff --git a/modules/nixos/rice.nix b/modules/nixos/rice.nix index 1edfa4d..b5ff74d 100644 --- a/modules/nixos/rice.nix +++ b/modules/nixos/rice.nix @@ -37,11 +37,13 @@ in font = { normal = { name = "Cantarell"; + fc = "Cantarell"; package = pkgs.cantarell-fonts; size = 10; }; monospace = { name = "CaskaydiaCove Nerd Font"; + fc = "CaskaydiaMono NF"; package = pkgs.nerd-fonts.caskaydia-mono or (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; }); # package = pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; }; # name = "FiraCode Nerd Font Mono";