diff --git a/.Xmodmap b/.Xmodmap index b8e403c..74f4dc5 100644 --- a/.Xmodmap +++ b/.Xmodmap @@ -97,7 +97,7 @@ keycode 103 = keycode 104 = KP_Enter NoSymbol KP_Enter keycode 105 = Control_R NoSymbol Control_R keycode 106 = KP_Divide U2215 KP_Divide U2215 0x10000f7 VoidSymbol XF86Ungrab 0x10000f7 VoidSymbol XF86Ungrab -keycode 107 = Menu Sys_Req Menu Sys_Req +keycode 107 = Print Sys_Req Print Sys_Req keycode 108 = ISO_Level3_Shift NoSymbol ISO_Level3_Shift keycode 109 = Linefeed NoSymbol Linefeed keycode 110 = Home NoSymbol Home @@ -138,7 +138,7 @@ keycode 144 = Find NoSymbol Find keycode 145 = XF86Cut NoSymbol XF86Cut keycode 146 = Help NoSymbol Help keycode 147 = XF86MenuKB NoSymbol XF86MenuKB -keycode 148 = Print NoSymbol Print +keycode 148 = XF86Calculator NoSymbol XF86Calculator keycode 149 = keycode 150 = XF86Sleep NoSymbol XF86Sleep keycode 151 = XF86WakeUp NoSymbol XF86WakeUp @@ -208,10 +208,10 @@ keycode 214 = XF86Close NoSymbol XF86Close keycode 215 = XF86AudioPlay NoSymbol XF86AudioPlay keycode 216 = XF86AudioForward NoSymbol XF86AudioForward keycode 217 = -keycode 218 = Menu NoSymbol Menu +keycode 218 = Print NoSymbol Print keycode 219 = keycode 220 = XF86WebCam NoSymbol XF86WebCam -keycode 221 = +keycode 221 = XF86AudioPreset NoSymbol XF86AudioPreset keycode 222 = keycode 223 = XF86Mail NoSymbol XF86Mail keycode 224 = XF86Messenger NoSymbol XF86Messenger @@ -244,5 +244,5 @@ keycode 250 = keycode 251 = keycode 252 = keycode 253 = -keycode 254 = -keycode 255 = +keycode 254 = XF86WWAN NoSymbol XF86WWAN +keycode 255 = XF86RFKill NoSymbol XF86RFKill diff --git a/.Xresources b/.Xresources index 263cfae..98f6f61 100644 --- a/.Xresources +++ b/.Xresources @@ -57,9 +57,9 @@ Xautolock.locker: i3lock-wrapper -e XTerm*reverseVideo: on XTerm*selectToClipboard: true -!URxvt.font: xft:IBM Plex Mono:size=10,xft:DejaVu Sans Mono:size=10 -URxvt.font: xft:xos4 Terminus:pixsize=16,xft:DejaVu Sans Mono:pixsize=16 -!URxvt.letterSpace: 1.5 +!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.letterSpace: -1 URxvt.depth: 32 !URxvt.background: [100]#000000 diff --git a/.bash_profile b/.bash_profile index 0aab0eb..082daa7 100644 --- a/.bash_profile +++ b/.bash_profile @@ -20,6 +20,7 @@ eval $(ssh-agent -s) if [ -z "$DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ]; then + export XDG_CURRENT_DESKTOP=i3 export GTK2_RC_FILES="$HOME/.gtkrc-2.0" export QT_QPA_PLATFORMTHEME=qt5ct export BROWSER="firefox" @@ -28,8 +29,8 @@ if [ -z "$DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ]; then startx logout elif [ "$XDG_VTNR" -ne 6 ]; then - ~/.local/bin/vconsole - play -q "$HOME/Musique/WELCOME BACK.wav" & +# ~/.local/bin/vconsole +# play -q "$HOME/Musique/WELCOME BACK.wav" & export BROWSER=elinks fish logout diff --git a/.bashrc b/.bashrc index 8f764cc..a62c550 100644 --- a/.bashrc +++ b/.bashrc @@ -16,7 +16,7 @@ export GIT_PS1_SHOWUPSTREAM=verbose GIT_PS1_DESCRIBE_STYLE=branch ## Define colors BASE16_SHELL=$HOME/.config/base16-shell/ -[ -n "$PS1" ] && [ -s $BASE16_SHELL/profile_helper.sh ] && eval "$($BASE16_SHELL/profile_helper.sh)" +[ "$XDG_CURRENT_DESKTOP" = "i3" ] && [ -s $BASE16_SHELL/profile_helper.sh ] && eval "$($BASE16_SHELL/profile_helper.sh)" ## Reset Text_Reset='\e[0m' # Text Reset diff --git a/.config/conky/conkyrc2 b/.config/conky/conkyrc2 index 79ecd39..465df96 100644 --- a/.config/conky/conkyrc2 +++ b/.config/conky/conkyrc2 @@ -77,6 +77,7 @@ Disque dur${goto 140}${if_match ${hddtemp /dev/sda}>50}${color F2777A}$endif${hd 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} +Pièce${goto 140}${if_match ${execi 5 sensors -j | jq '."it8792-isa-0a60"."temp2"."temp2_input"'}>30}${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} Kernel${goto 140}$kernel diff --git a/.config/fish/config.fish b/.config/fish/config.fish index dc3ef3e..d7c3b80 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -22,8 +22,9 @@ set base0E CC99CC set base0F D27B53 #if status --is-interactive +if test "$XDG_CURRENT_DESKTOP" = "i3" source $HOME/.config/base16-shell/profile_helper.fish -#end +end function colortest ~/.config/base16-shell/colortest base16-$argv[1].sh diff --git a/.config/gtk-2.0/gtkfilechooser.ini b/.config/gtk-2.0/gtkfilechooser.ini index 64bbaaf..51a94aa 100644 --- a/.config/gtk-2.0/gtkfilechooser.ini +++ b/.config/gtk-2.0/gtkfilechooser.ini @@ -2,7 +2,7 @@ LocationMode=path-bar ShowHidden=false ShowSizeColumn=true -GeometryX=1668 +GeometryX=516 GeometryY=246 GeometryWidth=887 GeometryHeight=585 diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 660397b..eec843d 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -1,7 +1,7 @@ # 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 17 18 48 49 38 39 113 111 46 47 2 1 -sort_key=47 +sort_key=0 sort_direction=1 hide_threads=0 hide_kernel_threads=1 diff --git a/.config/i3/config b/.config/i3/config index bc73f4f..6e51cac 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -50,9 +50,8 @@ 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:xos4 Terminus 16px -# font xft:Linux Biolinum 11 -font xft:IBM Plex Sans, DejaVu Sans 10 +# font xft:IBM Plex Sans, DejaVu Sans 10 +font xft:xos4 Terminus, DejaVu Sans Mono 14 # Use Mouse+$mod to drag floating windows floating_modifier $mod @@ -102,8 +101,8 @@ bindsym XF86MonBrightnessDown exec --no-startup-id echo $((( $(cat /sys/class/ba bindsym $mod+Home exec --no-startup-id pkill -x -USR1 redshift # Volume controls -bindsym XF86AudioRaiseVolume exec --no-startup-id BLOCK_BUTTON=4 ${HOME}/.i3blocks/volume && pkill -RTMIN+10 i3blocks -bindsym XF86AudioLowerVolume exec --no-startup-id BLOCK_BUTTON=5 ${HOME}/.i3blocks/volume && pkill -RTMIN+10 i3blocks +# bindsym XF86AudioRaiseVolume exec --no-startup-id BLOCK_BUTTON=4 ${HOME}/.i3blocks/volume && pkill -RTMIN+10 i3blocks +# bindsym XF86AudioLowerVolume exec --no-startup-id BLOCK_BUTTON=5 ${HOME}/.i3blocks/volume && pkill -RTMIN+10 i3blocks bindsym XF86AudioMute exec --no-startup-id BLOCK_BUTTON=2 ${HOME}/.i3blocks/volume && pkill -RTMIN+10 i3blocks bindsym XF86AudioMicMute exec --no-startup-id BLOCK_BUTTON=2 BLOCK_INSTANCE=Capture ${HOME}/.i3blocks/volume && pkill -RTMIN+10 i3blocks @@ -111,7 +110,9 @@ bindsym XF86AudioMicMute exec --no-startup-id BLOCK_BUTTON=2 BLOCK_INSTANCE=Capt bindsym XF86AudioNext exec --no-startup-id mpc next bindsym XF86AudioPrev exec --no-startup-id mpc prev bindsym XF86AudioPlay exec --no-startup-id mpc toggle -bindsym XF86AudioStop exec --no-startup-id mocp stop +bindsym XF86AudioStop exec --no-startup-id mpc stop +bindsym XF86AudioRaiseVolume exec --no-startup-id mpc volume +2 +bindsym XF86AudioLowerVolume exec --no-startup-id mpc volume -2 # LEDs controls @@ -278,6 +279,7 @@ workspace $ws8 output HDMI-A-1 #assign [class="Surf"] $ws2 #assign [class="Vlc"] $ws3 #assign [class="Atom"] $ws4 +assign [class="projectM-pulseaudio"] $ws4 # Open specific applications in floating mode #for_window [title="alsamixer"] floating enable border pixel 1 @@ -324,9 +326,9 @@ set $mode_system (l)ock, (e)xit, (s)uspend, (h)ibernate, (r)eboot, (S)hutdown mode "$mode_system" { bindsym l exec --no-startup-id xscreensaver-command -lock, mode "default" #bindsym l exec --no-startup-id i3lock-wrapper -e, mode "default" - bindsym s exec --no-startup-id xscreensaver-command -lock && systemctl suspend, mode "default" + bindsym s exec --no-startup-id systemctl suspend, mode "default" bindsym e exec --no-startup-id i3-msg exit, mode "default" - bindsym h exec --no-startup-id xscreensaver-command -lock && systemctl hibernate, mode "default" + bindsym h exec --no-startup-id systemctl hibernate, mode "default" bindsym r exec --no-startup-id systemctl reboot, mode "default" bindsym Shift+s exec --no-startup-id systemctl poweroff, mode "default" @@ -373,7 +375,7 @@ exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec --no-startup-id conky --config "$HOME/.config/conky/conkyrc1" exec --no-startup-id conky --config "$HOME/.config/conky/conkyrc2" exec --no-startup-id conky --config "$HOME/.config/conky/conkyrc3" -exec --no-startup-id xscreensaver -no-splash +#exec --no-startup-id xscreensaver -no-splash exec_always --no-startup-id setcursor exec claws-mail --online #exec claws-mail --alternate-config-dir $HOME/.claws-mail-cognix --online @@ -394,7 +396,6 @@ exec --no-startup-id steam-native -silent -language french #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" exec --no-startup-id syncthing-gtk exec --no-startup-id SVPManager @@ -411,8 +412,8 @@ 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:Transponder AOE 12 + # font xft:IBM Plex Mono, DejaVu Sans Mono 11 + font xft:xos4 Terminus, DejaVu Sans Mono 14 strip_workspace_numbers yes colors { diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 2a22770..2b31ca2 100644 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -376,7 +376,7 @@ replaygain "auto" # result in the volume of all playing audio to be adjusted so the output has # equal "loudness". This setting is disabled by default. # -volume_normalization "yes" +#volume_normalization "yes" # ############################################################################### diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index f2a1e5c..34c20e0 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -23,7 +23,7 @@ hwdec-codecs=all # Audio #audio-channels=6 -#ad-lavc-downmix=no +ad-lavc-downmix=no #af=ladspa=/usr/lib/ladspa/bs2b.so:bs2b:[725,4.5] # Language diff --git a/.config/youtube-dl/config b/.config/youtube-dl/config index 069e318..74d8899 100644 --- a/.config/youtube-dl/config +++ b/.config/youtube-dl/config @@ -1,4 +1,5 @@ --o %(title)s.%(ext)s +-o %(title)s.mkv +--merge-output-format mkv --sub-lang fr,en --embed-subs --write-sub diff --git a/.i3blocks/batterybar b/.i3blocks/batterybar index d96a365..7e75649 100755 --- a/.i3blocks/batterybar +++ b/.i3blocks/batterybar @@ -78,22 +78,22 @@ end=$(($battery_count - 1)) for i in $(seq 0 $end); do # if (( percentages[$i] > 0 && percentages[$i] < 20 )); then -# squares="■" +# squares="█" # elif (( percentages[$i] >= 20 && percentages[$i] < 40 )); then -# squares="■■" +# squares="██" # elif (( percentages[$i] >= 40 && percentages[$i] < 60 )); then -# squares="■■■" +# squares="███" # elif (( percentages[$i] >= 60 && percentages[$i] < 80 )); then -# squares="■■■■" +# squares="████" # elif (( percentages[$i] >=80 )); then -# squares="■■■■■" +# squares="█████" # fi percents[$i]=$(( percentages[$i] / 2 )) (( percents > 48 )) && percents=48 _full_squares=$(( percents[$i] /8 )) for t in $(seq 1 $_full_squares) do - squares+="■" + squares+="█" done if [[ $(( percents[$i] - ( _full_squares * 8 ) )) -eq 7 ]] @@ -175,7 +175,7 @@ do _blanks=$(( 6 - ${#squares} )) for t in $(seq 1 $_blanks) do - squares+="■" + squares+="█" done # Print Battery number if there is more than one if (( $end > 0 )) ; then diff --git a/.i3blocks/internet b/.i3blocks/internet index a2a57b3..a551b26 100755 --- a/.i3blocks/internet +++ b/.i3blocks/internet @@ -28,4 +28,4 @@ else fi fi -echo "■" +echo "█" diff --git a/.i3blocks/keyindicator b/.i3blocks/keyindicator index e842c75..529bbb8 100755 --- a/.i3blocks/keyindicator +++ b/.i3blocks/keyindicator @@ -63,8 +63,8 @@ my $indi = "N"; # Output if (($indicators{$indicator} || 0) & $mask) { - printf "■", $color_on; + printf "█", $color_on; } else { - printf "■", $color_off; + printf "█", $color_off; } exit 0 diff --git a/.i3blocks/mocp b/.i3blocks/mocp index 636b0e9..e0c695c 100755 --- a/.i3blocks/mocp +++ b/.i3blocks/mocp @@ -17,11 +17,11 @@ case $BLOCK_BUTTON in 5) mocp -j $(($(mocp -Q "%cs") + 5))s ;; esac -status="■" +status="█" case $origstatus in - STOP ) status="■" ;; - PAUSE ) status="■" ;; - PLAY ) status="■" ;; + STOP ) status="█" ;; + PAUSE ) status="█" ;; + PLAY ) status="█" ;; esac if [[ "$origstatus" != "STOP" ]] diff --git a/.i3blocks/mpd b/.i3blocks/mpd index 0ab3383..0fe4d51 100755 --- a/.i3blocks/mpd +++ b/.i3blocks/mpd @@ -1,7 +1,7 @@ #!/bin/bash -LONG=30 -SHORT=15 +LONG=25 +SHORT=10 human_time() { local seconds="$1" @@ -34,6 +34,9 @@ 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="" @@ -109,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/.i3blocks/updates b/.i3blocks/updates index 91fe44e..a388772 100755 --- a/.i3blocks/updates +++ b/.i3blocks/updates @@ -2,7 +2,7 @@ if [[ -f /dev/shm/claws_offline ]] then - echo "■" + echo "█" exit fi @@ -17,9 +17,9 @@ total=$((${#avail[@]} + ${#aur[@]})) if [[ $total -eq 0 ]] then - echo "■" + echo "█" else - echo "■" + echo "█" if [[ $(cat /dev/shm/updates) -ne $total ]] || [[ -n "$BLOCK_BUTTON" ]] then [[ $total -eq 1 ]] && notify-send "1 mise à jour disponible" "$(for item in ${avail[@]} ${aur[@]}; do echo -n $item; done)" diff --git a/.i3blocks/vpn b/.i3blocks/vpn index 0167832..f37fa71 100755 --- a/.i3blocks/vpn +++ b/.i3blocks/vpn @@ -2,10 +2,10 @@ if nmcli dev | grep tun0 | cut -f3 | grep " connecté" &>/dev/null then - echo "■" + echo "█" [[ ! -f /dev/shm/vpn ]] && echo 1 > /dev/shm/vpn else - echo "■" + echo "█" if [[ -f /dev/shm/vpn ]] then notify-send -u critical "VPN" "Déconnecté" diff --git a/.local/bin/mpd-notif b/.local/bin/mpd-notif index 68667c0..8dc248e 100755 --- a/.local/bin/mpd-notif +++ b/.local/bin/mpd-notif @@ -13,5 +13,5 @@ do infos="Arrêt" fi notify-send "MPD" "$infos" -# pidof cava && sleep 1 && pkill -USR1 cava + pidof cava && pkill -USR1 cava done diff --git a/.vim/.netrwhist b/.vim/.netrwhist index 7771a52..74da679 100644 --- a/.vim/.netrwhist +++ b/.vim/.netrwhist @@ -1,2 +1,5 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhist_cnt =0 +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' diff --git a/.xinitrc b/.xinitrc index b29a0e4..2a0a98c 100644 --- a/.xinitrc +++ b/.xinitrc @@ -1,47 +1,55 @@ #!/bin/sh -# -# ~/.xinitrc -# -# Executed by startx (run your window manager from here) -if [ -d /etc/X11/xinit/xinitrc.d ]; then - for f in /etc/X11/xinit/xinitrc.d/*; do - [ -x "$f" ] && . "$f" - done - unset f +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +# merge in defaults and keymaps + +if [ -f $sysresources ]; then + + + + + + + + xrdb -merge $sysresources + fi -export GTK2_RC_FILES="$HOME/.gtkrc-2.0" -export XDG_CURRENT_DESKTOP="i3" +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi -DEFAULT_SESSION='i3 --shmlog-size 0' +if [ -f "$userresources" ]; then -/usr/bin/numlockx on -[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources -[[ -f ~/.fehbg ]] && ~/.fehbg -[[ -f ~/.screenlayout/home.sh ]] && ~/.screenlayout/home.sh + + + + + xrdb -merge "$userresources" + +fi + +if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" +fi + +# start some nice programs + +if [ -d /etc/X11/xinit/xinitrc.d ] ; then + for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do + [ -x "$f" ] && . "$f" + done + unset f +fi + +[ -f $HOME/.fehbg ] && $HOME/.fehbg +[ -f $HOME/.screenlayout/home.sh ] && $HOME/.screenlayout/home.sh setxkbmap fr oss -#[[ -f ~/.Xmodmap ]] && xmodmap ~/.Xmodmap - -case $1 in - awesome ) exec dbus-launch awesome ;; - bspwm ) exec dbus-launch bspwm-session ;; - budgie ) exec dbus-launch budgie-desktop ;; - cinnamon ) exec dbus-launch cinnamon-session ;; - deepin ) exec dbus-launch startdde ;; - enlightenment ) exec dbus-launch enlightenment_start ;; - fluxbox ) exec dbus-launch startfluxbox ;; - gnome ) exec dbus-launch gnome-session ;; - i3|i3wm ) exec dbus-launch i3 --shmlog-size 0 ;; - jwm ) exec dbus-launch jwm ;; - kde ) exec dbus-launch startkde ;; - lxde ) exec dbus-launch startlxde ;; - lxqt ) exec dbus-launch lxqt-session ;; - mate ) exec dbus-launch mate-session ;; - xfce ) exec dbus-launch xfce4-session ;; - - * ) exec dbus-launch $DEFAULT_SESSION ;; -esac +exec i3 #--shmlog-size=26214400