From 0fc4a99fa1b94260057d4828e493c8fe60bcfc95 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 1 Sep 2024 14:21:18 +0900 Subject: [PATCH] Uninstall Wezterm on all platforms Closes GH-767 Closes GH-754 Closes GH-679 Closes GH-618 --- cmd/winit-conf/main.go | 7 ------- config/hyprland/hyprland.conf | 1 - config/wezterm/README.md | 2 ++ darwin/README.md | 1 - flake.nix | 6 ------ home-manager/common.nix | 5 ----- home-manager/packages.nix | 3 --- nixos/configuration.nix | 3 --- windows.go | 1 - windows/winget/winget-pkgs-basic.json | 3 --- 10 files changed, 2 insertions(+), 30 deletions(-) diff --git a/cmd/winit-conf/main.go b/cmd/winit-conf/main.go index 122666da..eedbfec9 100644 --- a/cmd/winit-conf/main.go +++ b/cmd/winit-conf/main.go @@ -72,10 +72,6 @@ func provisioners() []provisioner { // As I understand it, unix like permission masks will work even in windows... const dirPerm = 0750 - err = os.MkdirAll(filepath.Join(homePath, ".config", "wezterm"), dirPerm) - if err != nil { - log.Fatalf("Failed to create wezterm dotfiles directory: %+v", err) - } err = os.MkdirAll(filepath.Join(homePath, ".config", "alacritty", "themes"), dirPerm) if err != nil { log.Fatalf("Failed to create alacritty dotfiles directory: %+v", err) @@ -92,9 +88,6 @@ func provisioners() []provisioner { return []provisioner{ newProvisioner([]string{"config", "starship", "starship.toml"}, []string{homePath, ".config", "starship.toml"}), - // TODO: Copy all this wezterm dir - newProvisioner([]string{"config", "wezterm", "wezterm.lua"}, []string{homePath, ".config", "wezterm", "wezterm.lua"}), - newProvisioner([]string{"config", "alacritty", "common.toml"}, []string{homePath, ".config", "alacritty", "common.toml"}), newProvisioner([]string{"config", "alacritty", "windows.toml"}, []string{homePath, ".config", "alacritty", "windows.toml"}), // TODO: Copy all TOMLs under themes diff --git a/config/hyprland/hyprland.conf b/config/hyprland/hyprland.conf index d5d3ef20..1e5b071a 100644 --- a/config/hyprland/hyprland.conf +++ b/config/hyprland/hyprland.conf @@ -184,7 +184,6 @@ $mainMod = SUPER # Sets "Windows" key as main modifier # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more bind = $mainMod, Q, exec, $terminal -bind = $mainMod, W, exec, wezterm bind = $mainMod, F, exec, firefox bind = $mainMod, C, killactive, bind = $mainMod, M, exit, diff --git a/config/wezterm/README.md b/config/wezterm/README.md index 01d3edb3..50f09274 100644 --- a/config/wezterm/README.md +++ b/config/wezterm/README.md @@ -1,5 +1,7 @@ # WezTerm +Now I'm not using Wezterm from several reasons. But keeping the config and several note for possibilities to use it again in future... + ## How to debug Lua code? CTRL-SHIFT-L diff --git a/darwin/README.md b/darwin/README.md index e5a33ca3..520dff31 100644 --- a/darwin/README.md +++ b/darwin/README.md @@ -5,7 +5,6 @@ Several packages are missing or broken for darwin. Or the x86-64 darwin.\ So you should manually install followings. -- [wezterm](https://github.com/wez/wezterm/releases/download/nightly/WezTerm-macos-nightly.zip) - [vscode](https://code.visualstudio.com/download) - [zed-editor](https://zed.dev/download) - [podman-desktop](https://podman-desktop.io/downloads) diff --git a/flake.nix b/flake.nix index 4a4b8294..21b17d1f 100644 --- a/flake.nix +++ b/flake.nix @@ -15,11 +15,6 @@ nixos-wsl.url = "github:nix-community/NixOS-WSL/2405.5.4"; # https://github.com/xremap/nix-flake/blob/master/docs/HOWTO.md xremap-flake.url = "github:xremap/nix-flake"; - # Don't use wezterm-flake for now. The IME on wayland does not work than old stable. - # wezterm-flake = { - # url = "github:wez/wezterm?dir=nix"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; }; outputs = @@ -30,7 +25,6 @@ home-manager, nixos-wsl, xremap-flake, - # wezterm-flake, }@inputs: let inherit (self) outputs; diff --git a/home-manager/common.nix b/home-manager/common.nix index 007aa6de..77ef452d 100644 --- a/home-manager/common.nix +++ b/home-manager/common.nix @@ -123,11 +123,6 @@ # Do not alias *.nix into `xdg.configFile`, it actually cannot be used because of using many relative dirs # So you should call `home-manager switch` with `-f ~/repos/dotfiles/USER_NAME.nix` - xdg.configFile."wezterm" = { - source = ../config/wezterm; - recursive = true; - }; - xdg.configFile."alacritty/alacritty.toml".source = ../config/alacritty/alacritty-unix.toml; xdg.configFile."alacritty/unix.toml".source = if pkgs.stdenv.isDarwin then ../config/alacritty/macos.toml else ../config/alacritty/linux.toml; diff --git a/home-manager/packages.nix b/home-manager/packages.nix index 27d69ea3..ee891281 100644 --- a/home-manager/packages.nix +++ b/home-manager/packages.nix @@ -71,9 +71,6 @@ with pkgs; zellij yazi # prefer the shell wrapper `yy` - # Do not install wezterm in home-manager layer for non NixOS - # - Released wezterm versions are broken on wayland - # - Using nightly needs to take long build time, avoiding it for CI time alacritty typos diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 273e32ef..26d0c2bb 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -146,9 +146,6 @@ skktools alacritty - # Don't use nightly wezterm, that still does not enable IME on wayland - # inputs.wezterm-flake.packages.${pkgs.system}.default - wezterm wget curl diff --git a/windows.go b/windows.go index d8f9807a..3877794a 100644 --- a/windows.go +++ b/windows.go @@ -5,6 +5,5 @@ import "embed" //go:embed all:windows/* //go:embed config/powershell/* //go:embed config/starship/* -//go:embed config/wezterm/* //go:embed config/alacritty/* var WindowsAssets embed.FS diff --git a/windows/winget/winget-pkgs-basic.json b/windows/winget/winget-pkgs-basic.json index dc26f28a..d3887cc9 100644 --- a/windows/winget/winget-pkgs-basic.json +++ b/windows/winget/winget-pkgs-basic.json @@ -52,9 +52,6 @@ { "PackageIdentifier": "Microsoft.PowerShell" }, - { - "PackageIdentifier": "wez.wezterm" - }, { "PackageIdentifier": "Alacritty.Alacritty" },