From d9ba0d35aa77f29acc049895e4a2da111f9d6176 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Sat, 28 Jan 2023 23:32:13 +0100
Subject: sway: use hm's osConfig, remove unneeded target

---
 usecases/desktop/graphical/sway.nix | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

(limited to 'usecases/desktop')

diff --git a/usecases/desktop/graphical/sway.nix b/usecases/desktop/graphical/sway.nix
index 101c7cf..2586105 100644
--- a/usecases/desktop/graphical/sway.nix
+++ b/usecases/desktop/graphical/sway.nix
@@ -4,15 +4,17 @@ _inputs: {
   pkgs,
   system,
   ...
-}: let
-  globalConfig = config;
-in {
+}: {
   services.greetd = {
     enable = true;
     settings.default_session.command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway";
   };
 
-  home-manager.users.minijackson = {config, ...}: {
+  home-manager.users.minijackson = {
+    config,
+    osConfig,
+    ...
+  }: {
     wayland.windowManager.sway = {
       enable = true;
 
@@ -40,7 +42,7 @@ in {
         # Using waybar
         bars = [];
 
-        colors = with globalConfig.theme.colors; {
+        colors = with osConfig.theme.colors; {
           focused = {
             border = lightBackground;
             background = lightBackground;
@@ -195,7 +197,7 @@ in {
     };
 
     # TODO: upstream a PR to beautify this
-    xdg.configFile."swaylock/config".text = with globalConfig.theme.colors; ''
+    xdg.configFile."swaylock/config".text = with osConfig.theme.colors; ''
       ignore-empty-password
       image=${../../../res/wallpapers/wallpaper-1920x1080-install-gentoo.png}
 
@@ -246,16 +248,6 @@ in {
       "XDG_CURRENT_DESKTOP"
       "XDG_SESSION_TYPE"
     ];
-
-    systemd.user.targets.sway-session = {
-      Unit = {
-        Description = "sway compositor session";
-        Documentation = ["man:systemd.special(7)"];
-        BindsTo = ["graphical-session.target"];
-        Wants = ["graphical-session-pre.target"];
-        After = ["graphical-session-pre.target"];
-      };
-    };
   };
 
   # TODO: polkit gnome
-- 
cgit v1.2.3