Skip to content

Commit

Permalink
Uninstall Wezterm on all platforms
Browse files Browse the repository at this point in the history
Closes GH-767
Closes GH-754
Closes GH-679
Closes GH-618
  • Loading branch information
kachick committed Sep 1, 2024
1 parent 0f07b6c commit 0fc4a99
Show file tree
Hide file tree
Showing 10 changed files with 2 additions and 30 deletions.
7 changes: 0 additions & 7 deletions cmd/winit-conf/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion config/hyprland/hyprland.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions config/wezterm/README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion darwin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 0 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -30,7 +25,6 @@
home-manager,
nixos-wsl,
xremap-flake,
# wezterm-flake,
}@inputs:
let
inherit (self) outputs;
Expand Down
5 changes: 0 additions & 5 deletions home-manager/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions home-manager/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions nixos/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 0 additions & 3 deletions windows/winget/winget-pkgs-basic.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@
{
"PackageIdentifier": "Microsoft.PowerShell"
},
{
"PackageIdentifier": "wez.wezterm"
},
{
"PackageIdentifier": "Alacritty.Alacritty"
},
Expand Down

0 comments on commit 0fc4a99

Please sign in to comment.