Actually, move to qwerty layout

2 files changed, 58 insertions, 29 deletions

diff --git a/solanum/dot_tmux.conf b/solanum/dot_tmux.conf
index f548976..e6b5d2c 100644
--- a/solanum/dot_tmux.conf
+++ b/solanum/dot_tmux.conf
@@ -1,17 +1,17 @@
 # KEY BINDINGS
 
 
-new-session -n $HOST
+#new-session -n $HOST
 
 setw -g mode-keys vi
 
 # remap prefix to Control + a
-set -g prefix C-q
+set -g prefix C-a
 unbind C-b
-bind C-q send-prefix
+bind C-a send-prefix
 
-unbind q
-bind-key q copy-mode
+unbind a
+bind-key a copy-mode
 
 unbind p
 bind p paste-buffer
diff --git a/solanum/sway/config b/solanum/sway/config
index 631f30c..16487f5 100644
--- a/solanum/sway/config
+++ b/solanum/sway/config
@@ -9,7 +9,11 @@ xwayland enable
 
 #input "*" xkb_layout "fr"
 #input "*" xkb_variant "oss"
-input "*" xkb_file "/home/aauvolat/.xkb/symbols/custom-fr"
+#input "*" xkb_file "/home/aauvolat/.xkb/symbols/custom-fr"
+
+input "*" xkb_layout "us"
+input "*" xkb_variant "intl"
+
 seat "*" hide_cursor 5000
 
 #output "eDP-1" scale 1.2
@@ -116,34 +120,58 @@ bindsym $mod+q focus parent
 #bindcode $mod+d focus child
 
 # switch to workspace
-bindsym $mod+braceleft 	workspace 1
-bindsym $mod+eacute 	workspace 2
-bindsym $mod+quotedbl 	workspace 3
-bindsym $mod+apostrophe workspace 4
-bindsym $mod+parenleft 	workspace 5
-bindsym $mod+minus 		workspace 6
-bindsym $mod+dead_grave 	workspace 7
-bindsym $mod+underscore workspace 8
-bindsym $mod+ccedilla 	workspace 9
-bindsym $mod+braceright 	workspace 10
-bindsym $mod+parenright workspace 11
+#bindsym $mod+braceleft 	workspace 1
+#bindsym $mod+eacute 	workspace 2
+#bindsym $mod+quotedbl 	workspace 3
+#bindsym $mod+apostrophe workspace 4
+#bindsym $mod+parenleft 	workspace 5
+#bindsym $mod+minus 		workspace 6
+#bindsym $mod+dead_grave 	workspace 7
+#bindsym $mod+underscore workspace 8
+#bindsym $mod+ccedilla 	workspace 9
+#bindsym $mod+braceright 	workspace 10
+#bindsym $mod+parenright workspace 11
+#bindsym $mod+equal 		workspace 12
+bindsym $mod+1 	workspace 1
+bindsym $mod+2 	workspace 2
+bindsym $mod+3 	workspace 3
+bindsym $mod+4 workspace 4
+bindsym $mod+5 	workspace 5
+bindsym $mod+6 		workspace 6
+bindsym $mod+7 	workspace 7
+bindsym $mod+8 workspace 8
+bindsym $mod+9 	workspace 9
+bindsym $mod+0 	workspace 10
+bindsym $mod+minus workspace 11
 bindsym $mod+equal 		workspace 12
 
 workspace_auto_back_and_forth yes
 
 # move focused container to workspace
-bindsym $mod+Shift+braceleft 	move container to workspace 1
-bindsym $mod+Shift+eacute 		move container to workspace 2
-bindsym $mod+Shift+quotedbl 	move container to workspace 3
-bindsym $mod+Shift+apostrophe 	move container to workspace 4
-bindsym $mod+Shift+parenleft 	move container to workspace 5
-bindsym $mod+Shift+minus 		move container to workspace 6
-bindsym $mod+Shift+dead_grave 		move container to workspace 7
-bindsym $mod+Shift+underscore 	move container to workspace 8
-bindsym $mod+Shift+ccedilla 	move container to workspace 9
-bindsym $mod+Shift+braceright 		move container to workspace 10
-bindsym $mod+Shift+parenright 	move container to workspace 11
-bindsym $mod+Shift+equal 		move container to workspace 12
+#bindsym $mod+Shift+braceleft 	move container to workspace 1
+#bindsym $mod+Shift+eacute 		move container to workspace 2
+#bindsym $mod+Shift+quotedbl 	move container to workspace 3
+#bindsym $mod+Shift+apostrophe 	move container to workspace 4
+#bindsym $mod+Shift+parenleft 	move container to workspace 5
+#bindsym $mod+Shift+minus 		move container to workspace 6
+#bindsym $mod+Shift+dead_grave 		move container to workspace 7
+#bindsym $mod+Shift+underscore 	move container to workspace 8
+#bindsym $mod+Shift+ccedilla 	move container to workspace 9
+#bindsym $mod+Shift+braceright 		move container to workspace 10
+#bindsym $mod+Shift+parenright 	move container to workspace 11
+#bindsym $mod+Shift+equal 		move container to workspace 12
+bindsym $mod+Shift+1 	move container to workspace 1
+bindsym $mod+Shift+2 		move container to workspace 2
+bindsym $mod+Shift+3 	move container to workspace 3
+bindsym $mod+Shift+4 	move container to workspace 4
+bindsym $mod+Shift+5 	move container to workspace 5
+bindsym $mod+Shift+6 		move container to workspace 6
+bindsym $mod+Shift+7 		move container to workspace 7
+bindsym $mod+Shift+8 	move container to workspace 8
+bindsym $mod+Shift+9 	move container to workspace 9
+bindsym $mod+Shift+0 		move container to workspace 10
+bindsym $mod+Shift+underscore 	move container to workspace 11
+bindsym $mod+Shift+plus 		move container to workspace 12
 
 # Multi monitor setup
 workspace 1  output DP-4 DP-6 HDMI-A-1 eDP-1
@@ -272,5 +300,6 @@ exec swayidle -w timeout 600 'swaylock -f -c 000000 --clock --indicator-radius 2
 exec xset -b # disable bell
 exec xset s off -dpms # disable DPMS
 #exec nm-applet
+exec xrdb merge /home/aauvolat/.Xresources