diff --git a/i3/config b/i3/config deleted file mode 100644 index 2a3544d..0000000 --- a/i3/config +++ /dev/null @@ -1,221 +0,0 @@ -# Tango colors -# $i3-status - -set color_bad = #CC0000 -set color_degraded = #EDD400 -set color_good = #73D216 - -set $mod Mod4 - -# font for window titles. ISO 10646 = Unicode -font pango:DejaVu Sans Mono 11 - -# Use Mouse+$mod to drag floating windows to their wanted position -floating_modifier $mod - -# f10 and f11 to modify screenlight -bindsym XF86Switch_VT_10 xbacklight -dec 20 -bindsym XF86Switch_VT_11 xbacklight -inc 20 - -#Display -set $display LVDS1 -set $display2 VGA1 - -# volver a la misma ventana que estabas -workspace_auto_back_and_forth yes - -# start a terminal -bindsym $mod+Return exec terminal - -# kill focused window -bindsym $mod+Shift+Q kill - -# start dmenu (a program launcher) -bindsym $mod+d exec dmenu_run - -# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) -bindsym $mod+Shift+r restart - -# 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+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right - -# split in horizontal orientation -bindsym $mod+h split h - -# split in vertical orientation -bindsym $mod+v split v - -# enter fullscreen mode for the focused container -bindsym $mod+f fullscreen - -# change container layout (stacked, tabbed, default) -bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed -bindsym $mod+e layout default - -# toggle tiling / floating -bindsym $mod+Shift+space floating toggle - -# change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle - -# focus the parent container -bindsym $mod+a focus parent - -# definir workspaces -set $ws1 1 -set $ws2 2 -set $ws3 3 -set $ws4 4 -set $ws5 5 -set $ws6 6 -set $ws7 7 -set $ws8 8 -set $ws9 9 -set $ws10 10 - -# switch to workspace -bindsym $mod+1 workspace $ws1 -bindsym $mod+2 workspace $ws2 -bindsym $mod+3 workspace $ws3 -bindsym $mod+4 workspace $ws4 -bindsym $mod+5 workspace $ws5 -bindsym $mod+6 workspace $ws6 -bindsym $mod+7 workspace $ws7 -bindsym $mod+8 workspace $ws8 -bindsym $mod+9 workspace $ws9 -bindsym $mod+0 workspace $ws10 - -bindsym $mod+Shift+1 move container to workspace $ws1 -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 $mod+Shift+6 move container to workspace $ws6 -bindsym $mod+Shift+7 move container to workspace $ws7 -bindsym $mod+Shift+8 move container to workspace $ws8 -bindsym $mod+Shift+9 move container to workspace $ws9 -bindsym $mod+Shift+0 move container to workspace $ws10 - -# set workspace to monitor -workspace $ws2 output $display2 -workspace $ws8 output $display1 - -# resize window (you can also use the mouse for that) -mode "Resize" { - # These bindings trigger as soon as you enter the resize mode - bindsym j resize shrink width 10 px or 10 ppt - bindsym k resize grow height 10 px or 10 ppt - bindsym l resize shrink height 10 px or 10 ppt - bindsym ntilde resize grow width 10 px or 10 ppt - - # same bindings, but for the arrow keys - bindsym Left resize shrink width 1 px or 1 ppt - bindsym Down resize grow height 1 px or 1 ppt - bindsym Up resize shrink height 1 px or 1 ppt - bindsym Right resize grow width 1 px or 1 ppt - - # back to normal: Enter or Escape - bindsym Return mode "default" - bindsym Escape mode "default" -} - -bindsym $mod+r mode "Resize" - -# Start i3bar to display a workspace bar (plus the system information i3status -# finds out, if available) -bar { - font pango:Dyuthi3, Awesome, Icons 10 - status_command /usr/local/bin/i3blocks - position top - # quitar los putos números del nombre del workspace - strip_workspace_numbers yes - - colors { - background #000000 - separator #000000 - - ###XXX: Details border backgr. text - focused_workspace #990099 #222222 #729FCF - inactive_workspace #222222 #222222 #729FCF - active_workspace #222222 #222222 #729FCF - urgent_workspace #FF0000 #222222 #FF0000 - } -} - -set $mode_system System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown -mode "$mode_system" { - bindsym l exec --no-startup-id ~/.i3/scripts/exit lock, mode "default" - bindsym s exec --no-startup-id ~/.i3/scripts/exit pm-suspend, mode "default" - bindsym r exec --no-startup-id ~/.i3/scripts/exit reboot, mode "default" - bindsym e exec --no-startup-id ~/.i3/scripts/exit logout, mode "default" - - # back to normal: Enter or Escape - bindsym Return mode "default" - bindsym Escape mode "default" -} - -bindsym $mod+Escape mode "$mode_system" - -#windows colors -new_window pixel - -# class border backgr text indicator -client.focused #990099 #990099 #ffffff #729FCF -client.focused_inactive #990099 #990099 #ffffff #729FCF -client.unfocused #990099 #222222 #ffffff #729FCF -client.urgent #FF0000 #8C5665 #ffffff #FF0000 - -# Wallpaper -exec --no-startup-id feh --bg-scale ~/Imagenes/Fondos\ de\ Pantalla/following.jpeg - -# Autostart -# exec --no-startup-id emacs -# exec --no-startup-id start-tor -# exec --no-startup-id firefox -exec --no-startup-id xbacklight -set 100 -exec --no-startup-id bash ~/.i3/scripts/autolock.sh -exec --no-startup-id parcellite - -# Move programs to workspace -assign [title="emacs@netbook"] $ws1 -assign [title="emacs-24.5@netbook"] $ws1 -assign [class="(?i)firefox"] $ws2 -assign [class="(?i)tor"] $ws2 -assign [class="(?i)qutebrowser"] $ws2 -assign [class="(?i)thunderbird"] $ws9 -assign [title="mutt"] $ws9 -assign [class="(?i)keepassx"] $ws5 -assign [class="(?i)mumble"] $ws8 -assign [title="bittorrent"] $ws3 -assign [title="Steam"] $ws7 -assign [class="(?i)mpv"] $ws8 - - -# Enable floating to certain programs -for_window [window_role="Preferences"] floating enable -for_window [window_role="help-browser"] floating enable -for_window [class="(?i)xcalc"] floating enable -for_window [window_role="pop-up"] floating enable -for_window [window_role="About"] floating enable -for_window [class="(?i)wicd"] floating enable -for_window [class="(?i)plasma-desktop"] floating enable -for_window [class="(?i)klipper"] floating enable -for_window [class="(?i)feh"] floating enable -for_window [class="Progreso de operación de archivo"] floating enable -for_window [title="emacsclient"] floating enable - -# i3-gaps -gaps inner 10 -gaps outer 10 -smart_borders on -smart_gaps on diff --git a/i3/config b/i3/config new file mode 120000 index 0000000..c447bc2 --- /dev/null +++ b/i3/config @@ -0,0 +1 @@ +config.i3blocks \ No newline at end of file diff --git a/i3/config.i3blocks b/i3/config.i3blocks index 60fe80e..50f805b 100644 --- a/i3/config.i3blocks +++ b/i3/config.i3blocks @@ -8,7 +8,7 @@ set color_good = #73D216 set $mod Mod4 # Fuente para títulos de ventanas -font pango:DejaVu Sans Mono 8 +font pango:DejaVu Sans Mono 10 # Usar Ratón+$mod para mover las ventanas flotantes floating_modifier $mod @@ -21,7 +21,7 @@ set $display2 VGA1 workspace_auto_back_and_forth yes # abrir una terminal -bindsym $mod+Return exec terminal +bindsym $mod+Return exec termite # cerrat ventana bindsym $mod+Shift+Q kill @@ -33,10 +33,10 @@ bindsym $mod+d exec dmenu_run bindsym $mod+Shift+r restart # Cambiar foco -bindsym $mod+j focus left -bindsym $mod+k focus down -bindsym $mod+l focus up -bindsym $mod+h focus right +bindsym $mod+j focus down +bindsym $mod+k focus up +bindsym $mod+l focus right +bindsym $mod+gXG focus right # Cambiar foco con las flechas bindsym $mod+Left focus left @@ -142,11 +142,12 @@ bindsym $mod+r mode "Resize" # Barra principal bar { - font pango:DejaVu Sans Mono 11, Awesome, Icons 10 + font pango:Dyuthi3, Awesome, Icons 10 status_command /usr/local/bin/i3blocks position top # quitar los putos números del nombre del workspace strip_workspace_numbers yes + colors { background #000000 separator #000000 @@ -157,6 +158,7 @@ bar { active_workspace #222222 #222222 #729FCF urgent_workspace #FF0000 #222222 #FF0000 } + } # Modo sistema @@ -173,7 +175,6 @@ mode "$mode_system" { } bindsym $mod+Escape mode "$mode_system" - new_window pixel # Colors de las ventanas diff --git a/i3/i3blocks.conf b/i3/i3blocks.conf index c51c69c..700555c 100644 --- a/i3/i3blocks.conf +++ b/i3/i3blocks.conf @@ -5,75 +5,67 @@ # Global properties command=~/.i3/scripts/$BLOCK_NAME -full_text= align=center -color=#990099 separator=false -separator_block_width=5 +separator_block_width=0 markup=pango -[notmuch] -interval=1800 -border=#729FCF -border_top=0 -border_right=0 -border_left=0 -signal=1 - -[separator] [weather] interval=3600 -border=#729FCF border_top=0 border_right=0 -border_left=0 +border_left=-1 signal=1 -[separator] - -[network] -interval=10 -border=#729FCF +[notmuch] +interval=1800 border_top=0 border_right=0 -border_left=0 +border_left=-1 +signal=1 -[separator] +[memory] +interval=2 +border_top=0 +border_right=0 +border_left=-1 + +[uptime] +border_top=0 +border_right=0 +border_left=-1 +interval=60 [sensors] interval=1 -border=#729FCF border_top=0 border_right=0 -border_left=0 +border_left=-1 -[separator] +[cpu_usage] +interval=2 +border_top=0 +border_right=0 +border_left=-1 [slack_updates] interval=3600 -border=#729FCF border_top=0 border_right=0 -border_left=0 - -[separator] +border_left=-1 [volume] instance=Master interval=once signal=1 -border=#729FCF border_top=0 border_right=0 -border_left=0 - -[separator] +border_left=-1 [date] interval=1 -border=#729FCF border_top=0 border_right=0 -border_left=0 +border_left=-1 signal=1 diff --git a/i3/scripts/cpu_usage b/i3/scripts/cpu_usage index 0242694..f029245 100755 --- a/i3/scripts/cpu_usage +++ b/i3/scripts/cpu_usage @@ -41,15 +41,12 @@ close(MPSTAT); $cpu_usage eq -1 and die 'Can\'t find CPU information'; # Print short_text, full_text -printf "%.2f%%\n", $cpu_usage; -printf "%.2f%%\n", $cpu_usage; - -# Print color, if needed if ($cpu_usage >= $t_crit) { - print "#FF0000\n"; - exit 33; + printf '  %.2f%% ', $cpu_usage; } elsif ($cpu_usage >= $t_warn) { - print "#FFFC00\n"; + printf '  %.2f%% ', $cpu_usage; +} else { + printf '  %.2f%% ', $cpu_usage; } exit 0; diff --git a/i3/scripts/date b/i3/scripts/date index f4f2e31..c5565cd 100755 --- a/i3/scripts/date +++ b/i3/scripts/date @@ -1,7 +1,7 @@ #!/bin/sh -time=' '"$(date '+%H:%M:%S')" -date=' '"$(date '+%d/%m/%Y')" +time='  '"$(date '+%H:%M:%S') " +date=' '"$(date '+%d/%m/%Y')" case $BLOCK_BUTTON in 1) notify-send -u low "$date" ;; diff --git a/i3/scripts/memory b/i3/scripts/memory index e28af4e..288bd33 100755 --- a/i3/scripts/memory +++ b/i3/scripts/memory @@ -16,7 +16,8 @@ TYPE="${BLOCK_INSTANCE:-mem}" -awk -v type=$TYPE ' + +ram=`awk -v type=$TYPE ' /^MemTotal:/ { mem_total=$2 } @@ -38,12 +39,22 @@ awk -v type=$TYPE ' END { # full text if (type == "swap") - printf("%.1fG\n", (swap_total-swap_free)/1024/1024) + printf("%.1f\n", (swap_total-swap_free)/1024/1024) else - printf("%.1fG\n", mem_free/1024/1024) + printf("%.1f\n", mem_free/1024/1024) # TODO: short text # TODO: color (if less than X%) } -' /proc/meminfo +' /proc/meminfo` + +if [[ ($ram < 4) && ($ram > 2) ]] +then + echo -n "  $ram " +elif [[ ($ram < 2) ]] +then + echo -n "  $ram " +else + echo -n "  $ram " +fi diff --git a/i3/scripts/notmuch b/i3/scripts/notmuch index 4260256..55cfc25 100755 --- a/i3/scripts/notmuch +++ b/i3/scripts/notmuch @@ -1,4 +1,11 @@ #!/bin/bash -new=`notmuch search tag:unread and tag:inbox 2> /dev/null | wc -l` -echo "$new" +number=`notmuch search tag:unread and tag:inbox 2> /dev/null | wc -l` +if [[ -n $number ]] +then + message="$number" + echo "  $message " +else + message="" + echo "" +fi diff --git a/i3/scripts/sensors b/i3/scripts/sensors index fcd64ee..9479631 100755 --- a/i3/scripts/sensors +++ b/i3/scripts/sensors @@ -1,3 +1,3 @@ #!/bin/sh -echo -n ' ' $(acpi -t|cut -d' ' -f4) +echo -n "  " $(acpi -t | cut -d' ' -f4) "" diff --git a/i3/scripts/slack_updates b/i3/scripts/slack_updates index 596fedf..59951ed 100755 --- a/i3/scripts/slack_updates +++ b/i3/scripts/slack_updates @@ -32,9 +32,9 @@ esac if [ -z "$update" ] then - echo -n " `echo $num_changelog` Updates" + echo -n "  `echo $num_changelog` Updates " else - echo -n " No Updates" + echo -n "  No Updates " fi exit 0 diff --git a/i3/scripts/uptime b/i3/scripts/uptime index 1202b2b..9507413 100755 --- a/i3/scripts/uptime +++ b/i3/scripts/uptime @@ -1,6 +1,6 @@ #!/bin/bash # -# Author: Raphael P. Ribeiro +# Author: Raphael P. Ribeiro uptime=$(  '$d'd'$h'h'$m'm ' diff --git a/i3/scripts/volume b/i3/scripts/volume index 6ea1145..f68a3b8 100755 --- a/i3/scripts/volume +++ b/i3/scripts/volume @@ -71,11 +71,12 @@ esac print=$(volume | format) if [ $print = "MUTE" ] then - echo -n '' - echo -e $print + echo -n '' + echo -e "$print" + exit 33 else - echo -n '' - echo -e $print + echo -n '' + echo -e "$print" exit 0 fi diff --git a/i3/scripts/weather.example b/i3/scripts/weather.example index 9dc7fa4..03dcce7 100755 --- a/i3/scripts/weather.example +++ b/i3/scripts/weather.example @@ -15,7 +15,7 @@ # along with this program. If not, see . CITY= -APPID="" +APPID= OUTPUT=$(curl --silent http://api.openweathermap.org/data/2.5/weather\?APPID\=$APPID\&q\=$CITY\&units\=metric) @@ -24,17 +24,18 @@ WEATHER=$(echo $OUTPUT | jq -r ".weather[0].main") case $WEATHER in "Clear"*) WEATHER= + echo " $WEATHER $TEMP°C" ;; "Rain"*) WEATHER= + echo " $WEATHER $TEMP°C" ;; "Thunderstorm"*) WEATHER= + echo " $WEATHER $TEMP°C" ;; "Clouds"*) WEATHER= + echo " $WEATHER $TEMP°C" ;; esac - -echo "$WEATHER $TEMP°C" -echo "$TEMP°C"