From d9e94dbd0a7917920b399ba34623944c343fd63d Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 14 Aug 2023 17:28:23 +0100
Subject: [PATCH] Restore emacs bind, remove mypy for performance

---
 home/emacs/default.nix    |  1 -
 home/hyprland/default.nix |  2 +-
 hosts/Ronin/home.nix      | 10 +++-------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index e704bb19..e1f44007 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -42,7 +42,6 @@
         python-lsp-ruff
         python-lsp-black
         pyls-isort
-        pylsp-mypy
         pylsp-rope
       ]))
     nodePackages.yaml-language-server
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index fcadca9e..6aca5929 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -132,7 +132,7 @@ in {
       bind = SUPER SHIFT, P, exec, pkill rofi || ${pkgs.rofi-wayland}/bin/rofi -show power-menu
 
       # Common program shortcuts
-      bind = SUPER ALT, E, exec, $EDITOR
+      bind = SUPER ALT, E, exec, ${pkgs.emacs}/bin/emacsclient -c -a 'emacs'
       bind = SUPER ALT, W, exec, ${pkgs.firefox-wayland}/bin/firefox
       bind = SUPER ALT, F, exec, ${pkgs.xfce.thunar}/bin/thunar
       bind = SUPER ALT, Z, exec, ${pkgs.zotero}/bin/zotero
diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix
index 45a5c5d9..a8ae30aa 100644
--- a/hosts/Ronin/home.nix
+++ b/hosts/Ronin/home.nix
@@ -160,9 +160,7 @@ in {
       outputs = [
         {
           criteria = "eDP-1";
-          position = "0,665";
-          scale = 1.5;
-          status = "enable";
+          status = "disable";
         }
         {
           criteria = "Iiyama North America PLB2403WS 0574281251316";
@@ -186,16 +184,14 @@ in {
         }
         {
           criteria = "eDP-1";
-          position = "1920,0";
-          scale = 1.5;
-          status = "enable";
+          status = "disable";
         }
       ];
       exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}";
     };
   };
   xdg.configFile."hypr/display.conf".text = ''
-    monitor=eDP-1,preferred,auto,1.5
+    monitor=eDP-1,preferred,auto,1
     monitor=desc:Iiyama North America PLB2403WS 0574281251316,preferred,1280x185,1
     monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,preferred,3200x0,1,transform,1
     monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,0x0,1