Push these changes to a branch cause I'm kind of giving up

home/sway/autostart/default.nix

@@ -1,8 +1,6 @@
-{config, pkgs, ...}: {
-  # Enable Sway and write some scripts
+{ pkgs, ... }: {
   wayland.windowManager.sway = {
     config = {
-      # Use Waybar rather than Sway's
       bars = [{command = "waybar";}];
 
       startup = [

home/sway/default.nix

@@ -1,14 +1,14 @@
-{config, pkgs, outputs, ...}: {
-  # Import modules
+{ config, pkgs, outputs, ... }: {
   imports = [
-    #"./swayfx.nix"
-    ./hardware.nix
-    ./theme.nix
-    ./hotkeys.nix
-    ./rules.nix
-    ./autostart.nix
-    ./waybar.nix
-    ./swayshot.nix
+    ./hardware
+    ./theme
+    ./hotkeys
+    ./rules
+    ./autostart
+    ./waybar
+    ./swayshot
+    ./swaylock
+    ./swayfx
   ];
 
   # Enable Sway and write some scripts

home/sway/hardware/default.nix

@@ -1,4 +1,4 @@
-{config, pkgs, outputs, ...}: {
+{ pkgs, outputs, ... }: {
   wayland.windowManager.sway = {
     config = {
       # Define monitors

home/sway/hotkeys/default.nix

@@ -1,4 +1,4 @@
-{config, pkgs, outputs, ...}: {
+{ pkgs, outputs, ... }: {
   wayland.windowManager.sway = {
     config = let
       # Set default modifier and variables

home/sway/rules/default.nix

@@ -1,5 +1,4 @@
-{config, pkgs, outputs, ...}: {
-  # Enable Sway and write some scripts
+{ pkgs, outputs, ... }: {
   wayland.windowManager.sway = {
     config = {
       # Assign workspaces to outputs
@@ -112,8 +111,8 @@
       };
       assigns = {
         # Brooutputs.wsers
-        "${outputs.ws.w1}" = [{app_id = "JimBrooutputs.wser";}];
-        "${outputs.ws.w1a}" = [{app_id = "AltBrooutputs.wser";}];
+        "${outputs.ws.w1}" = [{app_id = "JimBrowser";}];
+        "${outputs.ws.w1a}" = [{app_id = "AltBrowser";}];
 
         # Communication
         "${outputs.ws.w3a}" = [{class = "zoom";}];

home/sway/swayfx/default.nix

@@ -1,9 +1,8 @@
-{config, pkgs, ...}: {
+{ pkgs, ... }: {
   # Enable Sway and write some scripts
   wayland.windowManager.sway = {
     package = pkgs.unstable.sway;
     extraConfig = ''
-      # SwayFX specific options
       blur enable
       blur_passes 3
       blur_radius 5

home/sway/swaylock/default.nix

@@ -1,4 +1,4 @@
-{config, pkgs, outputs, ...}: let 
+{ pkgs, outputs, ... }: let 
   swayLock = pkgs.writeScriptBin "swaylock" ''
     # Set the lock script
     lockscript() {

home/sway/swayshot/default.nix

@@ -1,6 +1,9 @@
-{pkgs, outputs, ...}: {
+{ pkgs, outputs, ... }: {
+  imports = [
+    ./swappy
+  ];
+
   home.packages = let
-    # Use grim and slurp to take screenshots in multiple ways
     swayShot = pkgs.writeScriptBin "swayshot" ''
       # Swappy
       handle_swappy() {

home/sway/swayshot/swappy/default.nix

@@ -0,0 +1,14 @@
+{ pkgs, ... }: {
+  home = {
+    packages = with pkgs; [
+      swappy
+    ];
+    file = {
+      ".config/swappy/config".text = ''
+        [Default]
+        early_exit=true
+        save_dir=$HOME/Pictures/Screenshots
+      '';
+    };
+  };
+}

home/sway/theme/default.nix

@@ -1,12 +1,9 @@
-{config, pkgs, outputs, ...}: {
-  # Enable Sway and write some scripts
+{ config, pkgs, outputs, ... }: {
   wayland.windowManager.sway = {
     enable = true;
-    #package = pkgs.unstable.sway;
     wrapperFeatures.gtk = true;
     checkConfig = false;
     config = {
-      # Theming settings
       colors = {
         focused = {
           border = "#${outputs.look.colors.prime}";

home/sway/waybar/default.nix

@@ -1,4 +1,4 @@
-{pkgs, outputs, ...}: {
+{ pkgs, outputs, ... }: {
   programs.waybar = let
     swayWorkspacesModule = {
       format = "{name}";