diff --git a/.config/conky/conkyrc1 b/.config/conky/conkyrc1 index b85f2ad..c0fabfe 100644 --- a/.config/conky/conkyrc1 +++ b/.config/conky/conkyrc1 @@ -97,6 +97,8 @@ ${template3 /home /home} ${template3 /mnt/data /mnt/data} +${template3 /home/minecraft /home/minecraft} + ${template3 /tmp /tmp} ${template3 /dev/shm /dev/shm} diff --git a/.config/conky/conkyrc2 b/.config/conky/conkyrc2 index 5e7d87a..516f5fd 100644 --- a/.config/conky/conkyrc2 +++ b/.config/conky/conkyrc2 @@ -76,7 +76,7 @@ $alignc${scroll left 39 2 1 ${v6addrs tun0 -n -s}} ${endif} ${color2}${font2}Capteurs $hr$font$color${voffset 2} Disque dur${goto 140}${if_match ${hddtemp}>50}${color F2777A}$endif${hddtemp}°C$color -CPU${goto 140}${if_match ${execi 5 sensors -j | jq '."k10temp-pci-00c3"."Tdie"."temp2_input"'}>70}${color F2777A}$endif${execi 5 sensors -j | jq '."k10temp-pci-00c3"."Tdie"."temp2_input"' | cut -d. -f1}°C${color} +CPU${goto 140}${if_match ${execi 5 sensors -j | jq '."zenpower-pci-00c3"."Tdie"."temp1_input"'}>70}${color F2777A}$endif${execi 5 sensors -j | jq '."zenpower-pci-00c3"."Tdie"."temp1_input"' | cut -d. -f1}°C${color} Pièce${goto 140}${if_match ${execi 5 sensors -j | jq '."it8686-isa-0a60"."temp2"."temp2_input"'}>=25}${color F2777A}$endif${execi 5 sensors -j | jq '."it8686-isa-0a60"."temp2"."temp2_input"' | cut -d. -f1}°C${color} ${color2}${font2}Notes $hr$font$color${voffset 2} diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 08a5519..a355de2 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -5,7 +5,6 @@ SETUVAR __fish_init_2_39_8:\x1d SETUVAR __fish_init_2_3_0:\x1d SETUVAR __fish_initialized:3100 SETUVAR _fish_abbr_S:sudo\x20systemctl -SETUVAR _fish_abbr_pik:pikaur SETUVAR _fish_abbr_s:systemctl SETUVAR _fish_abbr_sa:ssh\x2dadd SETUVAR fish_color_autosuggestion:555\x1ebrblack diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 812742c..073b251 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -3,7 +3,8 @@ fields=0 17 18 48 49 39 113 109 110 46 47 2 1 sort_key=47 sort_direction=1 -hide_threads=0 +tree_sort_key=48 +tree_sort_direction=1 hide_kernel_threads=1 hide_userland_threads=1 shadow_other_users=1 @@ -12,12 +13,20 @@ show_program_path=1 highlight_base_name=1 highlight_megabytes=1 highlight_threads=1 -tree_view=0 +highlight_changes=0 +highlight_changes_delay_secs=5 +find_comm_in_cmdline=1 +strip_exe_from_cmdline=1 +show_merged_command=0 +tree_view=1 +tree_view_always_by_pid=0 header_margin=1 detailed_cpu_time=1 -cpu_count_from_zero=0 -show_cpu_usage=0 +cpu_count_from_one=1 +show_cpu_usage=1 show_cpu_frequency=0 +show_cpu_temperature=0 +degree_fahrenheit=0 update_process_names=0 account_guest_in_cpu_meter=0 color_scheme=0 diff --git a/.config/i3/config b/.config/i3/config index 281305e..f0d25d6 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -361,7 +361,6 @@ exec --no-startup-id steam-native -silent -noverifyfiles -language french #exec --no-startup-id SVPManager exec --no-startup-id hp-systray -x exec --no-startup-id mpv "$HOME/Musique/WELCOME BACK.wav" -exec --no-startup-id xscreensaver -nosplash exec --no-startup-id variety # Start i3bar to display a workspace bar (plus the system information i3status if available) diff --git a/.config/i3blocks/config b/.config/i3blocks/config index ff9915a..f104da3 100644 --- a/.config/i3blocks/config +++ b/.config/i3blocks/config @@ -199,6 +199,10 @@ interval=60 [beep] interval=once signal=14 +separator=false + +[rgb] +interval=once [keyindicator] instance=Caps diff --git a/.config/youtube-dl/config b/.config/youtube-dl/config index cfb538d..bb28352 100644 --- a/.config/youtube-dl/config +++ b/.config/youtube-dl/config @@ -1,10 +1,10 @@ #-o "%(playlist_index)s.%(title)s.mkv" -o "%(title)s.mkv" --merge-output-format mkv ---sub-lang fr,en --embed-subs --write-sub --write-auto-sub +--sub-lang fr,en -i #--hls-prefer-ffmpeg #--external-downloader aria2c diff --git a/.i3blocks/bepo b/.i3blocks/bepo index 5e9622c..442043e 100755 --- a/.i3blocks/bepo +++ b/.i3blocks/bepo @@ -3,7 +3,7 @@ runtime="${XDG_RUNTIME_DIR}/i3blocks" [[ ! -d "$runtime" ]] && mkdir -p "$runtime" -[[ ! -f "$runtime/keyboard" ]] && button=1 +[[ ! -f "$runtime/keyboard" ]] && [[ -z "$button" ]] && button=1 case $button in 1) setxkbmap fr bepo_afnor; echo "bépo" > "$runtime/keyboard";; diff --git a/.i3blocks/rgb b/.i3blocks/rgb new file mode 100755 index 0000000..01d9c17 --- /dev/null +++ b/.i3blocks/rgb @@ -0,0 +1,29 @@ +#!/bin/bash + +runtime="${XDG_RUNTIME_DIR}/i3blocks" +[[ ! -d "$runtime" ]] && mkdir -p "$runtime" + + +if [[ -n "$button" ]] +then + if [[ -f "$runtime/rgb" ]] + then + openrgb -d 0 -m direct -c 000000 &>/dev/null + rm "$runtime/rgb" + else + openrgb -d 0 -m 'Color Cycle' &>/dev/null + touch "$runtime/rgb" + fi +else + touch $runtime/rgb +fi + +if [[ -f "$runtime/rgb" ]] +then + color="#99CC99" +else + color="#747369" +fi + + +echo "rgb" diff --git a/.local/bin/hsv2rgb b/.local/bin/hsv2rgb new file mode 100755 index 0000000..9f187bf --- /dev/null +++ b/.local/bin/hsv2rgb @@ -0,0 +1,13 @@ +#!/usr/bin/python3 + +import colorsys +import sys + +h, s, v = map(float, sys.argv[1:]) +h /= 360 +s /= 100 +v /= 100 + +r, g, b = colorsys.hsv_to_rgb(h, s, v) +print("#{:02x}{:02x}{:02x}".format(round(255*r), round(255*g), round(255*b))) + diff --git a/.local/bin/mcaselector b/.local/bin/mcaselector deleted file mode 100755 index 6450d33..0000000 --- a/.local/bin/mcaselector +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -/usr/lib/jvm/java-14-openjdk/bin/java --module-path /usr/lib/jvm/java-14-openjdk/lib/javafx.base.jar:/usr/lib/jvm/java-14-openjdk/lib/javafx.controls.jar:/usr/lib/jvm/java-14-openjdk/lib/javafx.fxml.jar:/usr/lib/jvm/java-14-openjdk/lib/javafx.graphics.jar:/usr/lib/jvm/java-14-openjdk/lib/javafx.media.jar:/usr/lib/jvm/java-14-openjdk/lib/javafx.swing.jar:/usr/lib/jvm/java-14-openjdk/lib/javafx.web.jar:/usr/lib/jvm/java-14-openjdk/lib/javafx-swt.jar:/usr/lib/jvm/java-14-openjfx/lib/javafx.base.jar:/usr/lib/jvm/java-14-openjfx/lib/javafx.controls.jar:/usr/lib/jvm/java-14-openjfx/lib/javafx.fxml.jar:/usr/lib/jvm/java-14-openjfx/lib/javafx.graphics.jar:/usr/lib/jvm/java-14-openjfx/lib/javafx.media.jar:/usr/lib/jvm/java-14-openjfx/lib/javafx.swing.jar:/usr/lib/jvm/java-14-openjfx/lib/javafx.web.jar:/usr/lib/jvm/java-14-openjfx/lib/javafx-swt.jar --add-modules ALL-MODULE-PATH -jar $(dirname $0)/mcaselector-1.12.jar - -rm -rf $(dirname $0)/cache diff --git a/.local/bin/mcaselector-1.12.jar b/.local/bin/mcaselector-1.12.jar deleted file mode 100644 index ed83ea8..0000000 Binary files a/.local/bin/mcaselector-1.12.jar and /dev/null differ diff --git a/.local/bin/mpd-notif b/.local/bin/mpd-notif index a3836f0..4fe2191 100755 --- a/.local/bin/mpd-notif +++ b/.local/bin/mpd-notif @@ -8,7 +8,7 @@ runtime="${XDG_RUNTIME_DIR}/i3blocks" while true do - systemctl --user is-active mpd.service || exit 1 + systemctl --user is-active mpd.service &>/dev/null || exit 1 timeout 5 mpc -w current onelineinfos="$(mpc -f '[%artist%§]%title%|[%file%]' current)" if [[ "$onelineinfos" != "$(<${runtime}/mpd)" ]]