changes

conky/.config/conky/conky.conf

@@ -0,0 +1,83 @@
+-- vim: ts=4 sw=4 noet ai cindent syntax=lua
+--[[
+Conky, a system monitor, based on torsmo
+
+Any original torsmo code is licensed under the BSD license
+
+All code written since the fork of torsmo is licensed under the GPL
+
+Please see COPYING for details
+
+Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
+Copyright (c) 2005-2012 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+All rights reserved.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+]]
+
+conky.config = {
+    alignment = 'top_left',
+    background = false,
+    border_width = 1,
+    cpu_avg_samples = 2,
+	default_color = 'white',
+    default_outline_color = 'white',
+    default_shade_color = 'white',
+    draw_borders = false,
+    draw_graph_borders = true,
+    draw_outline = false,
+    draw_shades = false,
+    use_xft = true,
+    font = 'DejaVu Sans Mono:size=12',
+    gap_x = 5,
+    gap_y = 60,
+    minimum_height = 5,
+	minimum_width = 5,
+    net_avg_samples = 2,
+    no_buffers = true,
+    out_to_console = false,
+    out_to_stderr = false,
+    extra_newline = false,
+    own_window = true,
+    own_window_class = 'Conky',
+    own_window_type = 'desktop',
+    stippled_borders = 0,
+    update_interval = 1.0,
+    uppercase = false,
+    use_spacer = 'none',
+    show_graph_scale = false,
+    show_graph_range = false
+}
+
+conky.text = [[
+${scroll 16 $nodename - $sysname $kernel on $machine | }
+$hr
+${color grey}Uptime:$color $uptime
+${color grey}Frequency (in MHz):$color $freq
+${color grey}Frequency (in GHz):$color $freq_g
+${color grey}RAM Usage:$color $mem/$memmax - $memperc% ${membar 4}
+${color grey}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 4}
+${color grey}CPU Usage:$color $cpu% ${cpubar 4}
+${color grey}Processes:$color $processes  ${color grey}Running:$color $running_processes
+$hr
+${color grey}File systems:
+ / $color${fs_used /}/${fs_size /} ${fs_bar 6 /}
+${color grey}Networking:
+Up:$color ${upspeed eth0} ${color grey} - Down:$color ${downspeed eth0}
+$hr
+${color grey}Name              PID   CPU%   MEM%
+${color lightgrey} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1}
+${color lightgrey} ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2}
+${color lightgrey} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3}
+${color lightgrey} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4}
+]]

conky/.config/conky/conky_theme

@@ -0,0 +1,46 @@
+
+conky.config = {
+	alignment = 'top_right',
+	background = true,
+	color2 = '777777',
+	cpu_avg_samples = 2,
+	default_color = 'FFFFFF',
+	double_buffer = true,
+	font = 'Cantarell:size=10',
+	gap_x = 25,
+	gap_y = 13,
+	minimum_width = 200,
+	no_buffers = true,
+	own_window = true,
+	own_window_type = 'override',
+	own_window_transparent = true,
+	update_interval = 1.0,
+	use_xft = true,
+}
+conky.text = [[
+${voffset 8}$color2${font Cantarell:size=16}${time %A}$font\
+${voffset -8}$alignr$color${font Cantarell:size=38}${time %e}$font
+$color${voffset -30}$color${font Cantarell:size=18}${time %b}$font\
+${voffset -3} $color${font Cantarell:size=20}${time %Y}$font$color2$hr
+#
+${voffset 20}${goto 40}${color}CPU${font Cantarell:bold:size=10}$alignr$cpu%
+${voffset 5}${goto 40}$font$color2${top name 1}$alignr$color${top cpu 1}%
+${goto 40}$color2${top name 2}$alignr$color${top cpu 2}%
+${goto 40}$color2${top name 3}$alignr$color${top cpu 3}%
+${goto 40}$color2${top name 4}$alignr$color${top cpu 4}%
+# ${goto 40}$color2${top name 5}$alignr$color${top cpu 5}%
+#
+${voffset 10}${goto 40}${color}RAM${font Cantarell:bold:size=10}$alignr$mem$font
+${goto 40}${voffset 5}$color2${top_mem name 1}$alignr$color${top_mem mem_res 1}
+${goto 40}$color2${top_mem name 2}$alignr$color${top_mem mem_res 2}
+${goto 40}$color2${top_mem name 3}$alignr$color${top_mem mem_res 3}
+${goto 40}$color2${top_mem name 4}$alignr$color${top_mem mem_res 4}
+# ${goto 40}$color2${top_mem name 5}$alignr$color${top_mem mem_res 5}
+#
+${voffset 10}${goto 40}${color}Swap${font Cantarell:bold:size=10}$alignr${swap}/ ${swapfree}
+${voffset 15}$font$alignr${execi 10000 awk -F= '/TION/ {print $2}' /etc/lsb-release |sed 's/"//g'} \
+${execi 10000 awk -F= '/EASE=/ {printf $2" "} /NAME/ {print $2}' /etc/lsb-release}
+${voffset 10}${color2}${alignr}${execi 1200 whoami}@${nodename}
+${alignr}${color2}${font Cantarell:size=10}uptime: ${color}${uptime_short}
+${voffset 5}${color2}${font Cantarell:size=10}${alignr}kernel: ${color}${kernel}
+]]

conky/bin/start-conky.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+conky -c .config/conky/conky_theme &&
+
+exit 0

git/.gitignore_global

@@ -53,3 +53,57 @@ fabric.properties
 # *.ipr
 
 # End of https://www.gitignore.io/api/phpstorm
+
+### WebStorm ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/workspace.xml
+.idea/tasks.xml
+
+# Sensitive or high-churn files:
+.idea/dataSources/
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/dataSources.local.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+# Gradle:
+.idea/gradle.xml
+.idea/libraries
+
+# Mongo Explorer plugin:
+.idea/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### WebStorm Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# End of https://www.gitignore.io/api/webstorm

gnupg/.gnupg/scdaemon.conf

@@ -1,3 +1,3 @@
-reader-port "Yubico Yubikey NEO OTP+CCID 00 00"
+reader-port "Yubico Yubikey NEO OTP+CCID 01 00"
 log-file /tmp/scdaemon.log
 debug-level guru

i3/.config/i3/config

@@ -244,7 +244,8 @@ bar {
 exec_always --no-startup-id xrandr --dpi 180 --output eDP1
 exec_always --no-startup-id xrandr --output DP1 --primary
 exec_always --no-startup-id xrandr --output HDMI1 --mode 1920x1200 --right-of DP1 --rotate left 
-exec_always --no-startup-id firejail feh --bg-fill ~/Dropbox/Wallpaper/Wallpaper/gxZG9Uw.jpg
+exec_always --no-startup-id nitrogen --restore; sleep 1; compton -b
+exec_always --no-startup-id ~/bin/start-conky.sh
 
 exec --no-startup-id nm-applet
 exec --no-startup-id firejail dropbox start

i3/.config/i3/i3blocks.conf

@@ -34,12 +34,19 @@ label=
 color=#FF0000
 interval=300
 
+# Volume indicator
+#
+# The first parameter sets the step (and units to display)
+# The second parameter overrides the mixer selection
+# See the script for details.
 [volume]
-label= 
-command=~/.config/i3/vendor/i3blocks/blocks/audio
+#label=VOL
+label=
 instance=Master
+#instance=PCM
 interval=once
-signal=1
+signal=10
+
 
 [mail-gmail]
 command=~/.config/i3/i3blocks/gmail
@@ -83,19 +90,6 @@ interval=5
 label= 
 interval=10
 
-# Volume indicator
-#
-# The first parameter sets the step (and units to display)
-# The second parameter overrides the mixer selection
-# See the script for details.
-[volume]
-#label=VOL
-label=
-instance=Master
-#instance=PCM
-interval=once
-signal=10
-
 # Disk usage
 #
 # The directory defaults to $HOME if the instance is not specified.
@@ -208,6 +202,7 @@ command=date '+%H:%M:%S'
 interval=1
 separator=true
 
+
 # Generic media player support
 #
 # This displays "ARTIST - SONG" if a music is playing.

oh-my-zsh/.oh-my-zsh

@@ -1 +1 @@
-Subproject commit 0b4bba4ca2d6115dabfdb0852ce516e30765d2e6
+Subproject commit d2725d44fce59ea7060b4d712c5739512a56882d

terminator/.config/terminator/config

@@ -11,5 +11,8 @@
 [plugins]
 [profiles]
   [[default]]
+    background_color = "#002b36"
     background_type = transparent
     cursor_color = "#aaaaaa"
+    foreground_color = "#839496"
+    palette = "#073642:#dc322f:#859900:#b58900:#268bd2:#d33682:#2aa198:#eee8d5:#002b36:#cb4b16:#586e75:#657b83:#839496:#6c71c4:#93a1a1:#fdf6e3"

zsh/.zshrc

@@ -84,6 +84,9 @@ source $ZSH/oh-my-zsh.sh
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 
+# Emberjs settings
+export PATH="$PATH:/home/alrayyes/.config/yarn/global/node_modules/ember-cli/bin"
+
 # Set GPG TTY
 export GPG_TTY=$(tty)