From 0c7342a659f4b12f1eba3027912861336816349f Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Sun, 11 Aug 2024 12:40:09 -0400
Subject: [PATCH] sway: add tab and split binds (#86)

* sway: add tab and split binds

* sway: move capslock override to user config
---
 homeManagerModules/desktop/sway/README.md    | 2 ++
 homeManagerModules/desktop/sway/settings.nix | 5 +++--
 homes/aly/windowManagers/default.nix         | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/homeManagerModules/desktop/sway/README.md b/homeManagerModules/desktop/sway/README.md
index e19385c9..9d9f5029 100644
--- a/homeManagerModules/desktop/sway/README.md
+++ b/homeManagerModules/desktop/sway/README.md
@@ -67,6 +67,8 @@ ______________________________________________________________________
 - SUPER + F11: Show/hide top panel.
 - SUPER + TAB: Open Window list.
 - SUPER + V: Toggle floating window.
+- SUPER SHIFT + Backslash: Toggle vertical/horizontal splits.
+- SUPER SHIFT + G: Toggle tabbed layout.
 - SUPER SHIFT + W: Toggle fullscreen.
 
 #### Focus
diff --git a/homeManagerModules/desktop/sway/settings.nix b/homeManagerModules/desktop/sway/settings.nix
index b793d26e..5bc8c42f 100644
--- a/homeManagerModules/desktop/sway/settings.nix
+++ b/homeManagerModules/desktop/sway/settings.nix
@@ -65,7 +65,7 @@ in {
 
     gaps = {
       inner = 5;
-      outer = 5;
+      outer = 6;
     };
 
     input = {
@@ -81,7 +81,6 @@ in {
       "type:keyboard" = {
         xkb_layout = "us";
         xkb_variant = "altgr-intl";
-        xkb_options = "caps:ctrl_modifier";
       };
     };
 
@@ -98,7 +97,9 @@ in {
         "${modifier}+Period" = "workspace next";
         "${modifier}+R" = "exec ${lib.getExe config.programs.rofi.package} -show combi";
         "${modifier}+S" = "scratchpad show";
+        "${modifier}+Shift+Backslash" = "layout toggle split";
         "${modifier}+Shift+Comma" = "move container to workspace prev; workspace prev";
+        "${modifier}+Shift+G" = "layout toggle splitv tabbed";
         "${modifier}+Shift+Period" = "move container to workspace next; workspace next";
         "${modifier}+Shift+R" = "exec ${lib.getExe config.programs.rofi.package} -show run";
         "${modifier}+Shift+S" = "move scratchpad";
diff --git a/homes/aly/windowManagers/default.nix b/homes/aly/windowManagers/default.nix
index 801c7f5b..e4f4b5d6 100644
--- a/homes/aly/windowManagers/default.nix
+++ b/homes/aly/windowManagers/default.nix
@@ -20,6 +20,8 @@
 
       floating.criteria = [{app_id = "Bitwarden";} {app_id = "org.keepassxc.KeePassXC";}];
 
+      input."type:keyboard".xkb_options = "caps:ctrl_modifier";
+
       keybindings = {
         "${config.wayland.windowManager.sway.config.modifier}+P" = "exec ${lib.getExe pkgs.rofi-rbw-wayland}";
         "${config.wayland.windowManager.sway.config.modifier}+N" = "exec ${lib.getExe' pkgs.obsidian "obsidian"}";