Merge branch 'master' of https://github.com/urbainvaes/dotfiles

3 files changed, 13 insertions, 12 deletions

diff --git a/bin/.local/bin/keyboard b/bin/.local/bin/keyboard
index b7f5e90..59a9ee0 100755
--- a/bin/.local/bin/keyboard
+++ b/bin/.local/bin/keyboard
@@ -46,13 +46,14 @@ xmodmap -e "keycode any = space"
 xcape -e 'Super_L=space'
 
 # Make return (Control_R, Return)
-xmodmap -e "keysym Return = Control_R"
-xmodmap -e "add Control = Control_R"
-xmodmap -e "keycode any = Return"
-xcape -e 'Control_R=Return'
+# xmodmap -e "keysym Return = Control_R"
+# xmodmap -e "add Control = Control_R"
+# xmodmap -e "keycode any = Return"
+# xcape -e 'Control_R=Return'
 
-# Make eject an Insert
+# Make eject and Home an Insert
 xmodmap -e "keysym XF86Eject = Insert"
+xmodmap -e "keysym Home = Insert"
 
 # Numbers
 xmodmap -e "keysym d = d D 0"
diff --git a/bin/.local/bin/keyboard-us b/bin/.local/bin/keyboard-us
index 1b6ceba..1b150fc 100755
--- a/bin/.local/bin/keyboard-us
+++ b/bin/.local/bin/keyboard-us
@@ -13,10 +13,10 @@ setxkbmap us
 xmodmap -e "clear Lock"
 xmodmap -e "keysym Caps_Lock = Control_L Control_L"
 xmodmap -e "add Control = Control_L"
-xcape -e 'Control_L=Escape'
+# xcape -e 'Control_L=Escape'
 
 # Make space (Super_L, space)
-xmodmap -e "keysym space = Super_L"
-xmodmap -e "add mod4 = Super_L"
-xmodmap -e "keycode any = space"
+# xmodmap -e "keysym space = Super_L"
+# xmodmap -e "add mod4 = Super_L"
+# xmodmap -e "keycode any = space"
 # xcape -e 'Super_L=space'
diff --git a/bin/.local/bin/workspace b/bin/.local/bin/workspace
index ad378ef..36f09d4 100755
--- a/bin/.local/bin/workspace
+++ b/bin/.local/bin/workspace
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
-# List of workspaces
+# List of workspaces: ( number, name, focused)
 workspaces=$(i3-msg -t get_workspaces | awk 'BEGIN {
                                                         RS="(},{)|(\\[{)|(}\\])";
-                                                        FPAT="([^,:]+)|([^,]+{[^}]+})|(\"[^\"]+\")"
+                                                        FPAT="([^,:\"]+)|([^,\"]+:[^,\"]+)|([^,]+{[^}]+})"
                                              }
                                              $0 !~ "^\\s*$" {
                                              gsub(/"/, "", $4)
-                                             print $2, $4, $8, $11
+                                             print $4, $6, $10
                                              }' | sort)
 
 act_on_container() {