From 0dfa785ec7d315fe14ddb1831859e6915f9a37c6 Mon Sep 17 00:00:00 2001
From: John Bowdre <john@bowdre.net>
Date: Sun, 1 Oct 2023 14:45:24 -0500
Subject: [PATCH] remove systemd fixes, remove recommendedEnvironment

---
 home/features/desktop/hyprland/default.nix    |  4 +---
 .../desktop/hyprland/systemd-fixes.nix        | 24 -------------------
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 home/features/desktop/hyprland/systemd-fixes.nix

diff --git a/home/features/desktop/hyprland/default.nix b/home/features/desktop/hyprland/default.nix
index e065aa1..2050e7e 100644
--- a/home/features/desktop/hyprland/default.nix
+++ b/home/features/desktop/hyprland/default.nix
@@ -2,7 +2,6 @@
 
   imports = [
     ./binds.nix
-    ./systemd-fixes.nix
     ./tty-init.nix
     ../wayland-wm
   ];
@@ -10,8 +9,7 @@
   wayland.windowManager.hyprland = {
     enable = true;
     systemdIntegration = true;
-#    xwayland.enable = true;
-#    recommendedEnvironment = true;
+    xwayland.enable = true;
     extraConfig = ''
       # This is an example Hyprland config file.
       #
diff --git a/home/features/desktop/hyprland/systemd-fixes.nix b/home/features/desktop/hyprland/systemd-fixes.nix
deleted file mode 100644
index 51f8ba9..0000000
--- a/home/features/desktop/hyprland/systemd-fixes.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, config, ... }: {
-  # stolen from https://github.com/alebastr/sway-systemd/commit/0fdb2c4b10beb6079acd6073c5b3014bd58d3b74
-  systemd.user.targets.hyprland-session-shutdown = {
-    Unit = {
-      Description = "Shutdown running Hyprland session";
-      DefaultDependencies = "no";
-      StopWhenUnneeded = "true";
-
-      Conflicts = [
-        "graphical-session.target"
-        "graphical-session-pre.target"
-        "hyprland-session.target"
-      ];
-      After = [
-        "graphical-session.target"
-        "graphical-session-pre.target"
-        "hyprland-session.target"
-      ];
-    };
-    wayland.windowManager.hyprland.settings.bind = lib.mkAfter [
-      "SUPERSHIFT,e,exec,systemctl --user start hyprland-session-shutdown.target; hyprctl dispatch exit"
-    ];
-  };
-}