diff --git a/.Xresources b/.Xresources index 15eefd5..daf2dcf 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:antialias=true:pixelsize=13,xft:DejaVu Sans Mono:antialias=true:pixelsize=13,xft:Noto Sans Mono:pixelsize=13:antialias=true -URxvt.font: xft:xos4 Terminus:size=12,xft:DejaVu Sans Mono:antialias=true:size=12,xft:Noto Sans Mono:size=12:antialias=true -!URxvt.letterSpace: -1 +!URxvt.font: xft:IBM Plex Mono:pixelsize=14,xft:DejaVu Sans Mono:pixelsize=14,xft:Noto Sans Mono:pixelsize=14 +URxvt.font: xft:xos4 Terminus:pixelsize=14,xft:DejaVu Sans Mono:antialias=false:pixelsize=14,xft:Noto Sans Mono:pixelsize=14:antialias=false +!URxvt.letterSpace: 0 !URxvt.depth: 32 !URxvt.background: [100]#000000 @@ -149,6 +149,7 @@ URxvt*cursorUnderline: true ! URxvt*font: xft:Latin Modern Mono ! URxvt*boldFont: xft:Latin Modern Mono:size=12,xft:xos4 Terminus ! URxvt*italicFont: xft:Latin Modern Mono:size=12,xft:xos4 Terminus +!URxvt.letterSpace: -1 ! URxvt*boldItalicFont: xft:Latin Modern Mono:size=12,xft:xos4 Terminus ! URxvt*intensityStyles: true ! URxvt*inputMethod: name diff --git a/.bash_profile b/.bash_profile index d5e8722..b6c3855 100644 --- a/.bash_profile +++ b/.bash_profile @@ -22,7 +22,7 @@ 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="systemd-run --user --scope -p MemoryLimit=2G firefox" + export BROWSER="systemd-run --user --scope -p MemoryMax=2G firefox" export TERMINAL=urxvtc startx logout diff --git a/.config/cava/config b/.config/cava/config index 2a233a1..bea61f5 100644 --- a/.config/cava/config +++ b/.config/cava/config @@ -123,15 +123,13 @@ method = ncurses # background must also be defined in hex or remain commented out. 1 = on, 0 = off. # You can define as many as 8 different colors. They range from bottom to top of screen gradient = 1 -gradient_count = 8 +gradient_count = 6 gradient_color_1 = '#6699CC' gradient_color_2 = '#6699CC' -gradient_color_3 = '#6699CC' -gradient_color_4 = '#6699CC' -gradient_color_5 = '#CC99CC' -gradient_color_6 = '#CC99CC' -gradient_color_7 = '#F2777A' -gradient_color_8 = '#F2777A' +gradient_color_3 = '#CC99CC' +gradient_color_4 = '#CC99CC' +gradient_color_5 = '#F2777A' +gradient_color_6 = '#F2777A' diff --git a/.config/conky/conkyrc2 b/.config/conky/conkyrc2 index 418d595..5e7d87a 100644 --- a/.config/conky/conkyrc2 +++ b/.config/conky/conkyrc2 @@ -24,7 +24,7 @@ conky.config = { format_human_readable = true, short_units = true, if_up_strictness = 'link', - use_spacer = left, + use_spacer = right, text_buffer_size = 2048, color2 = 'F2F0EC', diff --git a/.config/i3/config b/.config/i3/config index fa1a63b..01a779a 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -101,18 +101,16 @@ bindsym $mod+Ctrl+m exec pavucontrol 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 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 +bindsym XF86AudioRaiseVolume exec --no-startup-id button=4 ${HOME}/.i3blocks/volume && pkill -RTMIN+10 i3blocks +bindsym XF86AudioLowerVolume exec --no-startup-id button=5 ${HOME}/.i3blocks/volume && pkill -RTMIN+10 i3blocks +bindsym XF86AudioMute exec --no-startup-id button=2 ${HOME}/.i3blocks/volume && pkill -RTMIN+10 i3blocks +bindsym XF86AudioMicMute exec --no-startup-id button=2 instance=mic ${HOME}/.i3blocks/volume && pkill -RTMIN+10 i3blocks # Media controls 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 $mod+XF86AudioPlay exec --no-startup-id mpc stop -bindsym XF86AudioRaiseVolume exec --no-startup-id mpc volume +2 -bindsym XF86AudioLowerVolume exec --no-startup-id mpc volume -2 # Beep tog bindsym $mod+Delete exec --no-startup-id $HOME/.local/bin/toggle-beep && pkill -SIGRTMIN+14 i3blocks diff --git a/.config/i3blocks/config b/.config/i3blocks/config index 1136cd7..4d8d3a1 100644 --- a/.config/i3blocks/config +++ b/.config/i3blocks/config @@ -48,9 +48,9 @@ interval=5 # Support multiple chips, though lm-sensors. # The script may be called with -w and -c switches to specify thresholds, # see the script for details. -[temperature] +#[temperature] #instance=coretemp-isa-0000 -interval=3 +#interval=3 #separator=false # #[temperature] @@ -60,14 +60,14 @@ interval=3 # # The type defaults to "mem" if the instance is not specified. [memory] -#separator=false +separator=false interval=2 #min_width=RAM 99.99% -#[memory] -#instance=swap +[memory] +instance=swap ##separator=false -#interval=2 +interval=2 ##min_width=swap 99.9% # Disk usage @@ -166,8 +166,13 @@ signal=13 # The first parameter sets the step (and units to display) # The second parameter overrides the mixer selection # See the script for details. +[toggle-sink] +interval=once +separator=false +separator_block_width=0 + [volume] -instance=vol +#instance=vol #instance=PCM interval=once signal=10 @@ -179,7 +184,6 @@ instance=mic interval=once signal=10 - # Key indicators # # Add the following bindings to i3 config file: @@ -195,7 +199,6 @@ interval=60 [beep] interval=once signal=14 -separator=false [keyindicator] instance=Caps diff --git a/.config/yay/config.json b/.config/yay/config.json deleted file mode 100644 index 6f91843..0000000 --- a/.config/yay/config.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "aururl": "https://aur.archlinux.org", - "buildDir": "/home/breizh/.cache/yay", - "editor": "vim", - "editorflags": "", - "makepkgbin": "/usr/bin/makepkg", - "makepkgconf": "", - "pacmanbin": "/usr/bin/pacman", - "pacmanconf": "/etc/pacman.conf", - "tarbin": "/usr/bin/bsdtar", - "redownload": "no", - "rebuild": "no", - "answerclean": "", - "answerdiff": "", - "answeredit": "", - "answerupgrade": "", - "gitbin": "git", - "gpgbin": "gpg", - "gpgflags": "", - "mflags": "", - "sortby": "name", - "gitflags": "", - "removemake": "yes", - "requestsplitn": 50, - "sortmode": 0, - "completionrefreshtime": 7, - "sudoloop": true, - "timeupdate": false, - "devel": false, - "cleanAfter": false, - "gitclone": true, - "provides": true, - "pgpfetch": true, - "upgrademenu": true, - "cleanmenu": true, - "diffmenu": false, - "editmenu": true, - "combinedupgrade": true, - "useask": false -} diff --git a/.config/yay/yay_vcs.json b/.config/yay/yay_vcs.json deleted file mode 100644 index 102e2a9..0000000 --- a/.config/yay/yay_vcs.json +++ /dev/null @@ -1,57 +0,0 @@ -[ - { - "pkgname": "kickthemout-git", - "url": "https://api.github.com/repos/k4m4/kickthemout/branches", - "sha": "00997333823abe317bc0597e2740e54da443e045" - }, - { - "pkgname": "cheat-git", - "url": "https://api.github.com/repos/chrisallenlane/cheat/branches", - "sha": "aa1e12625e5ee42fbfdf6f5a093233a8b99af81a" - }, - { - "pkgname": "pacli", - "url": "https://api.github.com/repos/Manjaro-Pek/pacli", - "sha": "1e1b0c4f6ab2748abb67694a45905ee86ed50316" - }, - { - "pkgname": "alacritty-terminfo-git", - "url": "https://api.github.com/repos/jwilm/alacritty", - "sha": "475ebecfc4e0648242e82e256dee1489f3a3fe81" - }, - { - "pkgname": "siji-git", - "url": "https://api.github.com/repos/stark/siji", - "sha": "25468227348e2d4b3abbc163b2e2d68882fa2ba6" - }, - { - "pkgname": "alacritty-git", - "url": "https://api.github.com/repos/jwilm/alacritty", - "sha": "f298ebb2179eff947cdb9cb7a4bd96e9739eac5c" - }, - { - "pkgname": "fbterm-git", - "url": "https://api.github.com/repos/izmntuk/fbterm", - "sha": "5b48962aa46648a94e3f74609059830218730455" - }, - { - "pkgname": "polybar", - "url": "https://api.github.com/repos/jaagr/polybar", - "sha": "258f55a5ff59cd43274954fc0caf27ed5a457508" - }, - { - "pkgname": "i3lock-blur", - "url": "https://api.github.com/repos/karulont/i3lock-blur", - "sha": "17b092f82d452752475d6c5e3c23e3c7a88335ed" - }, - { - "pkgname": "vim-youcompleteme-git", - "url": "https://api.github.com/repos/jwilm/racerd", - "sha": "29cd4c6fd2a9301e49931c2e065b2e10c4b587e4" - }, - { - "pkgname": "bettercap-git", - "url": "https://api.github.com/repos/bettercap/bettercap", - "sha": "b63c20b757e1936b97fde6c403c5415a6178bfed" - } -] \ No newline at end of file diff --git a/.i3blocks/beep b/.i3blocks/beep index 60304f9..d5cad44 100755 --- a/.i3blocks/beep +++ b/.i3blocks/beep @@ -5,12 +5,10 @@ then $HOME/.local/bin/toggle-beep fi -echo -n "beep " - if [[ -e /dev/input/by-path/platform-pcspkr-event-spkr ]] then - echo "█" + echo "beep" else - echo "█" + echo "beep" fi diff --git a/.i3blocks/bepo b/.i3blocks/bepo index 528ed94..3d7434f 100755 --- a/.i3blocks/bepo +++ b/.i3blocks/bepo @@ -19,5 +19,5 @@ if [[ -f "$runtime/oss" ]] then echo "oss " else - echo "bepo" + echo "bépo" fi diff --git a/.i3blocks/dunst b/.i3blocks/dunst index 0f18783..4bbba4e 100755 --- a/.i3blocks/dunst +++ b/.i3blocks/dunst @@ -2,8 +2,6 @@ active=$(systemctl --user show -p ActiveState --value dunst.service) -echo -n "dunst " - if [[ "$active" == "active" ]] then if [[ -n "$button" ]] @@ -13,10 +11,10 @@ then if [[ "$(dunstctl is-paused)" == "true" ]] then - echo "█" + echo "dunst" else - echo "█" + echo "dunst" fi else - echo "█" + echo "dunst" fi diff --git a/.i3blocks/internet b/.i3blocks/internet index af125f9..b51ae0f 100755 --- a/.i3blocks/internet +++ b/.i3blocks/internet @@ -28,4 +28,4 @@ else fi fi -echo "wan █" +echo "wan" diff --git a/.i3blocks/keyindicator b/.i3blocks/keyindicator index 0c74a9f..ab8b39b 100755 --- a/.i3blocks/keyindicator +++ b/.i3blocks/keyindicator @@ -8,7 +8,7 @@ if [[ "$status" = "on" ]] then color="#99CC99" else - color="#515151" + color="#747369" fi -echo "${instance,*} █" +echo "${instance,*}" diff --git a/.i3blocks/load_average b/.i3blocks/load_average index 579690f..21269e7 100755 --- a/.i3blocks/load_average +++ b/.i3blocks/load_average @@ -50,5 +50,5 @@ else color15="#F2777A" fi -printf "load %4.4s %4.4s %4.4s\n" ${load} ${load5} ${load15} +#printf "load %4.4s %4.4s %4.4s\n" ${load} ${load5} ${load15} printf "load %4.4s\n" ${load} diff --git a/.i3blocks/toggle-sink b/.i3blocks/toggle-sink new file mode 100755 index 0000000..b6a8beb --- /dev/null +++ b/.i3blocks/toggle-sink @@ -0,0 +1,24 @@ +#!/bin/bash + + +currentport=$(pacmd list-sinks | grep -Po "active port:.*") + +if [[ -n "$button" ]] +then + if [[ "$currentport" == "active port: " ]] + then + pacmd set-sink-port "alsa_output.pci-0000_0b_00.3.analog-stereo" "analog-output-headphones" + echo "head" + else + pacmd set-sink-port "alsa_output.pci-0000_0b_00.3.analog-stereo" "analog-output-lineout" + echo "line" + fi + pkill -RTMIN+10 i3blocks +else + if [[ "$currentport" == "active port: " ]] + then + echo "line" + else + echo "head" + fi +fi diff --git a/.i3blocks/updates b/.i3blocks/updates index 8d2dd13..131a68d 100755 --- a/.i3blocks/updates +++ b/.i3blocks/updates @@ -3,11 +3,9 @@ runtime="${XDG_RUNTIME_DIR}/i3blocks" [[ ! -d "$runtime" ]] && mkdir -p "$runtime" -echo -n "updt " - if [[ -f ${runtime}/claws_offline ]] then - echo "█" + echo "updt" exit fi @@ -22,9 +20,9 @@ total=$((${#avail[@]} + ${#aur[@]})) if [[ $total -eq 0 ]] then - echo "█" + echo "updt" else - echo "█" + echo "updt" if [[ $(cat ${runtime}/updates) -lt $total ]] || [[ -n "$BLOCK_BUTTON" ]] then [[ $total -eq 1 ]] && dunstify -r "57453" "1 mise à jour disponible" "$(for item in ${avail[@]} ${aur[@]}; do echo -n $item; done)" diff --git a/.i3blocks/volume b/.i3blocks/volume index b930648..8bdecd9 100755 --- a/.i3blocks/volume +++ b/.i3blocks/volume @@ -25,5 +25,5 @@ else color="#99CC99" fi -printf "%s %2d%%\n" "$BLOCK_INSTANCE" "$color" "$volume" +printf "%s %2d%%\n" "$instance" "$color" "$volume" diff --git a/.i3blocks/vpn b/.i3blocks/vpn index 323d491..094c2fe 100755 --- a/.i3blocks/vpn +++ b/.i3blocks/vpn @@ -1,13 +1,11 @@ #!/bin/bash -echo -n "vpn " - if nmcli dev | grep tun0 | cut -f3 | grep " connecté" &>/dev/null then - echo "█" + echo "vpn" [[ ! -f /dev/shm/vpn ]] && echo 1 > /dev/shm/vpn else - echo "█" + echo "vpn" if [[ -f /dev/shm/vpn ]] then notify-send -u critical "VPN" "Déconnecté" diff --git a/.local/bin/dmenu b/.local/bin/dmenu new file mode 100755 index 0000000..8a606c7 --- /dev/null +++ b/.local/bin/dmenu @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/bin/dmenu -i -nb "#393939" -nf "#a09f93" -sb "#6699cc" -sf "#2d2d2d" -fn "IBM Plex Mono-10" "$@" diff --git a/.local/bin/ytdl b/.local/bin/ytdl index 64104e5..810cd43 100755 --- a/.local/bin/ytdl +++ b/.local/bin/ytdl @@ -1,20 +1,3 @@ #!/bin/bash -actualpwd="$PWD" - -temp=$(mktemp -d) - -cd "$temp" - -for file in "${actualpwd}/"* -do - ln -s "$file" ./ -done - -youtube-dl -o '%(title)s.%(ext)s' "$@" --exec "mv -n {} \"${actualpwd}/\"" - -status="$?" - -#rm -rf "$temp" - -exit $status +youtube-dl --external-downloader aria2c "$@" diff --git a/.xscreensaver b/.xscreensaver index ab75b34..155d373 100644 --- a/.xscreensaver +++ b/.xscreensaver @@ -1,5 +1,5 @@ # XScreenSaver Preferences File -# Written by xscreensaver-demo 5.43 for breizh on Sun Feb 23 16:34:34 2020. +# Written by xscreensaver-demo 5.44 for breizh on Thu Nov 5 18:53:27 2020. # https://www.jwz.org/xscreensaver/ timeout: 0:15:00 @@ -280,6 +280,9 @@ programs: \ GL: handsy -root \n\ GL: deepstars -root \n\ GL: gravitywell -root \n\ + scooter -root \n\ + GL: etruscanvenus -root \n\ + GL: gibson -root \n\ pointerPollTime: 0:00:05