From c12d3859ff51a41adf1d1a2e0b7155718e1f2bfd Mon Sep 17 00:00:00 2001
From: zoe <ZoeOosting@outlook.com>
Date: Tue, 21 Mar 2023 12:42:38 +0100
Subject: [PATCH] improve i3 focus and move modes

---
 i3/config.nix | 31 +++++++++++++++++++++++++++++++
 user.nix      |  1 +
 2 files changed, 32 insertions(+)

diff --git a/i3/config.nix b/i3/config.nix
index 2bc2633..9bd3306 100644
--- a/i3/config.nix
+++ b/i3/config.nix
@@ -8,6 +8,16 @@ let
   color_inactive = "#${config.color.cyan}";
   color_indicator = "#${config.color.magenta}";
   color_evil = "#${config.color.red}";
+  ws1 = "1";
+  ws2 = "2";
+  ws3 = "3";
+  ws4 = "4";
+  ws5 = "5";
+  ws6 = "6";
+  ws7 = "7";
+  ws8 = "8";
+  ws9 = "9";
+  ws10 = "10";
 in
 {
   home-manager.users.zoe.xsession.windowManager.i3.config = {
@@ -117,6 +127,16 @@ in
         h = "exec i3l move left";
         l = "exec i3l move right";
         s = "exec i3l swap container with previous";
+        "1" = "move workspace ${ws1}";
+        "2" = "move workspace ${ws2}";
+        "3" = "move workspace ${ws3}";
+        "4" = "move workspace ${ws4}";
+        "5" = "move workspace ${ws5}";
+        "6" = "move workspace ${ws6}";
+        "7" = "move workspace ${ws7}";
+        "8" = "move workspace ${ws8}";
+        "9" = "move workspace ${ws9}";
+        "0" = "move workspace ${ws10}";
       };
       focus = {
         Escape = "mode default";
@@ -126,6 +146,17 @@ in
         j = "focus down";
         k = "focus up";
         l = "focus right";
+        Tab = "workspace next";
+        "1" = "workspace ${ws1}";
+        "2" = "workspace ${ws2}";
+        "3" = "workspace ${ws3}";
+        "4" = "workspace ${ws4}";
+        "5" = "workspace ${ws5}";
+        "6" = "workspace ${ws6}";
+        "7" = "workspace ${ws7}";
+        "8" = "workspace ${ws8}";
+        "9" = "workspace ${ws9}";
+        "0" = "workspace ${ws10}";
       };
     };
 
diff --git a/user.nix b/user.nix
index cfb4ea0..7dce04f 100644
--- a/user.nix
+++ b/user.nix
@@ -55,6 +55,7 @@ in
       playerctl
       pamixer
       projectm
+      picard
 
       # video
       syncplay