diff --git a/nix/home/opdavies/hosts/PW05CH3L.nix b/nix/home/opdavies/hosts/PW05CH3L.nix index 526ed3c..c8ce2d3 100644 --- a/nix/home/opdavies/hosts/PW05CH3L.nix +++ b/nix/home/opdavies/hosts/PW05CH3L.nix @@ -12,9 +12,5 @@ syncthing.enable = true; tmux-sessionizer.enable = true; }; - - desktop = { - alacritty.enable = false; - }; }; } diff --git a/nix/hosts/t490/services/dwm.nix b/nix/hosts/t490/services/dwm.nix index cc09eb1..eda653a 100644 --- a/nix/hosts/t490/services/dwm.nix +++ b/nix/hosts/t490/services/dwm.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + self, ... }: diff --git a/nix/lib/shared/home-manager.nix b/nix/lib/shared/home-manager.nix index 4120346..0a5e79f 100644 --- a/nix/lib/shared/home-manager.nix +++ b/nix/lib/shared/home-manager.nix @@ -28,10 +28,6 @@ neovim.enable = lib.mkDefault true; tmux.enable = lib.mkDefault true; }; - - desktop = { - alacritty.enable = lib.mkDefault true; - }; } ]; } diff --git a/nix/modules/home-manager/features/desktop/alacritty.nix b/nix/modules/home-manager/features/desktop/alacritty.nix deleted file mode 100644 index 4c8f7e4..0000000 --- a/nix/modules/home-manager/features/desktop/alacritty.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - config, - lib, - ... -}: - -with lib; - -{ - options.features.desktop.alacritty.enable = mkEnableOption "Enable Alacritty"; - - config = mkIf config.features.desktop.alacritty.enable { - programs.alacritty = { - enable = true; - - settings = { - env = { - TERM = "screen-256color"; - }; - - colors.primary.background = "#000000"; - - window.padding = { - x = 10; - y = 10; - }; - - font = { - size = 15; - - normal.family = "JetBrainsMono Nerd Font "; - }; - - terminal.shell = { - program = "zsh"; - }; - }; - }; - }; -} diff --git a/nix/modules/home-manager/features/desktop/default.nix b/nix/modules/home-manager/features/desktop/default.nix index 243d22d..d619f05 100644 --- a/nix/modules/home-manager/features/desktop/default.nix +++ b/nix/modules/home-manager/features/desktop/default.nix @@ -1,6 +1,5 @@ { imports = [ - ./alacritty.nix ./copyq.nix ./discord.nix ./espanso.nix diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix index 86f1706..93f0674 100644 --- a/nix/overlays/default.nix +++ b/nix/overlays/default.nix @@ -14,7 +14,6 @@ patches = [ "${self}/patches/dwm/add-custom-commands-and-keys.patch" "${self}/patches/dwm/change-mod-key.patch" - "${self}/patches/dwm/change-termcmd.patch" "${self}/patches/dwm/dwm-hide_vacant_tags-6.4.diff" ]; }; diff --git a/patches/dwm/change-termcmd.patch b/patches/dwm/change-termcmd.patch deleted file mode 100644 index cef8397..0000000 --- a/patches/dwm/change-termcmd.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/config.def.h b/config.def.h -index 9efa774..648336e 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -58,7 +58,7 @@ static const Layout layouts[] = { - /* commands */ - static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ - static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; --static const char *termcmd[] = { "st", NULL }; -+static const char *termcmd[] = { "alacritty", NULL }; - - static const Key keys[] = { - /* modifier key function argument */