From 115d0d7ed43074240989902b456be83ff4264fb1 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Fri, 7 May 2021 23:32:02 +0100
Subject: [PATCH] users/kat/sway: Made swayidle and lockCommands host specific.

---
 hosts/samhain/home/default.nix                |  2 +-
 .../home/{sway.nix => sway/default.nix}       | 26 ++++++++++-
 hosts/samhain/home/sway/swayidle.nix          | 32 +++++++++++++
 hosts/yule/home/default.nix                   |  2 +-
 hosts/yule/home/sway.nix                      | 22 ---------
 hosts/yule/home/sway/default.nix              | 46 +++++++++++++++++++
 hosts/yule/home/sway/swayidle.nix             | 24 ++++++++++
 users/kat/sway/default.nix                    |  1 -
 users/kat/sway/sway.nix                       | 21 ---------
 users/kat/sway/swayidle.nix                   | 36 ---------------
 10 files changed, 129 insertions(+), 83 deletions(-)
 rename hosts/samhain/home/{sway.nix => sway/default.nix} (55%)
 create mode 100644 hosts/samhain/home/sway/swayidle.nix
 delete mode 100644 hosts/yule/home/sway.nix
 create mode 100644 hosts/yule/home/sway/default.nix
 create mode 100644 hosts/yule/home/sway/swayidle.nix
 delete mode 100644 users/kat/sway/swayidle.nix

diff --git a/hosts/samhain/home/default.nix b/hosts/samhain/home/default.nix
index a2b3c329..3fbabbc7 100644
--- a/hosts/samhain/home/default.nix
+++ b/hosts/samhain/home/default.nix
@@ -1 +1 @@
-{ ... }: { imports = [ ./sway.nix ]; }
+{ ... }: { imports = [ ./sway ]; }
diff --git a/hosts/samhain/home/sway.nix b/hosts/samhain/home/sway/default.nix
similarity index 55%
rename from hosts/samhain/home/sway.nix
rename to hosts/samhain/home/sway/default.nix
index d2a164e5..34beb666 100644
--- a/hosts/samhain/home/sway.nix
+++ b/hosts/samhain/home/sway/default.nix
@@ -1,8 +1,14 @@
 { config, pkgs, ... }:
 
 {
+  imports = [ ./swayidle.nix ];
+
   wayland.windowManager.sway = {
-    config = {
+    config = let lockCommand = "swaylock -i HDMI-A-1:${../../../../users/kat/sway/wallpapers/main.png} -i DP-1:${
+          ../../../../users/kat/sway/wallpapers/left.jpg
+        }  -i DVI-D-1:${../../../../users/kat/sway/wallpapers/right.jpg} -s fill";
+    cfg = config.wayland.windowManager.sway.config;
+    in {
       startup = [{ command = "${pkgs.ckb-next}/bin/ckb-next -b"; }];
 
       output = let
@@ -24,6 +30,24 @@
         "HDMI-A-1" = right;
       };
 
+      keybindings = {
+        "${cfg.modifier}+x" = "exec ${lockCommand}";
+      };
+
+      modes = {
+        "System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown" =
+          {
+            "l" = "exec ${lockCommand}, mode default";
+            "e" = "exec swaymsg exit, mode default";
+            "s" = "exec systemctl suspend, mode default";
+            "h" = "exec systemctl hibernate, mode default";
+            "r" = "exec systemctl reboot, mode default";
+            "Shift+s" = "exec systemctl shutdown, mode default";
+            "Return" = "mode default";
+            "Escape" = "mode default";
+          };
+        };
+
       input = {
         "5824:1503:screenstub-tablet" = { events = "disabled"; };
         "5824:1503:screenstub-mouse" = { events = "disabled"; };
diff --git a/hosts/samhain/home/sway/swayidle.nix b/hosts/samhain/home/sway/swayidle.nix
new file mode 100644
index 00000000..084a6730
--- /dev/null
+++ b/hosts/samhain/home/sway/swayidle.nix
@@ -0,0 +1,32 @@
+{ config, pkgs, lib, ... }:
+
+{
+  systemd.user.services.swayidle = {
+    Unit = {
+      Description = "swayidle";
+      Documentation = [ "man:swayidle(1)" ];
+      PartOf = [ "graphical-session.target" ];
+    };
+    Service = {
+      Type = "simple";
+      ExecStart = ''
+        ${pkgs.swayidle}/bin/swayidle -w \
+          timeout 300 '${pkgs.swaylock}/bin/swaylock -f -i HDMI-A-1:${
+            ../../../../users/kat/sway/wallpapers/main.png
+          } -i DP-1:${../../../../users/kat/sway/wallpapers/left.jpg}  -i DVI-D-1:${
+            ../../../../users/kat/sway/wallpapers/right.jpg
+          }' \
+          timeout 600 'swaymsg "output * dpms off"' \
+            resume 'swaymsg "output * dpms on"' \
+          before-sleep '${pkgs.swaylock}/bin/swaylock -f -i HDMI-A-1:${
+             ../../../../users/kat/sway/wallpapers/main.png
+          } -i DP-1:${../../../../users/kat/sway/wallpapers/left.jpg}  -i DVI-D-1:${
+            ../../../../users/kat/sway/wallpapers/right.jpg
+          }'
+      '';
+      RestartSec = 3;
+      Restart = "always";
+    };
+    Install = { WantedBy = [ "sway-session.target" ]; };
+  };
+}
diff --git a/hosts/yule/home/default.nix b/hosts/yule/home/default.nix
index a2b3c329..3fbabbc7 100644
--- a/hosts/yule/home/default.nix
+++ b/hosts/yule/home/default.nix
@@ -1 +1 @@
-{ ... }: { imports = [ ./sway.nix ]; }
+{ ... }: { imports = [ ./sway ]; }
diff --git a/hosts/yule/home/sway.nix b/hosts/yule/home/sway.nix
deleted file mode 100644
index eccd7a0e..00000000
--- a/hosts/yule/home/sway.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  wayland.windowManager.sway.config = {
-    output = let
-      laptop = {
-        res = "1920x1080";
-        pos = "0 0";
-      };
-    in { "eDP-1" = laptop; };
-
-    input = {
-      "1739:33362:Synaptics_TM3336-002" = {
-        dwt = "enabled";
-        tap = "enabled";
-        natural_scroll = "enabled";
-        middle_emulation = "enabled";
-        click_method = "clickfinger";
-      };
-    };
-  };
-}
diff --git a/hosts/yule/home/sway/default.nix b/hosts/yule/home/sway/default.nix
new file mode 100644
index 00000000..fb2c8837
--- /dev/null
+++ b/hosts/yule/home/sway/default.nix
@@ -0,0 +1,46 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [ ./swayidle.nix ];
+
+  wayland.windowManager.sway.config = let lockCommand = "swaylock -i eDP-1:${
+          ../../../../users/kat/sway/wallpapers/main.png
+        } -s fill";
+        cfg = config.wayland.windowManager.sway.config;
+  in {
+    output = let
+      laptop = {
+        res = "1920x1080";
+        pos = "0 0";
+      };
+    in { "eDP-1" = laptop; };
+
+    keybindings = {
+        "${cfg.modifier}+x" = "exec ${lockCommand}";
+      };
+
+      modes = {
+        "System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown" =
+          {
+            "l" = "exec ${lockCommand}, mode default";
+            "e" = "exec swaymsg exit, mode default";
+            "s" = "exec systemctl suspend, mode default";
+            "h" = "exec systemctl hibernate, mode default";
+            "r" = "exec systemctl reboot, mode default";
+            "Shift+s" = "exec systemctl shutdown, mode default";
+            "Return" = "mode default";
+            "Escape" = "mode default";
+          };
+    };
+
+    input = {
+      "1739:33362:Synaptics_TM3336-002" = {
+        dwt = "enabled";
+        tap = "enabled";
+        natural_scroll = "enabled";
+        middle_emulation = "enabled";
+        click_method = "clickfinger";
+      };
+    };
+  };
+}
diff --git a/hosts/yule/home/sway/swayidle.nix b/hosts/yule/home/sway/swayidle.nix
new file mode 100644
index 00000000..a0ff902e
--- /dev/null
+++ b/hosts/yule/home/sway/swayidle.nix
@@ -0,0 +1,24 @@
+{ config, pkgs, lib, ... }:
+
+{
+  systemd.user.services.swayidle = {
+    Unit = {
+      Description = "swayidle";
+      Documentation = [ "man:swayidle(1)" ];
+      PartOf = [ "graphical-session.target" ];
+    };
+    Service = {
+      Type = "simple";
+      ExecStart = ''
+        ${pkgs.swayidle}/bin/swayidle -w \
+          timeout 300 '${pkgs.swaylock}/bin/swaylock -f  -i eDP-1:${../../../../users/kat/sway/wallpapers/main.png} \
+          timeout 600 'swaymsg "output * dpms off"' \
+            resume 'swaymsg "output * dpms on"' \
+          before-sleep '${pkgs.swaylock}/bin/swaylock -f -i eDP-1:${../../../../users/kat/sway/wallpapers/main.png}'
+      '';
+      RestartSec = 3;
+      Restart = "always";
+    };
+    Install = { WantedBy = [ "sway-session.target" ]; };
+  };
+}
diff --git a/users/kat/sway/default.nix b/users/kat/sway/default.nix
index 61a425d6..b64c5064 100644
--- a/users/kat/sway/default.nix
+++ b/users/kat/sway/default.nix
@@ -7,7 +7,6 @@
     ./waybar
     ./mako.nix
     ./sway.nix
-    ./swayidle.nix
     ./gammastep.nix
     ./konawall.nix
     ./packages.nix
diff --git a/users/kat/sway/sway.nix b/users/kat/sway/sway.nix
index 0a0e2ca6..ec298baf 100644
--- a/users/kat/sway/sway.nix
+++ b/users/kat/sway/sway.nix
@@ -77,12 +77,6 @@ in {
     config = let
       dmenu =
         "${pkgs.bemenu}/bin/bemenu --fn '${font.name} ${font.size}' --nb '${base16.base00}' --nf '${base16.base07}' --sb '${base16.base01}' --sf '${base16.base07}' -l 5 -m -1 -i";
-      lockCommand = "swaylock -i LVDS-1:${./wallpapers/main.png}-i eDP-1:${
-          ./wallpapers/main.png
-        } -i HDMI-A-1:${./wallpapers/main.png} -i DP-1:${
-          ./wallpapers/left.jpg
-        }  -i DVI-D-1:${./wallpapers/right.jpg} -s fill";
-
     in {
       bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];
 
@@ -153,7 +147,6 @@ in {
         "XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 5";
 
         "${cfg.modifier}+d" = "exec ${cfg.menu}";
-        "${cfg.modifier}+x" = "exec ${lockCommand}";
 
         "${cfg.modifier}+Print" =
           "exec ${pkgs.kat-scrot}/bin/kat-scrot --notify upload screen";
@@ -189,20 +182,6 @@ in {
           mode "System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown"'';
       };
 
-      modes = {
-        "System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown" =
-          {
-            "l" = "exec ${lockCommand}, mode default";
-            "e" = "exec swaymsg exit, mode default";
-            "s" = "exec systemctl suspend, mode default";
-            "h" = "exec systemctl hibernate, mode default";
-            "r" = "exec systemctl reboot, mode default";
-            "Shift+s" = "exec systemctl shutdown, mode default";
-            "Return" = "mode default";
-            "Escape" = "mode default";
-          };
-      };
-
       colors = {
         focused = {
           border = base16.base08;
diff --git a/users/kat/sway/swayidle.nix b/users/kat/sway/swayidle.nix
deleted file mode 100644
index e53aa5fd..00000000
--- a/users/kat/sway/swayidle.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  systemd.user.services.swayidle = {
-    Unit = {
-      Description = "swayidle";
-      Documentation = [ "man:swayidle(1)" ];
-      PartOf = [ "graphical-session.target" ];
-    };
-    Service = {
-      Type = "simple";
-      ExecStart = ''
-        ${pkgs.swayidle}/bin/swayidle -w \
-          timeout 300 '${pkgs.swaylock}/bin/swaylock -f -i LVDS-1:${
-            ./wallpapers/main.png
-          } -i eDP-1:${./wallpapers/main.png} -i HDMI-A-1:${
-            ./wallpapers/main.png
-          } -i DP-1:${./wallpapers/left.jpg}  -i DVI-D-1:${
-            ./wallpapers/right.jpg
-          }' \
-          timeout 600 'swaymsg "output * dpms off"' \
-            resume 'swaymsg "output * dpms on"' \
-          before-sleep '${pkgs.swaylock}/bin/swaylock -f -i LVDS-1:${
-            ./wallpapers/main.png
-          } -p eDP-1:${./wallpapers/main.png} -i HDMI-A-1:${
-            ./wallpapers/main.png
-          } -i DP-1:${./wallpapers/left.jpg}  -i DVI-D-1:${
-            ./wallpapers/right.jpg
-          }'
-      '';
-      RestartSec = 3;
-      Restart = "always";
-    };
-    Install = { WantedBy = [ "sway-session.target" ]; };
-  };
-}