Merge branch 'development'

i3/config

@@ -30,9 +30,6 @@ client.unfocused        $bgucolor $bgucolor $txtucolor $indcolor $bgucolor
 # set default desktop layout (default is tiling) <default|stacking|tabbed>
 workspace_layout tabbed
 
-# set preferred focus_wrapping <yes|no|force>
-#focus_wrapping no
-
 # Configure border style <normal|1pixel|pixel xx|none|pixel>
 for_window [class=".*"] $border_no_name
 
@@ -86,8 +83,6 @@ bindsym $mod_next+d exec --no-startup-id "rofi -show-icons -modi windowcd,window
 bindsym $mod_next+Return exec --no-startup-id "rofi -show-icons -modi windowcd,window,drun -show drun"
 bindsym $mod_next+Tab exec --no-startup-id "rofi -show-icons -modi windowcd,window,drun -show window"
 
-# launch categorized menu
-#bindsym $mod+c exec --no-startup-id morc_menu
 
 ################################################################################################
 ## sound-section - DO NOT EDIT if you wish to automatically upgrade Alsa -> Pulseaudio later! ##
@@ -177,11 +172,6 @@ bindsym $mod+$mod_next+s split h; layout stacked; focus child; exec "$con_title"
 # toggle fullscreen mode for the focused container
 bindsym $mod+f fullscreen toggle
 bindsym $mod+shift+f exec "i3-msg focus parent, fullscreen toggle, focus child"
-bindsym --whole-window $mod+button8 fullscreen toggle
-
-# several 16:9 resolutions binded for quick switching
-bindsym $mod+bracketright exec xrandr -s 1280x720
-bindsym $mod+backslash exec xrandr -s 1920x1080
 
 # toggle tiling / floating focus
 bindsym $mod+Shift+space floating toggle
@@ -290,8 +280,6 @@ for_window [class="Calamares"] floating enable border normal
 for_window [class="Clipgrab"] floating enable
 for_window [class="Galculator"] floating enable border pixel 1
 for_window [class="Lightdm-gtk-greeter-settings"] floating enable
-for_window [class="Lxappearance"] floating enable sticky enable border normal
-for_window [class="Manjaro Settings Manager"] floating enable border normal
 for_window [class="Manjaro-hello"] floating enable
 for_window [class="Qtconfig-qt4"] floating enable sticky enable border normal
 for_window [class="Shutter"] floating disable
@@ -303,9 +291,7 @@ for_window [class="copyq"] floating enable border pixel 1
 for_window [class="octopi"] floating enable
 for_window [class="qt5ct"] floating enable sticky enable border normal
 for_window [class="spectacle"] floating disable
-for_window [title="About Pale Moon"] floating enable
 for_window [title="File Transfer*"] floating enable
-for_window [title="MuseScore: Play Panel"] floating enable
 for_window [title="alsamixer"] floating enable border pixel 1
 for_window [class="(?i)^timeshift-gtk$"] floating disable
 for_window [class="(?i)^gnome-calculator$"] floating disable
@@ -436,7 +422,6 @@ mode "$mode_redshift" {
     bindsym Escape mode "default"
 }
 
-
 # Start i3bar to display a workspace bar (plus the system information i3status if available)
 bar {
     i3bar_command i3bar

i3/config.simple

@@ -45,7 +45,7 @@ bindsym $mod+$mod_next+period border none
 bindsym $mod+Control+period $border_normal
 
 # Font for window titles. Will also be used by the bar unless a different font
-# # is used in the bar {} block below.
+# is used in the bar {} block below.
 #font pango:monospace 8
 font xft:BitstreamVeraSans-Roman 10
 
@@ -163,14 +163,14 @@ bindsym $mod+Ctrl+h workspace prev
 # to display names or symbols instead of plain workspace numbers you can use
 # something like: set $ws1 1:mail
 #                 set $ws2 2:
-set $ws1 1
-set $ws2 2
-set $ws3 3
-set $ws4 4
-set $ws5 5
-set $ws6 6
-set $ws7 7
-set $ws8 8
+set $ws1 number 1:1
+set $ws2 number 2:2
+set $ws3 number 3:3
+set $ws4 number 4:4
+set $ws5 number 5:5
+set $ws6 number 6:6
+set $ws7 number 7:7
+set $ws8 number 8:8
 
 # switch to workspace
 bindsym $mod+1 workspace $ws1
@@ -290,4 +290,61 @@ bar {
 }
 
 # hide/unhide i3status bar
-bindsym $mod+Control+m bar mode toggle
+bindsym $mod+Control+b bar mode toggle
+
+#############################
+### settings for i3-gaps: ###
+#############################
+
+## Set inner/outer gaps
+#gaps inner 6
+#gaps outer -6
+#
+## Additionally, you can issue commands with the following syntax. This is useful to bind keys to changing the gap size.
+## gaps inner|outer current|all set|plus|minus <px>
+## gaps inner all set 10
+## gaps outer all plus 5
+#
+## Smart gaps (gaps used if only more than one container on the workspace)
+##smart_gaps on
+#
+## Smart borders (draw borders around container only if it is not the only container on this workspace)
+## on|no_gaps (on=always activate and no_gaps=only activate if the gap size to the edge of the screen is 0)
+#smart_borders on
+#
+## Press $mod+Shift+g to enter the gap mode. Choose o or i for modifying outer/inner gaps. Press one of + / - (in-/decrement for current workspace) or 0 (remove gaps for current workspace). If you also press Shift with these keys, the change will be global for all workspaces.
+#set $mode_gaps Gaps: (o) outer, (i) inner
+#set $mode_gaps_outer Outer Gaps: +|-|0 (local), Shift + +|-|0 (global)
+#set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global)
+#bindsym $mod+Shift+g mode "$mode_gaps"
+#
+#mode "$mode_gaps" {
+#        bindsym o      mode "$mode_gaps_outer"
+#        bindsym i      mode "$mode_gaps_inner"
+#        bindsym Return mode "default"
+#        bindsym Escape mode "default"
+#}
+#mode "$mode_gaps_inner" {
+#        bindsym plus  gaps inner current plus 5
+#        bindsym minus gaps inner current minus 5
+#        bindsym 0     gaps inner current set 0
+#
+#        bindsym Shift+plus  gaps inner all plus 5
+#        bindsym Shift+minus gaps inner all minus 5
+#        bindsym Shift+0     gaps inner all set 0
+#
+#        bindsym Return mode "default"
+#        bindsym Escape mode "default"
+#}
+#mode "$mode_gaps_outer" {
+#        bindsym plus  gaps outer current plus 5
+#        bindsym minus gaps outer current minus 5
+#        bindsym 0     gaps outer current set 0
+#
+#        bindsym Shift+plus  gaps outer all plus 5
+#        bindsym Shift+minus gaps outer all minus 5
+#        bindsym Shift+0     gaps outer all set 0
+#
+#        bindsym Return mode "default"
+#        bindsym Escape mode "default"
+#}