From ae1a585935c1edf5d792f3793e9bd4731019cd7c Mon Sep 17 00:00:00 2001 From: Breizh Date: Sat, 26 Feb 2022 22:34:40 +0100 Subject: [PATCH] Rollback sur i3 --- .bash_profile | 6 ++++-- .config/gammastep/config.ini | 6 +++--- .config/htop/htoprc | 2 +- .config/i3/config | 1 - .config/i3blocks/config | 40 ++++++++++++++++++------------------ .config/ranger/rc.conf | 2 +- .i3blocks/toggle-sink | 4 ++-- .local/bin/auto-poweroff.sh | 7 ++++++- .local/bin/mccmd | 2 +- .vim/.netrwhist | 4 ++-- .xinitrc | 16 --------------- 11 files changed, 40 insertions(+), 50 deletions(-) diff --git a/.bash_profile b/.bash_profile index e13d22d..0cda742 100644 --- a/.bash_profile +++ b/.bash_profile @@ -21,8 +21,10 @@ 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 -p MemorySwapMax=3G -E MOZ_ENABLE_WAYLAND=1 firefox" - export TERMINAL=footclient - exec sway + export TERMINAL=urxvtc + export XDG_CURRENT_DESKTOP=i3 +# exec sway -d 2> $HOME/.sway.log + exec startx elif [ "$XDG_VTNR" -ne 6 ]; then export BROWSER=elinks fish diff --git a/.config/gammastep/config.ini b/.config/gammastep/config.ini index cea19e2..73e90c3 100644 --- a/.config/gammastep/config.ini +++ b/.config/gammastep/config.ini @@ -1,8 +1,8 @@ ; Global settings [general] ; Set the day and night screen temperatures -temp-day=4500 -temp-night=3400 +temp-day=5000 +temp-night=4000 ; Disable the smooth fade between temperatures when Redshift starts and stops. ; 0 will cause an immediate change between screen temperatures. @@ -60,7 +60,7 @@ lon=-1.63750 ; Configuration of the adjustment-method ; type 'gammastep -m METHOD:help' to see the settings. -; ex: 'gammastep -m randr:help' +; example: '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/htop/htoprc b/.config/htop/htoprc index b697bd9..1058adb 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -21,7 +21,7 @@ highlight_changes_delay_secs=5 find_comm_in_cmdline=1 strip_exe_from_cmdline=1 show_merged_command=1 -tree_view=1 +tree_view=0 tree_view_always_by_pid=0 all_branches_collapsed=0 header_margin=1 diff --git a/.config/i3/config b/.config/i3/config index df498c2..265bcc0 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -359,7 +359,6 @@ exec --no-startup-id conky --config "$HOME/.config/conky/conkyrc2" exec_always --no-startup-id setcursor exec claws-mail --online exec --no-startup-id urxvtc -name newsboat -e newsboat -exec --no-startup-id xinput --disable "AlpsPS/2 ALPS DualPoint TouchPad" exec --no-startup-id redshift-gtk exec --no-startup-id nm-applet exec --no-startup-id steam-native -silent -noverifyfiles -language french diff --git a/.config/i3blocks/config b/.config/i3blocks/config index 4da3400..29f8436 100644 --- a/.config/i3blocks/config +++ b/.config/i3blocks/config @@ -171,15 +171,15 @@ interval=600 # 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 +[toggle-sink] +interval=once +separator=false +separator_block_width=0 [volume] #instance=vol #instance=PCM -label=vol +#label=vol interval=once signal=10 separator=false @@ -226,18 +226,18 @@ interval=once interval=1 markup=none -[steam] -full_text= -#command=swaymsg -q exec "steam-native +open steam://open/minigameslist" -command=swaymsg -q exec "steam-native" -interval=0 -separator=false - -[claws-mail] -interval=60 -signal=11 -separator=false - -[variety] -interval=30 -signal=12 +#[steam] +#full_text= +##command=swaymsg -q exec "steam-native +open steam://open/minigameslist" +#command=swaymsg -q exec "steam-native" +#interval=0 +#separator=false +# +#[claws-mail] +#interval=60 +#signal=11 +#separator=false +# +#[variety] +#interval=30 +#signal=12 diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf index 30beaac..994c1a5 100644 --- a/.config/ranger/rc.conf +++ b/.config/ranger/rc.conf @@ -28,7 +28,7 @@ set viewmode miller #set viewmode multipane # How many columns are there, and what are their relative widths? -set column_ratios 1,3,4 +set column_ratios 1,3,3 # Which files should be hidden? (regular expression) set hidden_filter ^\.|\.(?:pyc|pyo|bak|swp)$|^lost\+found$|^__(py)?cache__$ diff --git a/.i3blocks/toggle-sink b/.i3blocks/toggle-sink index 8b1d021..8675f71 100755 --- a/.i3blocks/toggle-sink +++ b/.i3blocks/toggle-sink @@ -7,10 +7,10 @@ if [[ -n "$button" ]] then if [[ "$currentport" == "Active Port: analog-output-lineout" ]] then - pactl set-sink-port "alsa_output.pci-0000_0b_00.3.analog-stereo" "analog-output-headphones" + pactl set-sink-port "alsa_output.pci-0000_29_00.3.analog-stereo" "analog-output-headphones" echo "casque" else - pactl set-sink-port "alsa_output.pci-0000_0b_00.3.analog-stereo" "analog-output-lineout" + pactl set-sink-port "alsa_output.pci-0000_29_00.3.analog-stereo" "analog-output-lineout" echo "front " fi pkill -RTMIN+10 i3blocks diff --git a/.local/bin/auto-poweroff.sh b/.local/bin/auto-poweroff.sh index 968285f..ffbcc8a 100755 --- a/.local/bin/auto-poweroff.sh +++ b/.local/bin/auto-poweroff.sh @@ -13,7 +13,12 @@ if [[ "$mcstatus" == "T" ]] then echo . >> /dev/shm/mccount else - > /dev/shm/mccount + players_tmp=($(mcstatus localhost query | grep players)) + players="${players_tmp[1]%%/*}" + if [[ "$players" -gt 0 ]] + then + > /dev/shm/mccount + fi fi time=$(wc -l /dev/shm/mccount | cut -d" " -f1) diff --git a/.local/bin/mccmd b/.local/bin/mccmd index ae181e8..880af65 100755 --- a/.local/bin/mccmd +++ b/.local/bin/mccmd @@ -7,6 +7,6 @@ do echo "$line" > /run/minecraft-server.stdin else echo "say $line" > /run/minecraft-server.stdin -# echo "dynmap sendtoweb $line" > /run/minecraft-server.stdin + echo "dynmap sendtoweb $line" > /run/minecraft-server.stdin fi done diff --git a/.vim/.netrwhist b/.vim/.netrwhist index 53c75b7..14bc751 100644 --- a/.vim/.netrwhist +++ b/.vim/.netrwhist @@ -1,5 +1,6 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhistcnt =5 +let g:netrw_dirhistcnt =6 +let g:netrw_dirhist_6='/home/breizh/.config' 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' @@ -9,4 +10,3 @@ let g:netrw_dirhist_0='/home/breizh' 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' diff --git a/.xinitrc b/.xinitrc index 8ac4634..f0a4e11 100644 --- a/.xinitrc +++ b/.xinitrc @@ -8,15 +8,7 @@ sysmodmap=/etc/X11/xinit/.Xmodmap # merge in defaults and keymaps if [ -f $sysresources ]; then - - - - - - - xrdb -merge $sysresources - fi if [ -f $sysmodmap ]; then @@ -24,15 +16,7 @@ if [ -f $sysmodmap ]; then fi if [ -f "$userresources" ]; then - - - - - - - xrdb -merge "$userresources" - fi if [ -f "$usermodmap" ]; then