Restructure flake.nix and add JHelioviewer package

modules/home/sway.nix

@@ -16,11 +16,30 @@ in
         services.swayidle = {
             enable = true;
             timeouts = [
-                { 
+                (mkIf gui.sway.desktop { 
                     timeout = 600;
                     command = "${pkgs.sway}/bin/swaymsg 'output * dpms off'";
                     resumeCommand = "${pkgs.sway}/bin/swaymsg 'output * dpms on'";
-                }
+                })
+                (mkIf (!gui.sway.desktop) {
+                    timeout = 300;
+                    command = "${pkgs.swaylock}/bin/swaylock -f -c 000000";
+                })
+                (mkIf (!gui.sway.desktop) {
+                    timeout = 420;
+                    command = "${pkgs.sway}/bin/swaymsg 'output * dpms off'";
+                    resumeCommand = "${pkgs.sway}/bin/swaymsg 'output * dpms on'";
+                })
+                (mkIf (!gui.sway.desktop) {
+                    timeout = 600;
+                    command = "systemctl suspend";
+                })
+            ];
+            events = [
+                (mkIf (!gui.sway.desktop) {
+                    event = "before-sleep";
+                    command = "${pkgs.swaylock}/bin/swaylock -f -c 000000";
+                })
             ];
                 
         };

modules/nix/gui.nix

@@ -33,6 +33,9 @@ in
         services.gnome.gnome-keyring.enable = mkIf cfg.secrets true;
         services.dbus.packages = mkIf cfg.secrets [ pkgs.gnome.seahorse ];
 
+        # Remove when nixpkgs issue 143365 is fixed
+        security.pam.services.swaylock = mkIf (!cfg.sway.desktop) {};
+
         xdg.portal.config.common = [ "wlr" "gtk" ];
         programs.thunar.enable = true;