diff --git a/darwin/profiles/desktop/home/default.nix b/darwin/profiles/desktop/home/default.nix index 348968a..22a6c13 100644 --- a/darwin/profiles/desktop/home/default.nix +++ b/darwin/profiles/desktop/home/default.nix @@ -5,7 +5,6 @@ ... }: { imports = map (n: ../../../../home/applications/${n}) [ - "alacritty" "go" "mpv" "nix" @@ -32,11 +31,4 @@ dockutil gawk ]; - - # macOS don't have fontconfig - programs = let - monospace = "JetBrainsMono Nerd Font"; - in { - alacritty.settings.font.normal.family = monospace; - }; } diff --git a/darwin/profiles/desktop/packages/window-manager.nix b/darwin/profiles/desktop/packages/window-manager.nix index df03cf8..e92ed97 100644 --- a/darwin/profiles/desktop/packages/window-manager.nix +++ b/darwin/profiles/desktop/packages/window-manager.nix @@ -21,6 +21,7 @@ skhd = { enable = true; skhdConfig = '' + # FIXME cmd - return : open -n ${pkgs.alacritty}/Applications/Alacritty.app cmd - 1 : yabai -m space --focus 1 # Focus space diff --git a/home/applications/alacritty/default.nix b/home/applications/alacritty/default.nix deleted file mode 100644 index 3868723..0000000 --- a/home/applications/alacritty/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - lib, - pkgs, - ... -}: { - programs.alacritty = { - enable = true; - settings = { - cursor.style = "beam"; - font.size = 10; - - # workaround for scaling in X11 - env.WINIT_X11_SCALE_FACTOR = "1"; - - # for zellij on macOS - window.option_as_alt = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "Both"; - }; - }; -} diff --git a/home/applications/foot/default.nix b/home/applications/foot/default.nix new file mode 100644 index 0000000..240557f --- /dev/null +++ b/home/applications/foot/default.nix @@ -0,0 +1,12 @@ +{ + pkgs, + lib, + ... +}: { + programs.foot = { + enable = true; + settings = { + main.font = "monospace:size=10"; + }; + }; +} diff --git a/home/applications/rofi/default.nix b/home/applications/rofi/default.nix index 388db96..c8c005d 100644 --- a/home/applications/rofi/default.nix +++ b/home/applications/rofi/default.nix @@ -7,7 +7,7 @@ enable = true; package = pkgs.rofi-wayland; font = "monospace"; - terminal = lib.getExe pkgs.alacritty; + terminal = lib.getExe pkgs.foot; }; home.packages = with pkgs; [rofi-power-menu]; diff --git a/home/applications/sway/default.nix b/home/applications/sway/default.nix index 1860d49..dc58993 100644 --- a/home/applications/sway/default.nix +++ b/home/applications/sway/default.nix @@ -109,7 +109,7 @@ ### Execute other stuff # Launch applications - "${modifier}+Return" = "exec alacritty"; + "${modifier}+Return" = "exec ${lib.getExe pkgs.foot}"; "${modifier}+w" = "exec ${pkgs.xdg-utils}/bin/xdg-open http:"; "${modifier}+e" = "exec ${pkgs.xdg-utils}/bin/xdg-open ~"; diff --git a/nixos/profiles/common/graphical/home/default.nix b/nixos/profiles/common/graphical/home/default.nix index 9cf6604..fa81efd 100644 --- a/nixos/profiles/common/graphical/home/default.nix +++ b/nixos/profiles/common/graphical/home/default.nix @@ -6,9 +6,9 @@ ./xdg-mime.nix ] ++ map (n: ../../../../../home/applications/${n}) [ - "alacritty" "fcitx5" "firefox" + "foot" "go" "mpv" "nautilus"