Merge remote-tracking branch 'origin/master' into arma-nova

screenrc

@@ -2,11 +2,11 @@
 # the backtick program is expected to stay in the background and generate output once in a while. 
 # In this case, the command is executed right away and screen stores the last line of output. 
 # If a new line gets printed screen will automatically refresh the hardstatus or the captions.
-# backtick 2 0 0 $HOME/.screen-battery-rate
 backtick 2 0 0 $HOME/.config/screen/battery-rate
 hardstatus alwayslastline
 # H hostname of the system
-hardstatus string '%{= kG}[%{G}%H%? %1`%?%{g}][%= %{= kw}%-w%{+b yk} %n*%t%?(%u)%? %{-}%+w %=%{g}]%?[%2`]%?[%{B}%d.%m. %{W}%c%{g}]'
+# https://www.gnu.org/software/screen/manual/html_node/String-Escapes.html
+hardstatus string '%{= kg}[%{G}%H%{g}][%= %{= kw}%-w%{+b yk} %n*%t%?(%u)%? %{-}%+w %=%{g}]%?[%2`]%?[%{W}%c%{g}]'
 
 defscrollback 10000
 
@@ -16,27 +16,15 @@ altscreen on
 # no welcome message
 startup_message off
 
-# 256 colors
-attrcolor b ".I"
-termcapinfo xterm 'Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm'
+# all characters cleared will be displayed in the current background color
 defbce on
 
 # mouse tracking allows to switch region focus by clicking
 mousetrack on
-# enable use of the mouse's scrollwheel to scroll through the scrollback buffer
-# http://unix.stackexchange.com/questions/43229/is-there-a-way-to-make-screen-scroll-like-a-normal-terminal
-# http://stackoverflow.com/questions/359109/using-the-scrollwheel-in-gnu-screen
-# termcapinfo xterm* ti@:te@
-# termcapinfo xterm 'hs:ts=\E]2;:fs=07:ds=\E]2;screen07'
 
-# layouts
-layout autosave on
+screen ranger
 
 # navigating regions
-bind -k kl focus left
-bind -k kd focus down
-bind -k ku focus up
-bind -k kr focus right
 bind h focus left
 bind j focus down
 bind k focus up
@@ -47,10 +35,6 @@ bind -c resize h eval "resize -h -5" "command -c resize"
 bind -c resize j eval "resize -v +3" "command -c resize"
 bind -c resize k eval "resize -v -3" "command -c resize"
 bind -c resize l eval "resize -h +5" "command -c resize"
-bind -c resize -k kl eval "resize -h -5" "command -c resize"
-bind -c resize -k kd eval "resize -v +3" "command -c resize"
-bind -c resize -k ku eval "resize -v -3" "command -c resize"
-bind -c resize -k kr eval "resize -h +5" "command -c resize"
 bind R eval "command -c resize" "echo resize"
 
-# https://gist.github.com/joaopizani/2718397
+# http://aperiodic.net/screen/man:default_key_bindings

setup

@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/bin/sh
 
-pip install --user pydbus
+script_dir="$( cd "$(dirname "$0")"; pwd )"
 
-script_dir="$( dirname "${BASH_SOURCE[0]}" )"
-
-symlink --relative --override "${script_dir}/screenrc" "$HOME/.screenrc"
-symlink --relative --override "${script_dir}/battery-rate" "$HOME/.screen-battery-rate"
+set -x
+ln --symbolic --backup=numbered --relative "${script_dir}/screenrc" "$HOME/.screenrc"