Merge branch 'development'

i3/config

@@ -66,13 +66,13 @@ exec --no-startup-id fcitx -d
 exec --no-startup-id alttab -pk h -nk l -fg "#d58681" -bg "#4a4a4a" -frame "#eb564d" -t 128x150 -i 127x64
 
 # kill focused window
-bindsym $mod+Shift+q kill
+bindsym $mod_next+Shift+q kill
 
 # start program launcher
 #bindsym $mod+d exec --no-startup-id dmenu_recency
 #exec --no-startup-id kupfer
 bindsym $mod_next+d 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"
+bindsym $mod+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
@@ -309,27 +309,22 @@ for_window [class="(?i)Gcolor3"] floating enable border none
 for_window [title="dropdown-terminal"] sticky enable border none
 for_window [title="dropdown-terminal"] move scratchpad
 exec --no-startup-id tilix -t dropdown-terminal
-bindsym $mod+Shift+Return [title="dropdown-terminal"] scratchpad show
+bindsym $mod_next+Shift+Return [title="dropdown-terminal"] scratchpad show
 bindsym $mod+$mod_next+Return [title="dropdown-terminal"] move position 0px 0px; resize set 1920 600
 
 # setting up dropdown Bitwarden
 for_window [title="Bitwarden"] sticky enable border none
 exec --no-startup-id com.bitwarden.desktop
-bindsym $mod+o [class="Bitwarden"] scratchpad show
+bindsym $mod_next+o [class="Bitwarden"] scratchpad show
 
 # Application shortcuts
-bindsym $mod+Return exec tilix
-bindsym $mod+Ctrl+b exec terminal -e 'bmenu'
-#bindsym $mod+F2 exec --no-startup-id pavucontrol
-#bindsym $mod+F5 exec terminal -e 'mocp'
-bindsym $mod+F10 exec blueman-manager
-bindsym $mod+t exec --no-startup-id pkill compton
-bindsym $mod+Ctrl+t exec --no-startup-id compton -b
-bindsym $mod+Ctrl+d --release exec "killall dunst; exec notify-send 'restart dunst'"
+bindsym $mod_next+Return exec tilix
+bindsym $mod_next+Ctrl+b exec terminal -e 'bmenu'
+bindsym $mod_next+t exec --no-startup-id pkill compton
+bindsym $mod_next+Ctrl+t exec --no-startup-id compton -b
+bindsym $mod_next+Ctrl+d --release exec "killall dunst; exec notify-send 'restart dunst'"
 bindsym Print exec --no-startup-id i3-scrot
-bindsym $mod+Print --release exec --no-startup-id i3-scrot -w
-bindsym $mod+Shift+Print --release exec --no-startup-id i3-scrot -s
-bindsym $mod+Ctrl+x --release exec --no-startup-id xkill
+bindsym $mod_next+Ctrl+x --release exec --no-startup-id xkill
 
 # shortcuts to often used applications
 bindsym $mod_next+u exec pamac-manager
@@ -351,6 +346,8 @@ bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+Shift+r restart
 
+bindsym $mod_next+l exec i3exit lock
+
 # exit i3 (logs you out of your X session)
 #bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
 

rofi/config

@@ -3,8 +3,8 @@ rofi.theme: ~/.jt-config-repo/rofi/themes/lb-numix.rasi
 
 !keyboard binding changes: tab, shift+tab to switch modes
 rofi.kb-row-tab:    
-rofi.kb-row-up:         Up,Control+p,Super+k
-rofi.kb-row-down:       Down,Control+n,Super+j
-rofi.kb-mode-next:      Tab,Super+l
-rofi.kb-mode-previous:  ISO_Left_Tab,Super+h
-rofi.kb-accept-entry:   Return,Super+Return
+rofi.kb-row-up:         Up,Control+p,Alt+k
+rofi.kb-row-down:       Down,Control+n,Alt+j
+rofi.kb-mode-next:      Tab,Alt+l
+rofi.kb-mode-previous:  ISO_Left_Tab,Alt+h
+rofi.kb-accept-entry:   Return,Alt+Return