branched changes for homepc

.i3/config

@@ -1,5 +1,5 @@
 # T's desktop v3
-#exec --no-startup-id xrandr --output HDMI-0 --auto --mode 1920x1080 --primary --output DVI-I-1 --right-of HDMI-0 --auto --dpi 96/HDMI-0
+exec --no-startup-id xrandr --output HDMI-0 --auto --mode 1920x1080 --primary --dpi 96/HDMI-0
 exec --no-startup-id mplayer -fs ~/.i3/boot.mp4
 exec --no-startup-id i3lock -f "xos4 Terminus" -F 40 -X 200 -Y 100 -i '~/Pictures/backgrounds/6a171c_5499051.jpg'
 #DAEMONS
@@ -15,7 +15,7 @@ exec --no-startup-id setxkbmap us altgr-intl
 # US brackets on slovene special characters
 #exec xmodmap ~/.i3/custom.map
 
-font pango: FontAwesome, xos4 Terminess Powerline 12
+font pango: FontAwesome, xos4 Terminess Powerline 10
 
 
 #--APPEARANCE--#
@@ -41,6 +41,7 @@ hide_edge_borders smart
 
 set $mod Mod4
 set $alt Mod1
+set $m  Mod3
 
 #--WINDOW-SETTINGS--#
 floating_modifier $mod
@@ -146,12 +147,22 @@ bindsym $mod+Shift+2 move container to workspace $WS2
 bindsym $mod+Shift+3 move container to workspace $WS3
 bindsym $mod+Shift+4 move container to workspace $WS4
 bindsym $mod+Shift+5 move container to workspace $WS5
+bindsym $m+1 workspace $WS1
+bindsym $m+2 workspace $WS2
+bindsym $m+3 workspace $WS3
+bindsym $m+4 workspace $WS4
+bindsym $m+5 workspace $WS5
+bindsym $m+Shift+1 move container to workspace $WS1
+bindsym $m+Shift+2 move container to workspace $WS2
+bindsym $m+Shift+3 move container to workspace $WS3
+bindsym $m+Shift+4 move container to workspace $WS4
+bindsym $m+Shift+5 move container to workspace $WS5
 
 #Secondary workspaces
 set $WSW1 "W1"
 set $WSW2 "W2"
 set $WSW3 "W3"
-set $WSW4 "W4"
+set $WSW4 "W4"
 bindsym $mod+F1 workspace $WSW1
 bindsym $mod+F2 workspace $WSW2
 bindsym $mod+F3 workspace $WSW3
@@ -160,6 +171,14 @@ bindsym $mod+Shift+F1 move container to workspace $WSW1
 bindsym $mod+Shift+F2 move container to workspace $WSW2
 bindsym $mod+Shift+F3 move container to workspace $WSW3
 bindsym $mod+Shift+F4 move container to workspace $WSW4
+bindsym $m+F1 workspace $WSW1
+bindsym $m+F2 workspace $WSW2
+bindsym $m+F3 workspace $WSW3
+bindsym $m+F4 workspace $WSW4
+bindsym $m+Shift+F1 move container to workspace $WSW1
+bindsym $m+Shift+F2 move container to workspace $WSW2
+bindsym $m+Shift+F3 move container to workspace $WSW3
+bindsym $m+Shift+F4 move container to workspace $WSW4
 
 #Multiple screens
 bindsym $mod+Left move container to output left
@@ -195,8 +214,8 @@ bindsym $alt+i mode "ignore"
 #--BAR CONFIGURATION--#
 bar {
     tray_output primary
-    #status_command i3blocks -c ~/.i3/i3blocks.conf
-    status_command i3blocks -c ~/.i3/i3blocks-netbook.conf
+    status_command i3blocks -c ~/.i3/i3blocks.conf
+    #status_command i3blocks -c ~/.i3/i3blocks-netbook.conf
 
     mode dock
     hidden_state show

.i3/custom.map

@@ -1,6 +1,4 @@
-keycode 10 = 1 exclam 1 exclam asciitilde dead_tilde
-keycode 49 = asciitilde dead_diaeresis
-keycode 21 = plus asterisk
-keycode 34 = braceleft bracketleft braceleft bracketleft scaron Scaron
-keycode 35 = braceright bracketright braceright bracketright dstroke Dstroke
-
+clear mod4
+keycode 49 = Hyper_L asciitilde Hyper_L asciitilde dead_grave dead_tilde dead_grave
+add        mod3 = Hyper_L
+add        mod4 = Super_L Super_R

.oh-my-zsh/.gitignore

@@ -1,3 +1,8 @@
+# custom files
+custom/
+!custom/plugins/example
+!custom/example.zsh
+
 # temp files directories
 cache/
 log/

.oh-my-zsh/.zsh-update

@@ -1 +0,0 @@
-LAST_EPOCH=17126

.oh-my-zsh/CONTRIBUTING.md

@@ -0,0 +1,123 @@
+# CONTRIBUTING GUIDELINES
+
+Oh-My-Zsh is a community-driven project. Contribution is welcome, encouraged and appreciated.
+It is also essential for the development of the project.
+
+These guidelines are an attempt at better addressing the huge amount of pending
+issues and pull requests. Please read them closely.
+
+Foremost, be so kind as to [search](#use-the-search-luke). This ensures any contribution
+you would make is not already covered.
+
+* [Issues](#reporting-issues)
+  * [You have a problem](#you-have-a-problem)
+  * [You have a suggestion](#you-have-a-suggestion)
+* [Pull Requests](#submitting-pull-requests)
+  * [Getting started](#getting-started)
+  * [You have a solution](#you-have-a-solution)
+  * [You have an addition](#you-have-an-addition)
+* [Information sources (_aka_ search)](#use-the-search-luke)
+
+**BONUS:** [Volunteering](#you-have-spare-time-to-volunteer)
+
+## Reporting Issues
+
+### You have a problem
+
+Please be so kind as to [search](#use-the-search-luke) for any open issue already covering
+your problem.
+
+If you find one, comment on it so we can know there are more people experiencing it.
+
+If not, look at the [Troubleshooting](https://github.com/robbyrussell/oh-my-zsh/wiki/Troubleshooting)
+page for instructions on how to gather data to better debug your problem.
+
+Then, you can go ahead and create an issue with as much detail as you can provide.
+It should include the data gathered as indicated above, along with:
+
+1. How to reproduce the problem
+2. What the correct behavior should be
+3. What the actual behavior is
+
+Please copy to anyone relevant (_eg_ plugin maintainers) by mentioning their GitHub handle
+(starting with `@`) in your message.
+
+We will do our very best to help you.
+
+### You have a suggestion
+
+Please be so kind as to [search](#use-the-search-luke) for any open issue already covering
+your suggestion.
+
+If you find one, comment on it so we can know there are more people supporting it.
+
+If not, you can go ahead and create an issue. Please copy to anyone relevant (_eg_ plugin
+maintainers) by mentioning their GitHub handle (starting with `@`) in your message.
+
+## Submitting Pull Requests
+
+### Getting started
+
+You should be familiar with the basics of
+[contributing on GitHub](https://help.github.com/articles/using-pull-requests) and have a fork
+[properly set up](https://github.com/robbyrussell/oh-my-zsh/wiki/Contribution-Technical-Practices).
+
+You MUST always create PRs with _a dedicated branch_ based on the latest upstream tree.
+
+If you create your own PR, please make sure you do it right. Also be so kind as to reference
+any issue that would be solved in the PR description body,
+[for instance](https://help.github.com/articles/closing-issues-via-commit-messages/)
+_"Fixes #XXXX"_ for issue number XXXX.
+
+### You have a solution
+
+Please be so kind as to [search](#use-the-search-luke) for any open issue already covering
+your [problem](#you-have-a-problem), and any pending/merged/rejected PR covering your solution.
+
+If the solution is already reported, try it out and +1 the pull request if the
+solution works ok. On the other hand, if you think your solution is better, post
+it with a reference to the other one so we can have both solutions to compare.
+
+If not, then go ahead and submit a PR. Please copy to anyone relevant (e.g. plugin
+maintainers) by mentioning their GitHub handle (starting with `@`) in your message.
+
+### You have an addition
+
+Please [do not](https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#dont-send-us-your-theme-for-now)
+send themes for now.
+
+Please be so kind as to [search](#use-the-search-luke) for any pending, merged or rejected Pull Requests
+covering or related to what you want to add.
+
+If you find one, try it out and work with the author on a common solution.
+
+If not, then go ahead and submit a PR. Please copy to anyone relevant (_eg_ plugin
+maintainers) by mentioning their GitHub handle (starting with `@`) in your message.
+
+For any extensive change, _eg_ a new plugin, you will have to find testers to +1 your PR.
+
+----
+
+## Use the Search, Luke
+
+_May the Force (of past experiences) be with you_
+
+GitHub offers [many search features](https://help.github.com/articles/searching-github/)
+to help you check whether a similar contribution to yours already exists. Please search
+before making any contribution, it avoids duplicates and eases maintenance. Trust me,
+that works 90% of the time.
+
+You can also take a look at the [FAQ](https://github.com/robbyrussell/oh-my-zsh/wiki/FAQ)
+to be sure your contribution has not already come up.
+
+If all fails, your thing has probably not been reported yet, so you can go ahead
+and [create an issue](#reporting-issues) or [submit a PR](#submitting-pull-requests).
+
+----
+
+### You have spare time to volunteer
+
+Very nice!! :)
+
+Please have a look at the [Volunteer](https://github.com/robbyrussell/oh-my-zsh/wiki/Volunteers)
+page for instructions on where to start and more.

.oh-my-zsh/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2009-2016 Robby Russell and contributors
+Copyright (c) 2009-2017 Robby Russell and contributors
 See the full list at https://github.com/robbyrussell/oh-my-zsh/contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

.oh-my-zsh/README.md

@@ -4,9 +4,9 @@
 
 Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration.
 
-That sounds boring. Let's try this again.
+Sounds boring. Let's try again.
 
-__Oh My Zsh is a way of life!__
+__Oh My Zsh will not make you a 10x developer...but you might feel like one.__
 
 Once installed, your terminal shell will become the talk of the town _or your money back!_ With each keystroke in your command prompt, you'll take advantage of the hundreds of powerful plugins and beautiful themes. Strangers will come up to you in cafés and ask you, _"that is amazing! are you some sort of genius?"_
 
@@ -20,7 +20,7 @@ To learn more, visit [ohmyz.sh](http://ohmyz.sh) and follow [@ohmyzsh](https://t
 
 __Disclaimer:__ _Oh My Zsh works best on macOS and Linux._
 
-* Unix-based operating system (macOS or Linux)
+* Unix-like operating system (macOS or Linux)
 * [Zsh](http://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (`zsh --version` to confirm), check the following instruction here: [Installing ZSH](https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH)
 * `curl` or `wget` should be installed
 * `git` should be installed

.oh-my-zsh/lib/completion.zsh

@@ -5,7 +5,7 @@ WORDCHARS=''
 
 unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol
-setopt auto_menu         # show completion menu on succesive tab press
+setopt auto_menu         # show completion menu on successive tab press
 setopt complete_in_word
 setopt always_to_end
 

.oh-my-zsh/lib/functions.zsh

@@ -86,7 +86,7 @@ function default() {
 }
 
 #
-# Set enviroment variable "$1" to default value "$2" if "$1" is not yet defined.
+# Set environment variable "$1" to default value "$2" if "$1" is not yet defined.
 #
 # Arguments:
 #    1. name - The env variable to set

.oh-my-zsh/plugins/adb/_adb

@@ -13,9 +13,13 @@ _1st_arguments=(
 'disconnect:disconnect from a TCP/IP device. Port 5555 is default.'
 'emu:run emulator console command'
 'forward:forward socket connections'
+'get-devpath:print the device path'
+'get-serialno:print the serial number of the device'
+'get-state:print the current state of the device: offline | bootloader | device'
 'help:show the help message'
 'install:push this package file to the device and install it'
 'jdwp:list PIDs of processes hosting a JDWP transport'
+'keygen:generate adb public/private key'
 'kill-server:kill the server if it is running'
 'logcat:view device log'
 'pull:copy file/dir from device'
@@ -30,6 +34,7 @@ _1st_arguments=(
 'start-server:ensure that there is a server running'
 'tcpip:restart host adb in tcpip mode'
 'uninstall:remove this app package from the device'
+'usb:restart the adbd daemon listing on USB'
 'version:show version num'
 'wait-for-device:block until device is online'
 )

.oh-my-zsh/plugins/archlinux/README.md

@@ -73,6 +73,8 @@
 | pacupd       | sudo pacman -Sy                         | Update and refresh the local package database                |
 | pacupg       | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
 | upgrade      | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
+| pacfileupg   | sudo pacman -Fy                         | Download fresh package databases from the server             |
+| pacfiles     | pacman -Fs                              | Search package file names for matching strings.              |
 
 | Function       | Description                                          |
 |----------------|------------------------------------------------------|

.oh-my-zsh/plugins/archlinux/archlinux.plugin.zsh

@@ -82,6 +82,8 @@ alias pacinsd='sudo pacman -S --asdeps'
 alias pacmir='sudo pacman -Syy'
 alias paclsorphans='sudo pacman -Qdt'
 alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
+alias pacfileupg='sudo pacman -Fy'
+alias pacfiles='pacman tFs'
 
 
 if (( $+commands[abs] && $+commands[aur] )); then

.oh-my-zsh/plugins/autoenv/autoenv.plugin.zsh

@@ -1,7 +1,7 @@
 # Activates autoenv or reports its failure
 () {
 if ! type autoenv_init >/dev/null; then
-  for d (~/.autoenv /usr/local/opt/autoenv /usr/local/bin); do
+  for d (~/.autoenv ~/.local/bin /usr/local/opt/autoenv /usr/local/bin); do
     if [[ -e $d/activate.sh ]]; then
       autoenv_dir=$d
       break

.oh-my-zsh/plugins/battery/battery.plugin.zsh

@@ -100,7 +100,7 @@ elif [[ "$OSTYPE" = linux*  ]] ; then
       else
         color='red'
       fi
-      echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
+      echo "%{$fg[$color]%}$(battery_pct_remaining)%%%{$reset_color%}"
     else
       echo "∞"
     fi

.oh-my-zsh/plugins/cask/README.md

@@ -1,11 +1,15 @@
-# cask plugin
+# Cask plugin
 
-Loads `cask` completion from non-standard locations, such as if installed
+[Cask](https://github.com/cask/cask) is a project management tool for Emacs that helps
+automate the package development cycle; development, dependencies, testing, building,
+packaging and more.
+
+This plugin loads `cask` completion from non-standard locations, such as if installed
 via Homebrew or others. To enable it, add `cask` to your plugins array:
 
 ```zsh
 plugins=(... cask)
 ```
 
-Make sure you have the `cask` directory in your `$PATH` before loading
-Oh My Zsh, otherwise you'll get the "command not found" error.
+Make sure you have the `cask` directory in your `$PATH` before loading Oh My Zsh,
+otherwise you'll get a "command not found" error.

.oh-my-zsh/plugins/composer/composer.plugin.zsh

@@ -39,14 +39,17 @@ alias c='composer'
 alias csu='composer self-update'
 alias cu='composer update'
 alias cr='composer require'
+alias crm='composer remove'
 alias ci='composer install'
 alias ccp='composer create-project'
 alias cdu='composer dump-autoload'
+alias cdo='composer dump-autoload --optimize-autoloader'
 alias cgu='composer global update'
 alias cgr='composer global require'
+alias cgrm='composer global remove'
 
 # install composer in the current directory
 alias cget='curl -s https://getcomposer.org/installer | php'
 
 # Add Composer's global binaries to PATH
-export PATH=$PATH:~/.composer/vendor/bin
+export PATH=$PATH:$(composer global config bin-dir --absolute) 2>/dev/null

.oh-my-zsh/plugins/debian/debian.plugin.zsh

@@ -192,7 +192,7 @@ apt-history () {
         awk '{print $4"="$5}'
       ;;
     list)
-      zcat $(ls -rt /var/log/dpkg*)
+      zgrep --no-filename '' $(ls -rt /var/log/dpkg*)
       ;;
     *)
       echo "Parameters:"