[sway] Fix/add caps:escape option

home/home-default.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 let
-  nextcloudTalkDesktop = pkgs.callPackage ./modules/applications/nextcloud-talk-desktop/package.nix {};
+  nextcloudTalkDesktop = pkgs.callPackage ./modules/nextcloud-talk-desktop/package.nix {};
 in
 {
   # Home Manager needs a bit of information about you and the paths it should
@@ -106,10 +106,9 @@ in
   nixpkgs.config.allowUnfree = true;
 
   imports = [
-    ./modules/applications/emacs
+    ./modules/emacs
-    ./modules/games/lutris
+    ./modules/lutris
-    ./modules/window_managers/i3
+    ./modules/i3+sway
-    ./modules/window_managers/sway
   ];
 
   programs.bash.enable = true;

home/home-nix-book.nix

@@ -3,6 +3,6 @@
 {
   imports = [
     ./home-default.nix
-    ./modules/window_managers/hyprland/nix-book.nix
+    ./modules/hyprland/nix-book.nix
   ];
 }

home/home-z790prors.nix

@@ -3,6 +3,6 @@
 {
   imports = [
     ./home-default.nix
-    ./modules/window_managers/hyprland/z790prors.nix
+    ./modules/hyprland/z790prors.nix
   ];
 }

home/modules/i3+sway/default.nix

@@ -0,0 +1,27 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  shared_config = {
+    modifier = "Mod4";
+    terminal = "kitty";
+    defaultWorkspace = "workspace number 1";
+  };
+in {
+  xsession.windowManager.i3 = {
+    enable = true;
+    config = shared_config;
+  };
+
+  wayland.windowManager.sway = {
+    enable = true;
+    config = recursiveUpdate shared_config {
+      input = {
+        "type:keyboard" = {
+          xkb_options = "caps:escape";
+        };
+      };
+    };
+  };
+}

home/modules/window_managers/i3/default.nix

@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  xsession.windowManager.i3 = {
-    enable = true;
-    config = {
-      modifier = "Mod4";
-      terminal = "kitty";
-      defaultWorkspace = "workspace number 1";
-    };
-  };
-}

home/modules/window_managers/sway/default.nix

@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  wayland.windowManager.sway = {
-    enable = true;
-    config = {
-      modifier = "Mod4";
-      terminal = "kitty";
-      defaultWorkspace = "workspace number 1";
-    };
-  };
-}