Merge branch 'master' of https://github.com/GeoffreyFrogeye/dotfiles
Conflicts: scripts/tunnel
This commit is contained in:
commit
2803838314
10 changed files with 349 additions and 397 deletions
|
|
@ -96,7 +96,7 @@
|
|||
#
|
||||
# If this option is set to mouse or keyboard, the monitor option
|
||||
# will be ignored.
|
||||
follow = mouse
|
||||
follow = none
|
||||
|
||||
# Should a notification popped up from history be sticky or timeout
|
||||
# as if it would normally do.
|
||||
|
|
@ -162,19 +162,19 @@
|
|||
# Xev might be helpful to find names for keys.
|
||||
|
||||
# Close notification.
|
||||
close = mod1+space
|
||||
close = mod4+n
|
||||
|
||||
# Close all notifications.
|
||||
# close_all = ctrl+shift+space
|
||||
close_all = ctrl+mod1+space
|
||||
close_all = ctrl+mod4+n
|
||||
|
||||
# Redisplay last message(s).
|
||||
# On the US keyboard layout "grave" is normally above TAB and left
|
||||
# of "1".
|
||||
history = ctrl+mod4+h
|
||||
history = shift+mod4+n
|
||||
|
||||
# Context menu.
|
||||
context = ctrl+alt+c
|
||||
context = mod1+mod4+n
|
||||
|
||||
[urgency_low]
|
||||
# IMPORTANT: colors have to be defined in quotation marks.
|
||||
|
|
|
|||
26
config/htop/htoprc
Normal file
26
config/htop/htoprc
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
# Beware! This file is rewritten by htop when settings are changed in the interface.
|
||||
# The parser is also very primitive, and not human-friendly.
|
||||
fields=0 48 17 18 38 39 40 2 46 47 49 1
|
||||
sort_key=46
|
||||
sort_direction=1
|
||||
hide_threads=0
|
||||
hide_kernel_threads=0
|
||||
hide_userland_threads=0
|
||||
shadow_other_users=0
|
||||
show_thread_names=0
|
||||
show_program_path=1
|
||||
highlight_base_name=0
|
||||
highlight_megabytes=0
|
||||
highlight_threads=1
|
||||
tree_view=0
|
||||
header_margin=0
|
||||
detailed_cpu_time=0
|
||||
cpu_count_from_zero=0
|
||||
update_process_names=0
|
||||
account_guest_in_cpu_meter=0
|
||||
color_scheme=0
|
||||
delay=15
|
||||
left_meters=AllCPUs Memory Swap
|
||||
left_meter_modes=1 1 1
|
||||
right_meters=Tasks LoadAverage Uptime
|
||||
right_meter_modes=2 2 2
|
||||
|
|
@ -29,8 +29,8 @@ font pango:Sans 8
|
|||
floating_modifier $mod
|
||||
|
||||
# kill focused window
|
||||
#bindsym $mod+F4 kill
|
||||
bindsym Mod1+F4 kill
|
||||
bindsym $mod+z kill
|
||||
#bindsym Mod1+F4 kill
|
||||
bindsym button2 kill
|
||||
|
||||
# start dmenu (a program launcher)
|
||||
|
|
@ -81,11 +81,11 @@ bindsym $mod+j focus down
|
|||
bindsym $mod+k focus up
|
||||
bindsym $mod+l focus right
|
||||
|
||||
# alternatively, you can use the cursor keys:
|
||||
bindsym $mod+Left focus left
|
||||
bindsym $mod+Down focus down
|
||||
bindsym $mod+Up focus up
|
||||
bindsym $mod+Right focus right
|
||||
## alternatively, you can use the cursor keys:
|
||||
#bindsym $mod+Left focus left
|
||||
#bindsym $mod+Down focus down
|
||||
#bindsym $mod+Up focus up
|
||||
#bindsym $mod+Right focus right
|
||||
|
||||
# move focused window
|
||||
bindsym $mod+Shift+h move left
|
||||
|
|
@ -93,11 +93,11 @@ bindsym $mod+Shift+j move down
|
|||
bindsym $mod+Shift+k move up
|
||||
bindsym $mod+Shift+l move right
|
||||
|
||||
# alternatively, you can use the cursor keys:
|
||||
bindsym $mod+Shift+Left move left
|
||||
bindsym $mod+Shift+Down move down
|
||||
bindsym $mod+Shift+Up move up
|
||||
bindsym $mod+Shift+Right move right
|
||||
## alternatively, you can use the cursor keys:
|
||||
#bindsym $mod+Shift+Left move left
|
||||
#bindsym $mod+Shift+Down move down
|
||||
#bindsym $mod+Shift+Up move up
|
||||
#bindsym $mod+Shift+Right move right
|
||||
|
||||
# workspace back and forth (with/without active container)
|
||||
workspace_auto_back_and_forth yes
|
||||
|
|
@ -167,16 +167,28 @@ bindsym $mod+9 workspace $WS9
|
|||
bindsym $mod+0 workspace $WS10
|
||||
|
||||
#navigate workspaces next / previous
|
||||
bindsym $mod+Ctrl+Left workspace prev_on_output
|
||||
bindsym $mod+Ctrl+Right workspace next_on_output
|
||||
bindsym $mod+Ctrl+Down workspace prev
|
||||
bindsym $mod+Ctrl+Up workspace next
|
||||
bindsym $mod+Ctrl+h workspace prev_on_output
|
||||
bindsym $mod+Ctrl+l workspace next_on_output
|
||||
bindsym $mod+Ctrl+j workspace prev
|
||||
bindsym $mod+Ctrl+k workspace next
|
||||
|
||||
##navigate workspaces next / previous (arrow keys)
|
||||
#bindsym $mod+Ctrl+Left workspace prev_on_output
|
||||
#bindsym $mod+Ctrl+Right workspace next_on_output
|
||||
#bindsym $mod+Ctrl+Down workspace prev
|
||||
#bindsym $mod+Ctrl+Up workspace next
|
||||
|
||||
# Move to workspace next / previous with focused container
|
||||
bindsym $mod+Ctrl+Shift+Left move container to workspace prev_on_output; workspace prev_on_output
|
||||
bindsym $mod+Ctrl+Shift+Right move container to workspace next_on_output; workspace next_on_output
|
||||
bindsym $mod+Ctrl+Shift+Down move container to workspace prev; workspace prev
|
||||
bindsym $mod+Ctrl+Shift+Up move container to workspace next; workspace next
|
||||
bindsym $mod+Ctrl+Shift+h move container to workspace prev_on_output; workspace prev_on_output
|
||||
bindsym $mod+Ctrl+Shift+l move container to workspace next_on_output; workspace next_on_output
|
||||
bindsym $mod+Ctrl+Shift+j move container to workspace prev; workspace prev
|
||||
bindsym $mod+Ctrl+Shift+k move container to workspace next; workspace next
|
||||
|
||||
## Move to workspace next / previous with focused container (arrow keys)
|
||||
#bindsym $mod+Ctrl+Shift+Left move container to workspace prev_on_output; workspace prev_on_output
|
||||
#bindsym $mod+Ctrl+Shift+Right move container to workspace next_on_output; workspace next_on_output
|
||||
#bindsym $mod+Ctrl+Shift+Down move container to workspace prev; workspace prev
|
||||
#bindsym $mod+Ctrl+Shift+Up move container to workspace next; workspace next
|
||||
|
||||
# move focused container to workspace
|
||||
bindsym $mod+ctrl+1 move container to workspace $ws1
|
||||
|
|
@ -202,11 +214,17 @@ bindsym $mod+shift+8 move container to workspace $ws8; workspace $ws8
|
|||
bindsym $mod+shift+9 move container to workspace $ws9; workspace $ws9
|
||||
bindsym $mod+shift+0 move container to workspace $ws10; workspace $ws10
|
||||
|
||||
# move workspaces to screen
|
||||
bindsym $mod+ctrl+shift+r move workspace to output right
|
||||
bindsym $mod+ctrl+shift+l move workspace to output left
|
||||
bindsym $mod+Ctrl+Shift+u move workspace to output above
|
||||
bindsym $mod+Ctrl+Shift+d move workspace to output below
|
||||
## move workspaces to screen
|
||||
#bindsym $mod+ctrl+shift+r move workspace to output right
|
||||
#bindsym $mod+ctrl+shift+l move workspace to output left
|
||||
#bindsym $mod+Ctrl+Shift+u move workspace to output above
|
||||
#bindsym $mod+Ctrl+Shift+d move workspace to output below
|
||||
|
||||
# move workspaces to screen (arrow keys)
|
||||
bindsym $mod+ctrl+shift+Right move workspace to output right
|
||||
bindsym $mod+ctrl+shift+Left move workspace to output left
|
||||
bindsym $mod+Ctrl+Shift+Up move workspace to output above
|
||||
bindsym $mod+Ctrl+Shift+Down move workspace to output below
|
||||
|
||||
# Open applications on specific workspaces
|
||||
assign [class="Thunderbird"] $WS7
|
||||
|
|
@ -263,16 +281,16 @@ mode "Resize" {
|
|||
# Pressing right will grow the window’s width.
|
||||
# Pressing up will shrink the window’s height.
|
||||
# Pressing down will grow the window’s height.
|
||||
bindsym j resize shrink width 10 px or 10 ppt
|
||||
bindsym k resize grow height 10 px or 10 ppt
|
||||
bindsym i resize shrink height 10 px or 10 ppt
|
||||
bindsym h resize shrink width 10 px or 10 ppt
|
||||
bindsym j resize grow height 10 px or 10 ppt
|
||||
bindsym k resize shrink height 10 px or 10 ppt
|
||||
bindsym l resize grow width 10 px or 10 ppt
|
||||
|
||||
# same bindings, but for the arrow keys
|
||||
bindsym Left resize shrink width 10 px or 10 ppt
|
||||
bindsym Down resize grow height 10 px or 10 ppt
|
||||
bindsym Up resize shrink height 10 px or 10 ppt
|
||||
bindsym Right resize grow width 10 px or 10 ppt
|
||||
## same bindings, but for the arrow keys
|
||||
#bindsym Left resize shrink width 10 px or 10 ppt
|
||||
#bindsym Down resize grow height 10 px or 10 ppt
|
||||
#bindsym Up resize shrink height 10 px or 10 ppt
|
||||
#bindsym Right resize grow width 10 px or 10 ppt
|
||||
|
||||
# back to normal: Enter or Escape
|
||||
bindsym Return mode "default"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue