From 0e0d58b50cc8ac6bc9a9283b8b41adde4c9fea0a Mon Sep 17 00:00:00 2001
From: "elizabeth.hunt@simponic.xyz" <elizabeth.hunt@simponic.xyz>
Date: Mon, 15 Jan 2024 16:46:50 -0700
Subject: [PATCH] update graphical session

---
 .config/sway/config                     | 3 ++-
 .config/systemd/user/aggietimed.service | 4 ++--
 .config/systemd/user/display.target     | 3 ---
 .config/systemd/user/spotifyd.service   | 4 ++--
 .emacs.d/settings.org                   | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)
 delete mode 100644 .config/systemd/user/display.target

diff --git a/.config/sway/config b/.config/sway/config
index c378ba2..be4d361 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -229,4 +229,5 @@ include ~/.config/sway/local.d/*
 # Display target has started
 exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
-exec systemctl start --user display.target
+exec "systemctl --user import-environment {,WAYLAND_}DISPLAY SWAYSOCK; systemctl --user start sway-session.target"
+exec swaymsg -t subscribe '["shutdown"]' && systemctl --user stop sway-session.target
diff --git a/.config/systemd/user/aggietimed.service b/.config/systemd/user/aggietimed.service
index 4251d23..9f2c7fb 100644
--- a/.config/systemd/user/aggietimed.service
+++ b/.config/systemd/user/aggietimed.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=aggietimed
-Wants=display.target
+Wants=graphical-session.target
 
 [Service]
 Environment=DISPLAY=:0
@@ -9,4 +9,4 @@ ExecStart=/home/lizzy/.asdf/shims/aggietimed -d -s /tmp/aggietimed.sock
 Restart=always
 
 [Install]
-WantedBy=default.target
+WantedBy=graphical-session.target
diff --git a/.config/systemd/user/display.target b/.config/systemd/user/display.target
deleted file mode 100644
index 250ed1d..0000000
--- a/.config/systemd/user/display.target
+++ /dev/null
@@ -1,3 +0,0 @@
-[Unit]
-Description=Graphical target
-AllowIsolate=yes
diff --git a/.config/systemd/user/spotifyd.service b/.config/systemd/user/spotifyd.service
index 73b9ed0..b1e5d46 100644
--- a/.config/systemd/user/spotifyd.service
+++ b/.config/systemd/user/spotifyd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=A spotify playing daemon
 Documentation=https://github.com/Spotifyd/spotifyd
-Wants=display.target
+Wants=graphical-session.target
 
 [Service]
 Environment=DISPLAY=:0
@@ -11,4 +11,4 @@ Restart=always
 RestartSec=12
 
 [Install]
-WantedBy=default.target
+WantedBy=graphical-session.target
diff --git a/.emacs.d/settings.org b/.emacs.d/settings.org
index 046f12b..0b4ed31 100644
--- a/.emacs.d/settings.org
+++ b/.emacs.d/settings.org
@@ -94,7 +94,7 @@
 #+END_SRC
 ** Font
 #+BEGIN_SRC emacs-lisp
-  (let ((font "JetBrains Mono-8:style=Regular"))
+  (let ((font "JetBrains Mono-12:style=Regular"))
     (set-face-attribute 'default nil :font font)
     (set-frame-font font nil t))
 #+END_SRC