diff --git a/flake.nix b/flake.nix index 91dc1dc..bf326f4 100644 --- a/flake.nix +++ b/flake.nix @@ -28,10 +28,6 @@ }; # Various flakes - alacritty-theme = { - url = "github:alacritty/alacritty-theme"; - flake = false; - }; yazi-flavors = { url = "github:yazi-rs/flavors"; flake = false; diff --git a/homes/julian/aspi.nix b/homes/julian/aspi.nix index f76a7d0..ad6f4ba 100644 --- a/homes/julian/aspi.nix +++ b/homes/julian/aspi.nix @@ -8,6 +8,7 @@ ./features/neovim ./features/ghostty ./features/wezterm + ./features/alacritty ./features/yazi ./features/emacs @@ -20,7 +21,7 @@ hostName = "aspi"; is-nixos = true; - terminal = "ghostty"; + terminal = "alacritty"; # ------- ---------- # | eDP-1 | | HDMI-A-1 | diff --git a/homes/julian/features/alacritty/alacritty.toml b/homes/julian/features/alacritty/alacritty.toml deleted file mode 100644 index 4b1a386..0000000 --- a/homes/julian/features/alacritty/alacritty.toml +++ /dev/null @@ -1,3 +0,0 @@ -import = [ - "~/.config/alacritty/theme/themes/smoooooth.toml" -] diff --git a/homes/julian/features/alacritty/default.nix b/homes/julian/features/alacritty/default.nix index 6a3fbfc..c241a8b 100644 --- a/homes/julian/features/alacritty/default.nix +++ b/homes/julian/features/alacritty/default.nix @@ -1,15 +1,12 @@ { lib, - pkgs, - inputs, config, ... }: { - home.packages = with pkgs; [alacritty]; - - home.file = { - ".config/alacritty/theme".source = "${inputs.alacritty-theme}"; - ".config/alacritty/alacritty.toml".source = ./alacritty.toml; + programs.alacritty = { + enable = true; + settings = {}; + theme = "smoooooth"; }; home.sessionVariables.TERMINAL = lib.mkIf (config.terminal == "alacritty") "alacritty"; diff --git a/homes/julian/features/ghostty/default.nix b/homes/julian/features/ghostty/default.nix index 501bbfa..523cf1d 100644 --- a/homes/julian/features/ghostty/default.nix +++ b/homes/julian/features/ghostty/default.nix @@ -2,14 +2,14 @@ lib, config, ... -}: { +}: +{ programs.ghostty = { enable = true; enableFishIntegration = true; settings = { theme = "catppuccin-mocha"; font-size = 12; - font-family = "DejaVu Sans"; }; };