diff --git a/.gitignore b/.gitignore index b7424b7..b126ffc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ _vim/.netrwhist _config/auto_sync*/*.pid _vim/bundle _i3__abraracourcix/logfile +_i3__oda.armorique.lan/logfile diff --git a/_bashrc b/_bashrc index 36723c9..eb7d98c 100644 --- a/_bashrc +++ b/_bashrc @@ -16,8 +16,8 @@ export EDITOR=vim export VISUAL=$EDITOR # pager man conserve affichage à l'écran export MANPAGER="less -X" -# youtube dl default dl dir FIXME default in youtube -export YDL_TARGET=$HOME +# youtube dl default +export YDL_TARGET=$HOME/tmp ##### COLORS ##### diff --git a/_i3__oda.armorique.lan/config b/_i3__oda.armorique.lan/config index 70c1f8c..def7f12 100644 --- a/_i3__oda.armorique.lan/config +++ b/_i3__oda.armorique.lan/config @@ -133,9 +133,9 @@ bindsym $mod+Shift+8 move container to workspace 8 bindsym $mod+Shift+9 move container to workspace 9 bindsym $mod+Shift+0 move container to workspace 10 -# volume -bindcode $mod+48 exec obsd-vol.sh -16 -bindcode $mod+51 exec obsd-vol.sh 16 +# volume; keys [ and ] +bindcode $mod+34 exec obsd-vol.sh -16 +bindcode $mod+35 exec obsd-vol.sh 16 # reload the configuration file bindsym $mod+Shift+c reload @@ -182,6 +182,8 @@ client.urgent $base02 $base08 $base00 $base0F bar { position top status_command i3status -c .i3/i3status.conf + font pango:monospace 8 + separator_symbol "" colors { separator $base03 background $base01 diff --git a/_i3__oda.armorique.lan/i3status.conf b/_i3__oda.armorique.lan/i3status.conf index 67e4c8a..53b064b 100644 --- a/_i3__oda.armorique.lan/i3status.conf +++ b/_i3__oda.armorique.lan/i3status.conf @@ -7,58 +7,56 @@ # If the above line is not correctly displayed, fix your editor first! general { - output_format = "i3bar" - colors = true - interval = 5 + output_format = "i3bar" + colors = true + interval = 5 } +order += "battery all" order += "ipv6" order += "disk /" +order += "disk /home" order += "wireless _first_" order += "ethernet _first_" -#order += "load" -order += "cpu_temperature cpu0" +order += "load" order += "cpu_temperature acpitz0" order += "volume master" -order += "battery all" order += "tztime local" -cpu_temperature cpu0 { - format = "CPU: %degrees ⁰C" - path = "cpu0" -} - cpu_temperature acpitz0 { - format = "TZ: %degrees ⁰C" + format = " %degrees ⁰C" } wireless _first_ { - format_up = "W: (%essid) %ip" - format_down = "W: down" + format_up = " (%essid) %ip" + format_down = " down" } ethernet _first_ { - format_up = "E: %ip" - format_down = "E: down" + format_up = " %ip" + format_down = " down" } battery all { - format = "%status %percentage \% %remaining" + format = " %status %percentage %remaining" } tztime local { - locale = "fr_FR.UTF-8" format = "%A %e %B %H:%M" } load { - format = "%1min" + format = " %5min" } disk "/" { - format = "%avail" + format = " / %avail" +} + +disk "/home" { + format = " /home %avail" } volume master { - format = "vol: %volume" + format = " %volume" } diff --git a/_profile__oda.armorique.lan b/_profile__oda.armorique.lan index dd533fa..8340429 100644 --- a/_profile__oda.armorique.lan +++ b/_profile__oda.armorique.lan @@ -7,15 +7,10 @@ export PATH HOME TERM # if running bash if [ -n "$BASH_VERSION" ]; then - # include .bashrc if it exists - if [ -f "$HOME/.bashrc" ]; then - . "$HOME/.bashrc" - fi -fi - -# set PATH so it includes user's private bin if it exists -if [ -d "$HOME/bin" ] ; then - PATH="$HOME/bin:$PATH" + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi fi export LC_CTYPE="en_US.UTF-8" diff --git a/_xinitrc__oda.armorique.lan b/_xinitrc__oda.armorique.lan index 156d8a6..02fdab2 100644 --- a/_xinitrc__oda.armorique.lan +++ b/_xinitrc__oda.armorique.lan @@ -1,3 +1,4 @@ +export PATH="$HOME/bin:$PATH" export LC_CTYPE="en_US.UTF-8" export TERMINAL=/usr/local/bin/roxterm xrdb -merge ~/.Xresources @@ -26,4 +27,5 @@ xidle -timeout 300 -program "/usr/X11R6/bin/xlock -mode blank" & xrandr --dpi 156 xcompmgr -c -n & setxkbmap us -option compose:caps -exec /usr/local/bin/i3 +echo "Starting at $(date)" >> ~/.i3/logfile +exec /usr/local/bin/i3 >> ~/.i3/logfile