From 237e903e7759904fefb663ddd11eeb32dd6dd44e Mon Sep 17 00:00:00 2001 From: Breizh Date: Thu, 10 Jan 2019 23:28:52 +0100 Subject: [PATCH] =?UTF-8?q?M=C3=A0j=20conf=20i3,=20MOC,=20Conky=20+=20Ajou?= =?UTF-8?q?t=20HTOP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/gtk-2.0/gtkfilechooser.ini | 4 +- .config/gtk-3.0/settings.ini.bak | 2 +- .config/htop/htoprc | 26 +++++++++ .config/i3/config | 10 ++-- .conkyrc | 2 +- .i3blocks/mocp | 88 +++++++++++++++++++++--------- .moc/config | 6 +- .moc/notif | 2 + 8 files changed, 101 insertions(+), 39 deletions(-) create mode 100644 .config/htop/htoprc diff --git a/.config/gtk-2.0/gtkfilechooser.ini b/.config/gtk-2.0/gtkfilechooser.ini index 51d4c01..51a94aa 100644 --- a/.config/gtk-2.0/gtkfilechooser.ini +++ b/.config/gtk-2.0/gtkfilechooser.ini @@ -2,8 +2,8 @@ LocationMode=path-bar ShowHidden=false ShowSizeColumn=true -GeometryX=1668 -GeometryY=542 +GeometryX=516 +GeometryY=246 GeometryWidth=887 GeometryHeight=585 SortColumn=name diff --git a/.config/gtk-3.0/settings.ini.bak b/.config/gtk-3.0/settings.ini.bak index 6cfe277..d18a644 100644 --- a/.config/gtk-3.0/settings.ini.bak +++ b/.config/gtk-3.0/settings.ini.bak @@ -1,6 +1,6 @@ [Settings] gtk-application-prefer-dark-theme=false -gtk-theme-name=GlossyBlack +gtk-theme-name=Adapta-Nokto gtk-icon-theme-name=Vertex-Icons gtk-font-name=Linux Biolinum 10 gtk-button-images=1 diff --git a/.config/htop/htoprc b/.config/htop/htoprc new file mode 100644 index 0000000..7dc2216 --- /dev/null +++ b/.config/htop/htoprc @@ -0,0 +1,26 @@ +# Beware! This file is rewritten by htop when settings are changed in the interface. +# The parser is also very primitive, and not human-friendly. +fields=0 48 17 18 38 39 40 2 46 47 49 1 +sort_key=47 +sort_direction=1 +hide_threads=0 +hide_kernel_threads=1 +hide_userland_threads=1 +shadow_other_users=1 +show_thread_names=1 +show_program_path=1 +highlight_base_name=1 +highlight_megabytes=1 +highlight_threads=1 +tree_view=1 +header_margin=1 +detailed_cpu_time=1 +cpu_count_from_zero=0 +update_process_names=0 +account_guest_in_cpu_meter=0 +color_scheme=0 +delay=15 +left_meters=LeftCPUs2 Blank CPU Memory Swap Blank Battery Tasks +left_meter_modes=1 2 1 1 1 2 1 2 +right_meters=RightCPUs2 Blank CPU Memory LoadAverage Blank Clock Uptime +right_meter_modes=1 2 2 2 2 2 2 2 diff --git a/.config/i3/config b/.config/i3/config index 21d69b8..88bb707 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -93,10 +93,10 @@ bindsym $mod+Ctrl+m exec pavucontrol ################################################################################################ # Screen brightness controls -#bindsym XF86MonBrightnessUp exec --no-startup-id echo $((( $(cat /sys/class/backlight/intel_backlight/actual_brightness) + 10 ))) > /sys/class/backlight/intel_backlight/brightness || echo 937 > /sys/class/backlight/intel_backlight/brightness -#bindsym XF86MonBrightnessDown exec --no-startup-id echo $((( $(cat /sys/class/backlight/intel_backlight/actual_brightness) - 10 ))) > /sys/class/backlight/intel_backlight/brightness || echo 0 > /sys/class/backlight/intel_backlight/brightness -bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 1% -bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 1% +bindsym XF86MonBrightnessUp exec --no-startup-id echo $((( $(cat /sys/class/backlight/intel_backlight/actual_brightness) + 10 ))) > /sys/class/backlight/intel_backlight/brightness || echo 937 > /sys/class/backlight/intel_backlight/brightness +bindsym XF86MonBrightnessDown exec --no-startup-id echo $((( $(cat /sys/class/backlight/intel_backlight/actual_brightness) - 10 ))) > /sys/class/backlight/intel_backlight/brightness || echo 0 > /sys/class/backlight/intel_backlight/brightness +#bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 5% +#bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 5% bindsym XF86HomePage exec --no-startup-id pkill -x -USR1 redshift # Volume controls @@ -371,7 +371,7 @@ exec --no-startup-id redshift #exec --no-startup-id setxkbmap fr oss exec --no-startup-id nm-applet exec --no-startup-id env DRI_PRIME=1 steam-native -silent -exec --no-startup-id qbittorrent +exec --no-startup-id sleep 5 && qbittorrent #exec --no-startup-id gdfs $HOME/.google_drive $HOME/Google_Drive/ #exec --no-startup-id transmission-gtk -m exec --no-startup-id play -q "$HOME/Musique/WELCOME BACK.wav" diff --git a/.conkyrc b/.conkyrc index 74eb7f9..1fd7f24 100644 --- a/.conkyrc +++ b/.conkyrc @@ -98,7 +98,7 @@ Uptime$alignr$uptime Ventilateur$alignr${if_match $ibm_fan>=3000}${color CC99CC}$endif$ibm_fan RPM$color Entropie$alignr$entropy_avail - $entropy_perc% IP publique$alignr${scroll wait 24 1 4 ${execi 300 curl --connect-timeout 5 ifconfig.co}} -breizh.me$alignr${execi 300 host breizh.me | grep 'has address' | cut -d' ' -f4} +#breizh.me$alignr${execi 300 host breizh.me | grep 'has address' | cut -d' ' -f4} ${if_match $battery_percent<10}${color CC99CC}${blink Batterie $battery}${else}Batterie $battery$endif ${if_match $battery_percent<20}${color CC99CC}$else${if_match $battery_percent<60}${color 6699CC}$else${color 66CCCC}$endif$endif$battery_bar$color diff --git a/.i3blocks/mocp b/.i3blocks/mocp index b159239..be00c5f 100755 --- a/.i3blocks/mocp +++ b/.i3blocks/mocp @@ -1,39 +1,73 @@ #!/bin/bash + +if pidof mocp &>/dev/null +then + origstatus=$(mocp -Q "%state") +else + origstatus=STOP + [[ -n "$BLOCK_BUTTON" ]] && mocp -S +fi + case $BLOCK_BUTTON in - 1) mocp -r ;; + 1) [[ "$origstatus" != "STOP" ]] && mocp -r || mocp -p ;; 2) mocp -G ;; - 3) mocp -f ;; + 3) [[ "$origstatus" != "STOP" ]] && mocp -f || mocp -p ;; 4) mocp -j $(($(mocp -Q "%cs") - 5))s ;; 5) mocp -j $(($(mocp -Q "%cs") + 5))s ;; esac -status=$(mocp -Q "%state") -case $status in - STOP ) status="⏹" ;; - PAUSE ) status="⏸" ;; - PLAY ) status="⏵" ;; +status="?" +case $origstatus in + STOP ) status="■" ;; + PAUSE ) status="∥" ;; + PLAY ) status="▶" ;; esac -dots= -song=$(mocp -Q "%song") - -[[ -z "$song" ]] && song=$(basename "$(mocp -Q %file)") - -if [ ${#song} -gt 30 ] +if [[ "$origstatus" != "STOP" ]] then - dots="…" + if [[ -f /dev/shm/mocp ]] + then + song=$( /dev/shm/mocp + fi + + song="${song//&/and}" + + if [ ${#song} -gt 30 ] + then + dots="…" + fi + if [ ${#song} -gt 15 ] + then + shortdots="…" + fi + + time="$(mocp -Q "[%ct %tl %tt]")" + shorttime="$(mocp -Q "%ct %tl")" + + if [[ "$time" = "[ ]" ]] || [[ -z "$time" ]] + then + time="[--:-- --:-- --:--]" + fi + + if [[ -z "$shorttime" ]] || [[ "$shorttime" = " " ]] + then + shorttime="--:-- --:--" + fi + + if [[ "${#shorttime}" -eq 6 ]] + then + shorttime="${shorttime}--:--" + fi + + echo "$status ${song:0:30}$dots ${time/ ]/ --:-- --:--]}" + echo "$status ${song:0:15}$shortdots $shorttime" +else + [[ -f /dev/shm/mocp ]] && rm /dev/shm/mocp + echo "$status [--:-- --:-- --:--]" + echo "$status --:-- --:--" fi -if [ ${#song} -gt 15 ] -then - shortdots="…" -fi - -time="$(mocp -Q "[%ct %tl %tt]")" -shorttime="$(mocp -Q "%ct %tl")" - -[[ -z "$time" ]] && time="[00:00 00:00 00:00]" -[[ -z "$shorttime" ]] && shorttime="00:00 00:00" - -echo "$status ${song:0:30}$dots $time" -echo "$status ${song:0:15}$shortdots $shorttime" diff --git a/.moc/config b/.moc/config index d95abd9..49cbb44 100644 --- a/.moc/config +++ b/.moc/config @@ -87,8 +87,8 @@ ShowStreamErrors = yes #MP3IgnoreCRCErrors = yes # Set playback toggles. -#Repeat = no -#Shuffle = no +Repeat = yes +Shuffle = yes AutoNext = yes # Default FormatString: @@ -177,7 +177,7 @@ HideFileExtension = yes # Show file time in menu? Possible values: 'yes', 'no' and 'IfAvailable' # (meaning show the time only when it is already known, which often works # faster). -ShowTime = IfAvailable +ShowTime = yes # Show time played as a percentage in the time progress bar. ShowTimePercent = yes diff --git a/.moc/notif b/.moc/notif index 571ec46..566a0cb 100755 --- a/.moc/notif +++ b/.moc/notif @@ -23,9 +23,11 @@ album="$5" if [[ -z "$title" ]] then notify-send "Music On Console" "$(basename "$file" | rev | cut -d'.' -f2- | rev)" + echo "$(basename "$file" | rev | cut -d'.' -f2- | rev)" > /dev/shm/mocp else string="$title" [[ -n "$artist" ]] && string="$artist - $string" [[ -n "$album" ]] && string="$string\n$album" notify-send "Music On Console" "$string" + echo "$title" > /dev/shm/mocp fi