Merge branch 'reverse-layout' into i3-remap-experimental

conky/conky

@@ -2,8 +2,8 @@ conky.config = {
 	alignment = 'top_right',
 	background = true,
 	cpu_avg_samples = 2,
-	default_color = 'F9FAF9',
-	color2 = '00916e',
+	default_color = 'd3d3d3',
+	color2 = '566161',
 	double_buffer = true,
 	font = 'Bitstream Vera Sans:size=8',
 	draw_shades = false,

conky/conky_shortcuts

@@ -2,8 +2,8 @@ conky.config = {
 	alignment = 'bottom_left',
 	background = true,
 	cpu_avg_samples = 2,
-	default_color = '00916e',
-	color2 = 'F9FAF9',
+	default_color = '566161',
+	color2 = 'd3d3d3',
 	double_buffer = true,
 	font = 'Bitstream Vera Sans:size=8',
 	draw_shades = false,
@@ -22,9 +22,9 @@ ${color2}mod = ${color}<alt>
 ${color2}mod_next = ${color}<super>
 
 ${color2}open new terminal - ${color}mod+Enter
+${color2}open package-manager - ${color}mod_next+u
 ${color2}open browser - ${color}mod_next+i
-${color2}open pamac-manager - ${color}mod_next+u
-${color2}open bitwarden-desktop - ${color}mod_next+o
+${color2}open appfinder - ${color}mod_next+o
 ${color2}open putty - ${color}mod_next+p
 
 ${color2}rofi (launcher) - ${color}mod_next+d
@@ -35,20 +35,21 @@ ${color2}container layout (tabbed) - ${color}mod+w
 ${color2}container layout (horiz) - ${color}mod+q
 ${color2}container layout (vert) - ${color}mod+e
 ${color2}container layout (stck) - ${color}mod+s
-${color2}split container (horiz) - ${color}mod+z
-${color2}split container (vert) - ${color}mod+x
-${color2}toggle container type - ${color}mod+c
+${color2}split container (tabbed) - ${color}mod+c
 
-${color2}focus windows - ${color}mod+[hjkl]
+${color2}focus windows - ${color}mod+[hjkl|wasd]
+${color2}move windows - ${color}mod+shift+[hjkl|wasd]
+${color2}move right - ${color}mod+x
+${color2}move left - ${color}mod+z
 
 ${color2}switch to workspace 1-8 - ${color}mod+1-8
 ${color2}send to workspace 1-8 - ${color}mod+Alt+1-8
-${color2}navigate workspaces - ${color}mod+Ctrl+arrows
+${color2}navigate workspaces - ${color}mod+Ctrl+[hjkl|wasd]
 
 ${color2}toggle floating - ${color}mod+Shift+Space
-${color2}toggle sticky - ${color}mod+Cntrl+s
+${color2}toggle sticky - ${color}mod+Cntrl+v
 ${color2}window opacity up[dn] - ${color}mod+Alt+[x|z]
-${color2}window dim disable[enable] - ${color}mod+Alt+[a|d]
+${color2}window dim disable[enable] - ${color}mod+ctrl+shift+a
 
 ${color2}exit - ${color}mod+0
 ]]

i3/config

@@ -34,8 +34,13 @@ set $i3inputfont \\"-*-*-*-*-*-*-24-*-*-*-*-*-*-*\\"
 #set $indicator #109648
 
 # Theme 5 "illuminating emerald"
-set $accent-bg #00916e
-set $accent-txt #F9FAF9
+#set $accent-bg #00916e
+#set $accent-txt #F9FAF9
+#set $indicator #109648
+
+# Theme 6 "light gray"
+set $accent-bg #D3D3D3
+set $accent-txt #000000
 set $indicator #109648
 
 # set other colors
@@ -43,12 +48,11 @@ set $inactive-bg #323838
 set $inactive-txt #F9FAF9
 set $unfocused-bg #566161
 set $unfocused-txt #bdbbbb
-set $borders-all #35393c
 
 # class                  border       backgr.    text        indic.     child_border
-client.focused           $borders-all $accent-bg $accent-txt $indicator $accent-bg
-client.focused_inactive  $borders-all $inactive-bg $inactive-txt $indicator $inactive-bg
-client.unfocused         $borders-all $unfocused-bg $unfocused-txt $indicator $unfocused-bg
+client.focused           $accent-bg $accent-bg $accent-txt $indicator $accent-bg
+client.focused_inactive  $inactive-bg $inactive-bg $inactive-txt $indicator $inactive-bg
+client.unfocused         $unfocused-bg $unfocused-bg $unfocused-txt $indicator $unfocused-bg
 #client.urgent           #CB4B16 #FDF6E3 #CB4B16 $indicator
 #client.placeholder      #000000 #0c0c0c $accent-txt #000000
 #client.background       #2B2C2B
@@ -75,9 +79,9 @@ hide_edge_borders none
 popup_during_fullscreen leave_fullscreen
 
 # change borders
-bindsym $mod+$mod_next+bracketleft $border_no_name
-bindsym $mod+$mod_next+bracketright border none
-bindsym $mod+$mod_next+backslash $border_normal
+bindsym $mod+$mod_next+b $border_normal
+bindsym $mod+Shift+b $border_no_name
+bindsym $mod+Ctrl+b border none
 
 # xrandr set to default res (needed if unplug monitor and can't see screen)
 bindsym $mod+backslash exec --no-startup-id "xrandr --output eDP-1-1 --mode 2560x1440 --rate 240"
@@ -176,17 +180,15 @@ bindsym $mod+d focus right
 #bindsym $mod_next+Shift+period exec "COUNT=$count_children; if [ \\"$COUNT\\" -gt 1 ]; then MST=$get_layout; i3-msg layout stacked, focus right; STK=$get_layout; i3-msg layout stacked, focus left, move right, focus up, layout $STK, focus parent, focus left, layout $MST; fi"
 #bindsym $mod_next+Shift+comma exec "COUNT=$count_children; if [ \\"$COUNT\\" -gt 1 ]; then STK=$get_layout; i3-msg layout stacked, focus left; MST=$get_layout; i3-msg layout stacked, focus right, move left, focus up, layout $MST, focus parent, focus right, layout $STK; fi"
 
-# simple master-stack moving
-bindsym $mod+z move left
-bindsym $mod+Shift+z move left, focus right
-bindsym $mod+x move right
-bindsym $mod+Shift+x move right, focus left
-
 # container focusing (with fallback for case where window is direct child of workspace container)
 # NOTE: requires xdotool
 #bindsym $mod+comma exec "WINDOW=$(xdotool getactivewindow); i3-msg \\"focus parent; focus left; focus child\\"; NEW_WINDOW=$(xdotool getactivewindow); if [ \\"$NEW_WINDOW\\" -eq \\"$WINDOW\\" ]; then i3-msg \\"focus left\\"; fi"
 #bindsym $mod+period exec "WINDOW=$(xdotool getactivewindow); i3-msg \\"focus parent; focus right; focus child\\"; NEW_WINDOW=$(xdotool getactivewindow); if [ \\"$NEW_WINDOW\\" -eq \\"$WINDOW\\" ]; then i3-msg \\"focus right\\"; fi"
 
+# convenience move
+bindsym $mod+z move left
+bindsym $mod+x move right
+
 # move focused window
 bindsym $mod+Shift+Left move left 100px
 bindsym $mod+Shift+Down move down 100px
@@ -250,7 +252,7 @@ bindsym $mod+Shift+space floating toggle
 bindsym $mod+Ctrl+space focus mode_toggle
 
 # toggle sticky
-bindsym $mod+Ctrl+f sticky toggle;exec notify-send 'sticky windows toggled'
+bindsym $mod+Ctrl+v sticky toggle;exec notify-send 'sticky windows toggled'
 
 # focus last window
 # requires (https://crates.io/crates/i3-focus-last)
@@ -300,6 +302,7 @@ set $ws5 number 5:5
 set $ws6 number 6:6
 set $ws7 number 7:7
 set $ws8 number 8:8
+exec --no-startup-id workspace 1
 
 # switch to workspace
 bindsym $mod+Ctrl+grave workspace $wsg
@@ -525,7 +528,7 @@ bar {
 }
 
 # hide/unhide i3status bar
-bindsym $mod+Control+b bar mode toggle
+bindsym $mod+Control+m bar mode toggle
 
 #############################
 ### settings for i3-gaps: ###

i3/config.simple

@@ -34,8 +34,13 @@ set $i3inputfont \\"-*-*-*-*-*-*-24-*-*-*-*-*-*-*\\"
 #set $indicator #109648
 
 # Theme 5 "illuminating emerald"
-set $accent-bg #00916e
-set $accent-txt #F9FAF9
+#set $accent-bg #00916e
+#set $accent-txt #F9FAF9
+#set $indicator #109648
+
+# Theme 6 "light gray"
+set $accent-bg #D3D3D3
+set $accent-txt #000000
 set $indicator #109648
 
 # set other colors
@@ -46,15 +51,15 @@ set $unfocused-txt #bdbbbb
 set $borders-all #000000
 
 # class                  border       backgr.    text        indic.     child_border
-client.focused           $borders-all $accent-bg $accent-txt $indicator $accent-bg
-client.focused_inactive  $borders-all $inactive-bg $inactive-txt $indicator $inactive-bg
-client.unfocused         $borders-all $unfocused-bg $unfocused-txt $indicator $unfocused-bg
+client.focused           $accent-bg $accent-bg $accent-txt $indicator $accent-bg
+client.focused_inactive  $inactive-bg $inactive-bg $inactive-txt $indicator $inactive-bg
+client.unfocused         $unfocused-bg $unfocused-bg $unfocused-txt $indicator $unfocused-bg
 #client.urgent           #CB4B16 #FDF6E3 #CB4B16 $indicator
 #client.placeholder      #000000 #0c0c0c $accent-txt #000000
 #client.background       #2B2C2B
 
 # set default desktop layout (default is tiling) <default|stacking|tabbed>
-workspace_layout tabbed
+workspace_layout tabbed reverse
 
 # set default window title_align
 title_align center
@@ -75,9 +80,9 @@ hide_edge_borders none
 popup_during_fullscreen leave_fullscreen
 
 # change borders
-bindsym $mod+$mod_next+bracketleft $border_no_name
-bindsym $mod+$mod_next+bracketright border none
-bindsym $mod+$mod_next+backslash $border_normal
+bindsym $mod+$mod_next+b $border_normal
+bindsym $mod+Shift+b $border_no_name
+bindsym $mod+Ctrl+b border none
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
@@ -152,34 +157,32 @@ bindsym $mod+d focus right
 #bindsym $mod_next+Shift+period exec "COUNT=$count_children; if [ \\"$COUNT\\" -gt 1 ]; then MST=$get_layout; i3-msg layout stacked, focus right; STK=$get_layout; i3-msg layout stacked, focus left, move right, focus up, layout $STK, focus parent, focus left, layout $MST; fi"
 #bindsym $mod_next+Shift+comma exec "COUNT=$count_children; if [ \\"$COUNT\\" -gt 1 ]; then STK=$get_layout; i3-msg layout stacked, focus left; MST=$get_layout; i3-msg layout stacked, focus right, move left, focus up, layout $MST, focus parent, focus right, layout $STK; fi"
 
-# simple master-stack moving
-bindsym $mod+z move left
-bindsym $mod+Shift+z move left, focus right
-bindsym $mod+x move right
-bindsym $mod+Shift+x move right, focus left
-
 # container focusing (with fallback for case where window is direct child of workspace container)
 # NOTE: requires xdotool
 #bindsym $mod+comma exec "WINDOW=$(xdotool getactivewindow); i3-msg \\"focus parent; focus left; focus child\\"; NEW_WINDOW=$(xdotool getactivewindow); if [ \\"$NEW_WINDOW\\" -eq \\"$WINDOW\\" ]; then i3-msg \\"focus left\\"; fi"
 #bindsym $mod+period exec "WINDOW=$(xdotool getactivewindow); i3-msg \\"focus parent; focus right; focus child\\"; NEW_WINDOW=$(xdotool getactivewindow); if [ \\"$NEW_WINDOW\\" -eq \\"$WINDOW\\" ]; then i3-msg \\"focus right\\"; fi"
 
+# convenience move
+bindsym $mod+z move left, layout fill_order reverse
+bindsym $mod+x move right, layout fill_order reverse
+
 # move focused window
-bindsym $mod+Shift+Left move left 100px
-bindsym $mod+Shift+Down move down 100px
-bindsym $mod+Shift+Up move up 100px
-bindsym $mod+Shift+Right move right 100px
+bindsym $mod+Shift+Left move left 100px, layout fill_order reverse
+bindsym $mod+Shift+Down move down 100px, layout fill_order reverse
+bindsym $mod+Shift+Up move up 100px, layout fill_order reverse
+bindsym $mod+Shift+Right move right 100px, layout fill_order reverse
 
 # hjkl move
-bindsym $mod+Shift+h move left 100px
-bindsym $mod+Shift+j move down 100px
-bindsym $mod+Shift+k move up 100px
-bindsym $mod+Shift+l move right 100px
+bindsym $mod+Shift+h move left 100px, layout fill_order reverse
+bindsym $mod+Shift+j move down 100px, layout fill_order reverse
+bindsym $mod+Shift+k move up 100px, layout fill_order reverse
+bindsym $mod+Shift+l move right 100px, layout fill_order reverse
 
 # wasd move
-bindsym $mod+Shift+w move up 100px
-bindsym $mod+Shift+a move left 100px
-bindsym $mod+Shift+s move down 100px
-bindsym $mod+Shift+d move right 100px
+bindsym $mod+Shift+w move up 100px, layout fill_order reverse
+bindsym $mod+Shift+a move left 100px, layout fill_order reverse
+bindsym $mod+Shift+s move down 100px, layout fill_order reverse
+bindsym $mod+Shift+d move right 100px, layout fill_order reverse
 
 # mark and focus
 bindsym $mod+Ctrl+1 mark --add --toggle 1
@@ -202,18 +205,18 @@ bindsym $mod+slash exec $namechildcon
 bindsym $mod+$mod_next+slash focus parent; title_format " %title"; focus child
 
 # container layouts
-bindsym $mod_next+w layout tabbed
-bindsym $mod_next+q layout splith
-bindsym $mod_next+e layout splitv
-bindsym $mod_next+s layout stacking
+bindsym $mod_next+w layout tabbed reverse
+bindsym $mod_next+q layout splith reverse
+bindsym $mod_next+e layout splitv reverse
+bindsym $mod_next+s layout stacking reverse
 
 # child container layout bindsyms (creates a child container from currently select window)
 set $namechildcon "i3-msg focus parent; i3-input -f \\"-*-*-*-*-*-*-24-*-*-*-*-*-*-*\\" -P \\"Name child container: \\" -F 'title_format \\"<span><b>%s</b>%title</span>\\"'; i3-msg focus child"
-bindsym $mod+ctrl+q split h
-bindsym $mod+ctrl+e split v
-bindsym $mod+ctrl+w split h; layout tabbed 
-bindsym $mod+c split h; layout tabbed 
-bindsym $mod+ctrl+s split h; layout stacked
+bindsym $mod+ctrl+q split h reverse
+bindsym $mod+ctrl+e split v reverse
+bindsym $mod+ctrl+w split h; layout tabbed reverse
+bindsym $mod+c split h; layout tabbed reverse
+bindsym $mod+ctrl+s split h; layout stacked reverse  
 
 # toggle fullscreen mode for the focused container
 bindsym $mod+f fullscreen toggle
@@ -226,7 +229,7 @@ bindsym $mod+Shift+space floating toggle
 bindsym $mod+Ctrl+space focus mode_toggle
 
 # toggle sticky
-bindsym $mod+Ctrl+f sticky toggle;exec notify-send 'sticky windows toggled'
+bindsym $mod+Ctrl+v sticky toggle;exec notify-send 'sticky windows toggled'
 
 # focus last window
 # requires (https://crates.io/crates/i3-focus-last)
@@ -276,6 +279,7 @@ set $ws5 number 5:5
 set $ws6 number 6:6
 set $ws7 number 7:7
 set $ws8 number 8:8
+exec --no-startup-id workspace 1
 
 # switch to workspace
 bindsym $mod+Ctrl+grave workspace $wsg
@@ -399,4 +403,4 @@ bar {
 }
 
 # hide/unhide i3status bar
-bindsym $mod+Control+b bar mode toggle
+bindsym $mod+Control+m bar mode toggle