From 05191a3bab28d9bd6bfd8a84fad5bf46c43d3c28 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 19 Jul 2023 11:40:07 +0100
Subject: [PATCH] Remove neovide, term TERM for wezterm

---
 Makefile                    | 1 +
 home/hyprland/hyprland.conf | 2 --
 home/wezterm/wezterm.lua    | 2 +-
 hosts/Monarch/home.nix      | 5 +----
 hosts/desktop.nix           | 1 -
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index b3c32d87..7cc2ebb8 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ update:
 
 hyprland:
 	-hyprctl reload
+	-pkill -1 kanshi
 
 waybar:
 	-pkill -9 waybar
diff --git a/home/hyprland/hyprland.conf b/home/hyprland/hyprland.conf
index 6161b513..5e07705a 100644
--- a/home/hyprland/hyprland.conf
+++ b/home/hyprland/hyprland.conf
@@ -74,7 +74,6 @@ XWayland {
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 bind = SUPER, Return, exec, wezterm
-bind = SUPER, D, exec, pgrep neovide > /dev/null || WAYLAND_DISPLAY= neovide --multigrid --maximized
 bind = SUPER, W, exec, pgrep firefox > /dev/null || firefox
 bind = SUPER, R, exec, pgrep nxplayer > /dev/null || nxplayer
 bind = SUPER, F1, exec, swaylock
@@ -116,7 +115,6 @@ bind = SUPER SHIFT, A, movetoworkspace, name:1
 bind = SUPER, D, moveworkspacetomonitor, name:2 current
 bind = SUPER, D, workspace, name:2
 bind = SUPER SHIFT, D, movetoworkspace, name:2
-windowrule = workspace name:2,(neovide)
 
 # 3: browser
 bind = SUPER, W, moveworkspacetomonitor, name:3 current
diff --git a/home/wezterm/wezterm.lua b/home/wezterm/wezterm.lua
index 1261e807..d90fb406 100644
--- a/home/wezterm/wezterm.lua
+++ b/home/wezterm/wezterm.lua
@@ -13,7 +13,7 @@ config.set_environment_variables = {
     TERMINFO_DIRS = "/home/user/.nix-profile/share/terminfo",
     WSLENV = "TERMINFO_DIRS",
 }
--- config.term = "wezterm"
+config.term = "wezterm"
 config.audible_bell = "Disabled"
 config.font_size = 14
 config.window_background_opacity = 0.80
diff --git a/hosts/Monarch/home.nix b/hosts/Monarch/home.nix
index 3c924ebc..c08ce6ad 100644
--- a/hosts/Monarch/home.nix
+++ b/hosts/Monarch/home.nix
@@ -12,10 +12,7 @@ in {
   home = {
     inherit username homeDirectory;
     stateVersion = "23.05";
-    packages = with pkgs; [
-      gcc
-      neovide
-    ];
+    packages = with pkgs; [gcc];
   };
   programs = {
     home-manager.enable = true;
diff --git a/hosts/desktop.nix b/hosts/desktop.nix
index 6b34f38d..c3967c73 100644
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@@ -13,7 +13,6 @@
     pavucontrol
     grim
     slurp
-    neovide
     signal-desktop
     libreoffice
     zotero