From e9d6ecad7056dd2cd71f5dcc42c08959bd262fd0 Mon Sep 17 00:00:00 2001 From: Breizh Date: Sun, 22 Sep 2019 03:31:29 +0200 Subject: [PATCH] Diverses modifs --- .Xresources | 4 ++-- .bashrc | 2 +- .config/conky/conkyrc2 | 5 +++-- .config/i3/config | 6 +++--- .i3blocks/mpd | 42 +++++++++++++++++++++--------------------- .vim/.netrwhist | 6 ++---- 6 files changed, 32 insertions(+), 33 deletions(-) diff --git a/.Xresources b/.Xresources index 98f6f61..daeffe7 100644 --- a/.Xresources +++ b/.Xresources @@ -57,8 +57,8 @@ Xautolock.locker: i3lock-wrapper -e XTerm*reverseVideo: on XTerm*selectToClipboard: true -!URxvt.font: xft:IBM Plex Mono:size=12,xft:DejaVu Sans Mono:size=12 -URxvt.font: xft:xos4 Terminus:pixelsize=16,xft:DejaVu Sans Mono:pixelsize=16,xft:Noto Sans Mono:pixelsize=16 +URxvt.font: xft:IBM Plex Mono:size=11,xft:DejaVu Sans Mono:size=11 +!URxvt.font: xft:xos4 Terminus:pixelsize=16,xft:DejaVu Sans Mono:pixelsize=16,xft:Noto Sans Mono:pixelsize=16 !URxvt.letterSpace: -1 URxvt.depth: 32 !URxvt.background: [100]#000000 diff --git a/.bashrc b/.bashrc index a62c550..1739932 100644 --- a/.bashrc +++ b/.bashrc @@ -283,7 +283,7 @@ alias moon='curl -H "Accept-Language: fr" wttr.in/Moon' . /usr/share/doc/ranger/examples/bash_automatic_cd.sh -eval $(thefuck --alias) +#eval $(thefuck --alias) # change title diff --git a/.config/conky/conkyrc2 b/.config/conky/conkyrc2 index 1cc8b4c..7de5ffb 100644 --- a/.config/conky/conkyrc2 +++ b/.config/conky/conkyrc2 @@ -75,8 +75,9 @@ ${endif} ${color2}${font2}Capteurs $hr$font$color${voffset 2} Disque dur${goto 140}${if_match ${hddtemp /dev/sda}>50}${color F2777A}$endif${hddtemp /dev/sda}°C$color CPU${goto 140}${if_match ${execi 5 sensors -j | jq '."k10temp-pci-00c3"."Tdie"."temp1_input"'}>70}${color F2777A}$endif${execi 5 sensors -j | jq '."k10temp-pci-00c3"."Tdie"."temp1_input"' | cut -d. -f1}°C${color} -GPU${goto 140}${if_match ${execi 5 sensors -j | jq '."amdgpu-pci-0900"."temp1"."temp1_input"'}>70}${color F2777A}$endif${execi 5 sensors -j | jq '."amdgpu-pci-0900"."temp1"."temp1_input"' | cut -d. -f1}°C${color} -GPU${goto 140}${if_match ${execi 5 sensors -j | jq '."amdgpu-pci-0900"."power1"."power1_average"'}>180}${color F2777A}$endif${execi 5 sensors -j | jq '."amdgpu-pci-0900"."power1"."power1_average"' | cut -d. -f1} W${color} +GPU Temp${goto 140}${if_match ${execi 5 sensors -j | jq '."amdgpu-pci-0900"."edge"."temp1_input"'}>70}${color F2777A}$endif${execi 5 sensors -j | jq '."amdgpu-pci-0900"."edge"."temp1_input"' | cut -d. -f1}°C${color} +GPU Conso${goto 140}${if_match ${execi 5 sensors -j | jq '."amdgpu-pci-0900"."power1"."power1_average"'}>180}${color F2777A}$endif${execi 5 sensors -j | jq '."amdgpu-pci-0900"."power1"."power1_average"' | cut -d. -f1} W${color} +GPU Ventilo${goto 140}${if_match ${execi 5 sensors -j | jq '."amdgpu-pci-0900"."fan1"."fan1_input"'}>3000}${color F2777A}$endif${execi 5 sensors -j | jq '."amdgpu-pci-0900"."fan1"."fan1_input"' | cut -d. -f1} RPM${color} Pièce${goto 140}${if_match ${execi 5 sensors -j | jq '."it8792-isa-0a60"."temp2"."temp2_input"'}>=25}${color F2777A}$endif${execi 5 sensors -j | jq '."it8792-isa-0a60"."temp2"."temp2_input"' | cut -d. -f1}°C${color} ${color2}${font2}Système $hr$font$color${voffset 2} diff --git a/.config/i3/config b/.config/i3/config index e9d68dc..9aafee8 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -51,9 +51,9 @@ bindsym $mod+n border normal 1 # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. -# font xft:IBM Plex Sans, DejaVu Sans 10 +font xft:IBM Plex Sans, DejaVu Sans 11 #font xft:xos4 Terminus, DejaVu Sans Mono 14 -font xft:Terminus, DejaVu Sans Mono 14 +#font xft:Terminus, DejaVu Sans Mono 14 # Use Mouse+$mod to drag floating windows floating_modifier $mod @@ -413,7 +413,7 @@ bar { bindsym button4 nop bindsym button5 nop # font -xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso10646-1 - # font xft:IBM Plex Mono, DejaVu Sans Mono 11 + font xft:IBM Plex Mono, DejaVu Sans Mono 11 # font xft:xos4 Terminus, DejaVu Sans Mono 14 strip_workspace_numbers yes diff --git a/.i3blocks/mpd b/.i3blocks/mpd index 21269e5..a777398 100755 --- a/.i3blocks/mpd +++ b/.i3blocks/mpd @@ -1,8 +1,25 @@ #!/bin/bash +if ! systemctl --user is-active mpd &>/dev/null +then + origstatus='off' +else + origstatus="$(mpc status | sed -n '2p' | grep -Eo '^\[.*\]' | tr -d '[]')" + [[ -z "$origstatus" ]] && origstatus='stop' +fi + LONG=25 SHORT=10 +case $BLOCK_BUTTON in + 1) mpc -q prev ;; + 2) mpc -q toggle ;; + 3) mpc -q next ;; + 4) mpc -q volume +2 ;; + 5) mpc -q volume -2 ;; + #?*) notify-send "Test" "$BLOCK_BUTTON" ;; +esac + human_time() { local seconds="$1" if [[ "$seconds" -lt 0 ]] @@ -21,24 +38,7 @@ human_time() { return } -if ! systemctl --user is-active mpd &>/dev/null -then - origstatus='off' -else - origstatus="$(mpc status | sed -n '2p' | grep -Eo '^\[.*\]' | tr -d '[]')" - [[ -z "$origstatus" ]] && origstatus='stop' -fi - -case $BLOCK_BUTTON in - 1) mpc -q prev ;; - 2) mpc -q toggle ;; - 3) mpc -q next ;; - 4) mpc -q volume +2 ;; - 5) mpc -q volume -2 ;; - #?*) notify-send "Test" "$BLOCK_BUTTON" ;; -esac - status="" case $origstatus in stop ) status="" ;; @@ -112,17 +112,17 @@ then if [[ "$longsong" =~ § ]] then - longsong="${longsong/§/ }" + longsong="${longsong/§/ }" elif [[ "$song" =~ § ]] then - longsong="${longsong}" + longsong="${longsong}" fi if [[ "$shortsong" =~ § ]] then - shortsong="${shortsong/§/ }" + shortsong="${shortsong/§/ }" elif [[ "$song" =~ § ]] then - shortsong="${shortsong}" + shortsong="${shortsong}" fi echo "${longsong} $status$longtime" diff --git a/.vim/.netrwhist b/.vim/.netrwhist index 74da679..d9d2d24 100644 --- a/.vim/.netrwhist +++ b/.vim/.netrwhist @@ -1,5 +1,3 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhist_cnt =3 -let g:netrw_dirhist_1='/home/breizh' -let g:netrw_dirhist_2='/home' -let g:netrw_dirhist_3='/home/breizh' +let g:netrw_dirhistcnt =1 +let g:netrw_dirhist_1='/home/breizh/.config/unity3d/Ludeon Studios/RimWorld by Ludeon Studios/Config'