From cb7001e7c3dc2a29db40159d450b8c6bcf76e442 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Sun, 18 Jun 2023 11:31:54 +0100
Subject: [PATCH] Remove sddm from hyprland, set keybinds back to wezterm

---
 desktop/hyprland.nix        | 1 -
 home/desktop/hyprland.nix   | 3 +--
 machines/J0162/default.nix  | 6 +-----
 machines/J0162/elitherl.nix | 6 ++++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/desktop/hyprland.nix b/desktop/hyprland.nix
index b12c4600..03508969 100644
--- a/desktop/hyprland.nix
+++ b/desktop/hyprland.nix
@@ -1,5 +1,4 @@
 {pkgs, ...}: {
-  imports = [./sddm.nix];
   nixpkgs.overlays = [
     (self: super: {
       waybar = super.waybar.overrideAttrs (oldAttrs: {
diff --git a/home/desktop/hyprland.nix b/home/desktop/hyprland.nix
index 5d940a3d..f260b593 100644
--- a/home/desktop/hyprland.nix
+++ b/home/desktop/hyprland.nix
@@ -91,8 +91,7 @@ in {
     }
 
     # See https://wiki.hyprland.org/Configuring/Keywords/ for more
-    # bind = SUPER, Return, exec, wezterm
-    bind = SUPER, Return, exec, kitty
+    bind = SUPER, Return, exec, wezterm
     bind = SUPER, Q, killactive,
     bind = SUPER, E, exec, power-profiles
     bind = SUPER, P, exec, powermenu
diff --git a/machines/J0162/default.nix b/machines/J0162/default.nix
index eac216c0..a679ded8 100644
--- a/machines/J0162/default.nix
+++ b/machines/J0162/default.nix
@@ -4,15 +4,11 @@
     ../../hardware/audio.nix
     ../../hardware/bluetooth.nix
     ../../locales/en_GB.nix
-    ../../desktop/plasma.nix
+    ../../desktop/hyprland.nix
     ../../services/syncthing/J0162.nix
   ];
 
   networking.hostName = "J0162"; # Define your hostname.
-  services.xserver.displayManager = {
-    defaultSession = "plasma";
-    autoLogin.user = "elitherl";
-  };
   system.autoUpgrade = {
     enable = false;
     allowReboot = false;
diff --git a/machines/J0162/elitherl.nix b/machines/J0162/elitherl.nix
index 4235922c..862fbcd2 100644
--- a/machines/J0162/elitherl.nix
+++ b/machines/J0162/elitherl.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  imports = [../../home/work.nix ../../home/gui ../../home/desktop/picom.nix];
+  imports = [../../home/work.nix ../../home/gui ../../home/desktop/hyprland.nix];
   home.username = "elitherl";
   home.homeDirectory = "/home/elitherl";
   home.stateVersion = "22.11";
@@ -11,7 +11,9 @@
     zoom-us
   ];
 
-  wayland.windowManager.hyprland.extraConfig = ''source=./common.conf '';
+  wayland.windowManager.hyprland.extraConfig = ''source=./common.conf 
+  monitor=eDP-1,preferred,auto,1.00
+  '';
   programs.waybar.settings.main = {
     "modules-left" = ["wlr/workspaces"];
     "modules-center" = ["clock"];