diff --git a/.bash_profile b/.bash_profile index 16744cd..93a550c 100644 --- a/.bash_profile +++ b/.bash_profile @@ -20,7 +20,7 @@ eval $(ssh-agent -s) if [ -z "$DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ]; then export GTK2_RC_FILES="$HOME/.gtkrc-2.0" export QT_QPA_PLATFORMTHEME=qt5ct - export BROWSER="systemd-run --user --scope -p MemoryMax=2G firefox" + export BROWSER="systemd-run --user --scope -p MemoryMax=2G -E MOZ_ENABLE_WAYLAND=1 firefox" export TERMINAL=footclient exec sway elif [ "$XDG_VTNR" -ne 6 ]; then diff --git a/.config/cava/config b/.config/cava/config index ceb3f22..103d3ec 100644 --- a/.config/cava/config +++ b/.config/cava/config @@ -141,6 +141,7 @@ gradient_color_3 = '#D50000' # Percentage value for integral smoothing. Takes values from 0 - 100. # Higher values means smoother, but less precise. 0 to disable. ; integral = 77 +integral = 70 # Disables or enables the so-called "Monstercat smoothing" with or without "waves". Set to 0 to disable. monstercat = 1 diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index 33bbf1e..c4bd2ea 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -464,9 +464,5 @@ #[stack-volumes] # appname = "some_volume_notifiers" # set_stack_tag = "volume" - -[redshift] - summary = "Redshift" - history_ignore = yes # # vim: ft=cfg diff --git a/.config/gammastep/config.ini b/.config/gammastep/config.ini new file mode 100644 index 0000000..cea19e2 --- /dev/null +++ b/.config/gammastep/config.ini @@ -0,0 +1,66 @@ +; Global settings +[general] +; Set the day and night screen temperatures +temp-day=4500 +temp-night=3400 + +; Disable the smooth fade between temperatures when Redshift starts and stops. +; 0 will cause an immediate change between screen temperatures. +; 1 will gradually apply the new screen temperature over a couple of seconds. +fade=1 + +; Solar elevation thresholds. +; By default, Redshift will use the current elevation of the sun to determine +; whether it is daytime, night or in transition (dawn/dusk). When the sun is +; above the degrees specified with elevation-high it is considered daytime and +; below elevation-low it is considered night. +;elevation-high=3 +;elevation-low=-6 + +; Custom dawn/dusk intervals. +; Instead of using the solar elevation, the time intervals of dawn and dusk +; can be specified manually. The times must be specified as HH:MM in 24-hour +; format. +;dawn-time=6:00-7:45 +;dusk-time=18:35-20:15 + +; Set the screen brightness. Default is 1.0. +;brightness=0.9 +; It is also possible to use different settings for day and night +; since version 1.8. +;brightness-day=0.7 +;brightness-night=0.4 +; Set the screen gamma (for all colors, or each color channel +; individually) +;gamma=0.8 +;gamma=0.8:0.7:0.8 +; This can also be set individually for day and night since +; version 1.10. +;gamma-day=0.8:0.7:0.8 +;gamma-night=0.6 + +; Set the location-provider: 'geoclue2', 'manual'. +; The location provider settings are in a different section. +location-provider=manual + +; Set the adjustment-method: 'randr', 'vidmode', 'drm', 'wayland'. +; 'randr' is the preferred X11 method, 'vidmode' is an older API +; that works in some cases when 'randr' does not. +; The adjustment method settings are in a different section. +adjustment-method=wayland + +; Configuration of the location-provider: +; type 'gammastep -l PROVIDER:help' to see the settings. +; ex: 'gammastep -l manual:help' +; Keep in mind that longitudes west of Greenwich (e.g. the Americas) +; are negative numbers. +[manual] +lat=48.09104 +lon=-1.63750 + +; Configuration of the adjustment-method +; type 'gammastep -m METHOD:help' to see the settings. +; ex: 'gammastep -m randr:help' +; In this example, randr is configured to adjust only screen 0. +; Note that the numbering starts from 0, so this is actually the first screen. +; If this option is not specified, Redshift will try to adjust _all_ screens. diff --git a/.config/gammastep/hooks/notif.sh b/.config/gammastep/hooks/notif.sh new file mode 100755 index 0000000..6a1f8b3 --- /dev/null +++ b/.config/gammastep/hooks/notif.sh @@ -0,0 +1,5 @@ +#!/bin/sh +case $1 in + period-changed) + exec dunstify -u low -r 6903 "Gammastep" "Period changed to $3" +esac diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 7176690..e4864a7 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -1,9 +1,9 @@ # 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 39 113 111 109 110 46 47 2 1 -sort_key=111 +sort_key=46 sort_direction=1 -tree_sort_key=47 +tree_sort_key=46 tree_sort_direction=1 hide_kernel_threads=1 hide_userland_threads=1 diff --git a/.config/i3blocks/config b/.config/i3blocks/config index 13147f2..55aef42 100644 --- a/.config/i3blocks/config +++ b/.config/i3blocks/config @@ -223,11 +223,16 @@ interval=1 markup=none [steam] -full_text= -command=swaymsg -q exec "steam-native -no-browser +open steam://open/minigameslist" +full_text= +command=swaymsg -q exec "steam-native +open steam://open/minigameslist" interval=0 separator=false [claws-mail] interval=60 +signal=11 +separator=false +[variety] +interval=once +signal=12 diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index aae8d31..38d2e38 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -20,8 +20,8 @@ sub-back-color=0.0/0.0/0.0/0.5 sub-use-margins sub-file-paths=~/Sous-titres/ sub-font=IBM Plex Sans -sub-font-size=35 -sub-margin-y=0 +sub-font-size=25 +sub-margin-y=10 # Codecs hwdec=auto-copy diff --git a/.config/redshift.conf b/.config/redshift.conf deleted file mode 100644 index 0a94716..0000000 --- a/.config/redshift.conf +++ /dev/null @@ -1,13 +0,0 @@ -[redshift] -temp-day=4500 -temp-night=3400 - -transition=1 - -location-provider=manual - -adjustment-method=randr - -[manual] -lat=48.10038 -lon=-1.66612 diff --git a/.config/redshift/hooks/brightness.sh b/.config/redshift/hooks/brightness.sh deleted file mode 100644 index c51c65b..0000000 --- a/.config/redshift/hooks/brightness.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -# Set brightness via xbrightness when redshift status changes - -# Set brightness values for each status. -# Range from 0 to 100 is valid -brightness_day="100" -brightness_transition="60" -brightness_night="20" -max=$(cat /sys/class/backlight/intel_backlight/max_brightness) -actual=$(cat /sys/class/backlight/intel_backlight/actual_brightness) - -case $1 in - period-changed) - case $3 in - night) - for (( c=$actual; c > $((( $brightness_night * $max / 100))); c-=1 )) - do - echo $c > /sys/class/backlight/intel_backlight/brightness - sleep .2 - done - ;; - transition) - old="$2" - if [[ "$old" == "none" ]] - then - if [[ $actual -lt $(( $brightness_transition * $max / 100 )) ]] - then - old="night" - else - old="daytime" - fi - fi - case $old in - night) - for (( c=$actual; c < $((( $brightness_transition * $max / 100))); c+=1 )) - do - echo $c > /sys/class/backlight/intel_backlight/brightness - sleep .2 - done - ;; - daytime) - for (( c=$actual; c > $((( $brightness_transition * $max / 100))); c-=1 )) - do - echo $c > /sys/class/backlight/intel_backlight/brightness - sleep .2 - done - ;; - esac - ;; - daytime) - for (( c=$actual; c < $((( $brightness_day * $max / 100))); c+=1 )) - do - echo $c > /sys/class/backlight/intel_backlight/brightness - sleep .2 - done - echo $max > /sys/class/backlight/intel_backlight/brightness - ;; - esac - ;; -esac diff --git a/.config/redshift/hooks/notifcation.sh b/.config/redshift/hooks/notifcation.sh deleted file mode 100755 index 80b13f7..0000000 --- a/.config/redshift/hooks/notifcation.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -case $1 in - period-changed) - exec dunstify -u low -r $(sum <<<"redshift" | cut -d' ' -f1) "Redshift" "Period changed to $3" -esac diff --git a/.config/sway/config b/.config/sway/config index a0d4453..e9bba29 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -29,8 +29,6 @@ client.urgent $base08 $base08 $base00 $base08 $base08 client.placeholder $base00 $base00 $base05 $base00 $base00 client.background $base00 -exec systemctl --user import-environment DISPLAY - # Inputs configuration input "type:keyboard" { @@ -44,9 +42,14 @@ input "type:keyboard" { output 'Samsung Electric Company C24FG7x HTHK500785' { subpixel rgb adaptive_sync off - bg /home/breizh/.config/variety/wallpaper/link fill } +# start terminal daemon +exec foot --server + +# Export some variables +exec systemctl --user import-environment DISPLAY + # GTK Configuration set $gs org.gnome.desktop.interface @@ -61,8 +64,6 @@ exec_always { # Set mod key (Mod1=, Mod4=) set $mod Mod4 -exec foot --server - # set default desktop layout (default is tiling) # workspace_layout tabbed @@ -107,9 +108,9 @@ bindcode $mod+Ctrl+40 exec dmenu_run -p "Execute:" ################################################################################################ # Screen -# bindsym $mod+Home exec pkill -x -USR1 redshift -bindsym $mod+End output 'Unknown Q27G2G4 0x000008C9' adaptive_sync on, exec dunstify -r 53364 -u low "Sway" "FreeSync AOC activé" -bindsym $mod+Shift+End output 'Unknown Q27G2G4 0x000008C9' adaptive_sync off, exec dunstify -r 53364 -u low "Sway" "FreeSync AOC désactivé" +bindsym $mod+Home exec pkill -x -USR1 gammastep +bindsym $mod+End output * adaptive_sync on, exec dunstify -r 53364 -u low "Sway" "FreeSync activé" +bindsym $mod+Shift+End output * adaptive_sync off, exec dunstify -r 53364 -u low "Sway" "FreeSync désactivé" # Volume controls bindsym XF86AudioRaiseVolume exec button=4 ${HOME}/.i3blocks/volume && pkill -RTMIN+10 i3blocks @@ -128,8 +129,10 @@ bindsym XF86AudioPrev exec mpc prev bindsym XF86AudioPlay exec mpc toggle bindsym $mod+XF86AudioPlay exec mpc stop -# Notifications +# Mail +bindsym XF86Mail exec pkill -RTMIN+11 i3blocks, workspace 🖂 +# Notifications bindsym Ctrl+space exec dunstctl close bindsym Ctrl+Shift+space exec dunstctl close-all bindsym Ctrl+Shift+dollar exec dunstctl context @@ -147,9 +150,9 @@ bindsym $mod+Ctrl+F3 exec pcmanfm bindsym $mod+F3 exec footclient ranger bindsym $mod+F4 exec footclient bashmount bindsym $mod+F5 exec footclient ncmpcpp -#bindsym Print exec sway-scrot -#bindsym $mod+Print --release exec sway-scrot -w -#bindsym $mod+Shift+Print --release exec sway-scrot -s +bindsym Print exec grimshot --notify save screen +bindsym $mod+Print exec grimshot --notify save active +bindsym $mod+Shift+Print exec grimshot --notify save area bindsym $mod+l exec passmenu --type -l 10 $DMENU_OPTIONS # focus_follows_mouse no @@ -261,14 +264,14 @@ bindcode $mod+Shift+15 move container to workspace $ws6; workspace $ws6 bindcode $mod+Shift+16 move container to workspace $ws7; workspace $ws7 bindcode $mod+Shift+17 move container to workspace $ws8; workspace $ws8 -#workspace $ws1 output DP-2 -#workspace $ws2 output DP-2 -#workspace $ws3 output DP-2 -#workspace $ws4 output DP-2 -#workspace $ws5 output DP-2 -#workspace $ws6 output DP-2 -#workspace $ws7 output DP-2 -#workspace $ws8 output DP-1 +#workspace $ws1 output DP-1 +#workspace $ws2 output DP-1 +#workspace $ws3 output DP-1 +#workspace $ws4 output DP-1 +#workspace $ws5 output DP-1 +#workspace $ws6 output DP-1 +#workspace $ws7 output DP-1 +#workspace $ws8 output HDMI-A-1 # Open specific applications in floating mode for_window [title="File Transfer*"] floating enable @@ -286,6 +289,7 @@ for_window [class="(?i)Rail Route.x86"] border none # Assign apps to workspace assign [app_id="claws-mail"] 🖂 +assign [app_id="org.qbittorrent.qBittorrent"] 8 # reload the configuration file bindsym $mod+Shift+c reload @@ -294,12 +298,12 @@ bindsym $mod+Shift+c reload set $mode_system (l)ock, (e)xit, (s)uspend, (h)ibernate, (r)eboot, (S)hutdown bindcode $mod+19 mode "$mode_system" mode "$mode_system" { - bindsym l exec swaylock, mode "default" - bindsym s exec systemctl suspend, mode "default" - bindsym e exec swaymsg exit, mode "default" + bindsym l exec "systemctl --user stop graphical-session.target; swaylock", mode "default" + bindsym s exec "systemctl suspend", mode "default" + bindsym e exec "systemctl --user stop graphical-session.target; swaymsg exit", mode "default" bindsym h exec systemctl hibernate, mode "default" - bindsym r exec systemctl reboot, mode "default" - bindsym Shift+s exec systemctl poweroff, mode "default" + bindsym r exec "systemctl --user stop graphical-session.target; systemctl reboot", mode "default" + bindsym Shift+s exec "systemctl --user stop graphical-session.target; systemctl poweroff", mode "default" # exit system mode: "Enter" or "Escape" bindsym Return mode "default" @@ -336,11 +340,12 @@ bindsym $mod+9 exec swaylock # Autostart applications #exec conky --config "$HOME/.config/conky/conkyrc1" #exec conky --config "$HOME/.config/conky/conkyrc2" -exec claws-mail --online exec sleep 5 && footclient -a newsboat -T newsboat -o colors.alpha=1.0 -o colors.background=2D2D2D newsboat exec steam-native -silent -noverifyfiles -language french exec play "$HOME/Musique/WELCOME BACK.wav" +exec gammastep exec variety +exec claws-mail --online # Start swaybar to display a workspace bar (plus the system information swaystatus if available) bar { @@ -369,3 +374,4 @@ bar { # hide/unhide swaybar bindsym $mod+comma bar mode toggle +workspace 1 diff --git a/.config/systemd/user/mpd-notif.service b/.config/systemd/user/mpd-notif.service index d824188..5789e0b 100644 --- a/.config/systemd/user/mpd-notif.service +++ b/.config/systemd/user/mpd-notif.service @@ -1,7 +1,7 @@ [Unit] PartOf=mpd.service -After=mpd.service -Requires=mpd.service +After=mpd.service graphical-session.target +Requires=mpd.service graphical-session.target Description=MPD Notifications [Service] diff --git a/.config/variety/scripts/set_wallpaper b/.config/variety/scripts/set_wallpaper index 45154ff..cb5e594 100755 --- a/.config/variety/scripts/set_wallpaper +++ b/.config/variety/scripts/set_wallpaper @@ -221,8 +221,8 @@ if [[ " ${SIMPLE_WMS[*]} " = *" $XDG_CURRENT_DESKTOP "* || " ${SIMPLE_WMS[*]} " fi if [[ -n $SWAYSOCK ]]; then - swaymsg output "*" bg "$WP" fill 2> /dev/null - ln -s -f "$WP" /home/breizh/.config/variety/wallpaper/link + swaymsg output "*" bg "$WP" fit 2> /dev/null + pkill -RTMIN+12 i3blocks fi # trinity diff --git a/.i3blocks/bandwidth b/.i3blocks/bandwidth index 8d5c1fc..4500961 100755 --- a/.i3blocks/bandwidth +++ b/.i3blocks/bandwidth @@ -3,6 +3,11 @@ runtime="${XDG_RUNTIME_DIR}/i3blocks" [[ ! -d "$runtime" ]] && mkdir -p "$runtime" +if [[ "$button" -gt 0 ]] +then + swaymsg -q -- exec nm-connection-editor +fi + # Interface à utiliser (sinon, celle ayant la route par défaut) if [[ -n "$instance" ]] then diff --git a/.i3blocks/claws-mail b/.i3blocks/claws-mail index 81b9571..c0e4428 100755 --- a/.i3blocks/claws-mail +++ b/.i3blocks/claws-mail @@ -1,15 +1,15 @@ #!/bin/bash +if ! pgrep -xf "^claws-mail .*" &>/dev/null +then + swaymsg -q -- exec claws-mail --online +fi + stats=($(claws-mail --status)) status="$?" new=${stats[0]} unread=${stats[1]} -if [[ "$unread" == "Claws" ]] -then - swaymsg -q -- exec claws-mail --online -fi - if [[ "$button" -eq 1 ]] then swaymsg -q -- workspace 🖂 diff --git a/.i3blocks/internet b/.i3blocks/internet index 3ddc1f0..1dc944c 100755 --- a/.i3blocks/internet +++ b/.i3blocks/internet @@ -2,12 +2,17 @@ color="" +if [[ "$button" -gt 0 ]] +then + swaymsg -q -- exec nm-connection-editor +fi + if ! nmcli dev | grep " connecté" &>/dev/null then color="#747369" if [ ! -f /dev/shm/claws_offline ] then - claws-mail --offline + swaymsg -q -- exec claws-mail --offline touch /dev/shm/claws_offline fi elif ping -c 1 1.1.1.1 -W 1 &>/dev/null || ping -c 1 8.8.8.8 -W 1 &>/dev/null @@ -15,14 +20,14 @@ then color="#99CC99" if [ -f /dev/shm/claws_offline ] then - claws-mail --online + swaymsg -q -- exec claws-mail --online rm /dev/shm/claws_offline fi else color="#F2777A" if [ ! -f /dev/shm/claws_offline ] then - claws-mail --offline + swaymsg -q -- exec claws-mail --offline touch /dev/shm/claws_offline color="#FFCC66" fi diff --git a/.i3blocks/mpd b/.i3blocks/mpd index a903ff6..209be30 100755 --- a/.i3blocks/mpd +++ b/.i3blocks/mpd @@ -12,7 +12,7 @@ else fi LONG=40 -SHORT=15 +SHORT=20 case $BLOCK_BUTTON in 1) mpc -q prev ;; @@ -133,8 +133,8 @@ then else [[ -f ${runtime}/mpd ]] && rm ${runtime}/mpd [[ -f ${runtime}/mpd-scroll ]] && rm ${runtime}/mpd-scroll - printf "%${LONG}s $status[--:-- --:-- --:--]\n" " " - printf "%${SHORT}s $status--:-- --:--\n" " " + printf "$status[--:-- --:-- --:--]\n" " " + printf "$status--:-- --:--\n" " " fi diff --git a/.local/bin/music-convert b/.local/bin/music-convert index 9ecc2c2..ba2e817 100755 --- a/.local/bin/music-convert +++ b/.local/bin/music-convert @@ -49,7 +49,7 @@ do ( echo " $file" - ffmpeg -n -loglevel error -i "file:$file" -c:a libopus "file:${dstdir}${dstfile}" + ffmpeg -n -loglevel error -i "file:$file" -c:a libopus -b:a 256K "file:${dstdir}${dstfile}" echo "[${green} OK ${reset}] $file" ) & else diff --git a/.vim/.netrwhist b/.vim/.netrwhist index 161b81f..53c75b7 100644 --- a/.vim/.netrwhist +++ b/.vim/.netrwhist @@ -1,5 +1,6 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhistcnt =4 +let g:netrw_dirhistcnt =5 +let g:netrw_dirhist_5='/home/breizh/.config/base16-shell' let g:netrw_dirhist_4='/home/breizh/.config' let g:netrw_dirhist_3='/home/breizh/.config/fish' let g:netrw_dirhist_2='/usr/lib/python3.9/site-packages/variety' @@ -9,4 +10,3 @@ let g:netrw_dirhist_9='/home/breizh/.local/share' let g:netrw_dirhist_8='/home/breizh/aur' let g:netrw_dirhist_7='/home/breizh/.ncmpcpp' let g:netrw_dirhist_6='/home/breizh/.config/fish' -let g:netrw_dirhist_5='/home/breizh/.config/i3'