From 260ff5fb642ce07c92fb3fa5061052e77842de66 Mon Sep 17 00:00:00 2001
From: Emmet <librephoenix3@pm.me>
Date: Sat, 12 Aug 2023 13:47:14 -0500
Subject: [PATCH] Getting emacs to lag less in wayland

---
 flake.nix                     |  4 ++--
 user/app/doom-emacs/config.el |  3 +++
 user/app/doom-emacs/doom.nix  |  2 ++
 user/app/doom-emacs/doom.org  |  5 +++++
 user/wm/hyprland/hyprland.nix | 13 +++++++++++++
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index 9449225..a829220 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,8 +16,8 @@
     email = "librephoenix3@pm.me"; # email (used for certain configurations)
     dotfilesDir = "~/.dotfiles"; # absolute path of the local repo
     theme = "ayu-dark"; # selcted theme from my themes directory (./themes/)
-    wm = "xmonad"; # Selected window manager or desktop environment; must select one in both ./user/wm/ and ./system/wm/
-    browser = "librewolf"; # Default browser; must select one from ./user/app/browser/
+    wm = "hyprland"; # Selected window manager or desktop environment; must select one in both ./user/wm/ and ./system/wm/
+    browser = "librewolf-wayland"; # Default browser; must select one from ./user/app/browser/
     editor = "emacsclient"; # Default editor;
     term = "alacritty -o font.size=20"; # Default terminal command;
     font = "Inconsolata"; # Selected font
diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el
index 850eb84..0d785a8 100644
--- a/user/app/doom-emacs/config.el
+++ b/user/app/doom-emacs/config.el
@@ -51,6 +51,9 @@
 (bind-key* "C-l" #'evil-window-right)
 (bind-key* "C-q" #'evil-window-delete)
 (bind-key* "M-q" #'kill-current-buffer)
+(bind-key* "M-w" #'+workspace/close-window-or-workspace)
+(bind-key* "M-n" #'next-buffer)
+(bind-key* "M-p" #'previous-buffer)
 (bind-key* "M-z" #'+vterm/toggle)
 (bind-key* (kbd "M-<return>") #'+vterm/here)
 
diff --git a/user/app/doom-emacs/doom.nix b/user/app/doom-emacs/doom.nix
index 375a775..5cb984b 100644
--- a/user/app/doom-emacs/doom.nix
+++ b/user/app/doom-emacs/doom.nix
@@ -4,8 +4,10 @@ let
   dashboardLogo = ./. + "/nix-" + themePolarity + ".png";
 in
 {
+  services.emacs.enable = true;
   programs.doom-emacs = {
     enable = true;
+    emacsPackage = pkgs.emacs28-gtk2;
     doomPrivateDir = ./.;
     # This block from https://github.com/znewman01/dotfiles/blob/be9f3a24c517a4ff345f213bf1cf7633713c9278/emacs/default.nix#L12-L34
     # Only init/packages so we only rebuild when those change.
diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org
index 8f32b8f..e80e291 100644
--- a/user/app/doom-emacs/doom.org
+++ b/user/app/doom-emacs/doom.org
@@ -112,6 +112,9 @@ Doom Emacs is traditionally installed by cloning the repository ([[https://githu
 (bind-key* "C-l" #'evil-window-right)
 (bind-key* "C-q" #'evil-window-delete)
 (bind-key* "M-q" #'kill-current-buffer)
+(bind-key* "M-w" #'+workspace/close-window-or-workspace)
+(bind-key* "M-n" #'next-buffer)
+(bind-key* "M-p" #'previous-buffer)
 (bind-key* "M-z" #'+vterm/toggle)
 (bind-key* (kbd "M-<return>") #'+vterm/here)
 
@@ -1474,8 +1477,10 @@ let
   dashboardLogo = ./. + "/nix-" + themePolarity + ".png";
 in
 {
+  services.emacs.enable = true;
   programs.doom-emacs = {
     enable = true;
+    emacsPackage = pkgs.emacs28-gtk2;
     doomPrivateDir = ./.;
     # This block from https://github.com/znewman01/dotfiles/blob/be9f3a24c517a4ff345f213bf1cf7633713c9278/emacs/default.nix#L12-L34
     # Only init/packages so we only rebuild when those change.
diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix
index fb12ef2..01a2d6e 100644
--- a/user/wm/hyprland/hyprland.nix
+++ b/user/wm/hyprland/hyprland.nix
@@ -9,6 +9,19 @@
       bind=SUPER,RETURN,exec,alacritty
       bind=SUPER,A,exec,emacs
       bind=SUPER,S,exec,librewolf
+      bind=SUPER,code:47,exec,wofi --show drun
+      xwayland {
+        force_zero_scaling = true
+      }
+      monitor=eDP-1,1920x1080,1000x1200,1
+      monitor=HDMI-A-1,1920x1200,1920x0,1
+      monitor=DP-1,1920x1200,0x0,1
+      input {
+        kb_layout = us
+        kb_options = caps:escape
+        repeat_delay = 350
+        repeat_rate = 50
+      }
     '';
     xwayland = {
       enable = true;