diff options
| -rw-r--r-- | .local/share/kaomoji | 2 | ||||
| -rwxr-xr-x | config/bspwm/bspwmrc | 16 | ||||
| -rw-r--r-- | config/cava/config | 6 | ||||
| -rw-r--r-- | config/mpd/mpd.conf | 14 | ||||
| -rw-r--r-- | config/mpv/mpv.conf | 6 | ||||
| -rw-r--r-- | config/picom/picom.conf | 8 | ||||
| -rw-r--r-- | config/polybar/config | 2 | ||||
| -rwxr-xr-x | config/sx/sxrc | 4 | ||||
| -rw-r--r-- | config/sxhkd/sxhkdrc | 14 | ||||
| -rw-r--r-- | config/zathura/zathurarc | 2 | ||||
| -rwxr-xr-x | scripts/bg.sh | 4 | ||||
| -rwxr-xr-x | scripts/calculator | 2 | ||||
| -rwxr-xr-x | scripts/calendar | 2 | ||||
| -rwxr-xr-x | scripts/cinema.sh | 2 | ||||
| -rwxr-xr-x | scripts/ddc-switch-inputs | 2 | ||||
| -rwxr-xr-x | scripts/gamma.sh | 4 | ||||
| -rwxr-xr-x | scripts/powermenu | 2 | ||||
| -rwxr-xr-x | scripts/primary-display.sh | 3 | ||||
| -rwxr-xr-x | scripts/record_window.sh | 8 | ||||
| -rwxr-xr-x | scripts/tablet | 5 | ||||
| -rwxr-xr-x | scripts/toggle-mute.sh | 4 |
21 files changed, 65 insertions, 47 deletions
diff --git a/.local/share/kaomoji b/.local/share/kaomoji index b03258a..7a70d1e 100644 --- a/.local/share/kaomoji +++ b/.local/share/kaomoji @@ -378,7 +378,7 @@ o(^_-)O Boxer {{|└(>o< )┘|}} Up In Arms (^^)// Applause (2) ( `_)?(_' ) Dueling -(´~`) Weary +(´~`) WearY v(^_^)v Victory (3) (ﾉ_ _)ﾉ Surrender <( ･ｪ-)<} Bow and Arrow diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index 44dab3b..aaa92ec 100755 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -4,20 +4,17 @@ setup=0 COLOR_BACKGROUND="#282a2e" COLOR_PRIMARY="#fefefe" COLOR_SECONDARY="#707880" -BORDER=2 +BORDER=3 hsetroot -solid $COLOR_BACKGROUND & xsetroot -cursor_name left_ptr & xrdb ~/.config/Xdefaults -pgrep -x pipewire > /dev/null || pipewire & -pgrep -x pipewire-pulse > /dev/null || pipewire-pulse & -pgrep -x wireplumber > /dev/null || wireplumber & - pgrep -x sxhkd > /dev/null || sxhkd & #pgrep -x picom > /dev/null || picom & pgrep -x xss-lock > /dev/null || xss-lock slock & -#pgrep -x bg.sh > /dev/null || $HOME/.scripts/bg.sh > /dev/null & +pgrep -x bg.sh > /dev/null || $HOME/.scripts/bg.sh > /dev/null & +pgrep -x xcompmgr > /dev/null || xcompmgr -c -C -t-5 -l-5 -r4.2 -o.55 & [ -f "$HOME/.config/xrandr.sh" ] && . $HOME/.config/xrandr.sh @@ -33,7 +30,6 @@ for m in $(bspc query -M --names); do bspc monitor $m -d ${m}1 ${m}2 ${m}3 ${m}4 ${m}5 ${m}6 ${m}7 ${m}8 ${m}9 done - $HOME/.config/polybar/launch.sh & bspc config border_width $BORDER @@ -51,4 +47,10 @@ bspc config active_border_color "$COLOR_SECONDARY" bspc config focused_border_color "$COLOR_PRIMARY" wmname bspwm +sleep 1 + +pgrep -x pipewire > /dev/null || pipewire & +pgrep -x pipewire-pulse > /dev/null || pipewire-pulse & +pgrep -x wireplumber > /dev/null || wireplumber & + $HOME/.scripts/start-mpd diff --git a/config/cava/config b/config/cava/config index 2ddd926..a2b5cf8 100644 --- a/config/cava/config +++ b/config/cava/config @@ -56,10 +56,10 @@ # For alsa 'source' will be the capture device. # For fifo 'source' will be the path to fifo-file. # For shmem 'source' will be /squeezelite-AA:BB:CC:DD:EE:FF where 'AA:BB:CC:DD:EE:FF' will be squeezelite's MAC address -; source = auto +source = auto -method = alsa - source = hw:Loopback,1 +; method = alsa +; source = hw:Loopback,1 ; method = fifo ; source = /tmp/mpd.fifo diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf index b086d5e..c507226 100644 --- a/config/mpd/mpd.conf +++ b/config/mpd/mpd.conf @@ -15,14 +15,24 @@ audio_output { audio_output { type "pulse" - name "mpd" + name "mpd pulse" } +#audio_output { +# type "jack" +# name "MPD jack" +#} + +#audio_output { + #type "pipewire" + #name "MPD pipewire" +#} + audio_output { type "fifo" name "Visualizer feed" path "/tmp/mpd.fifo" - format "44100:16:2" + format "22050:16:2" } db_file "~/.config/mpd/database" diff --git a/config/mpv/mpv.conf b/config/mpv/mpv.conf index de4d6d7..2e2e0fc 100644 --- a/config/mpv/mpv.conf +++ b/config/mpv/mpv.conf @@ -1,5 +1 @@ -#vo=gpu -hwdec=auto -screenshot-directory=~/pics/screenshot -glsl-shaders="~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Upscale_Denoise_CNN.glsl:~~/shaders/Anime4K_Restore_CNN_Moderate_M.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_S.glsl" - +vo=x11 diff --git a/config/picom/picom.conf b/config/picom/picom.conf index 7e5ed20..5800384 100644 --- a/config/picom/picom.conf +++ b/config/picom/picom.conf @@ -185,7 +185,7 @@ opacity-rule = [ # Bad in performance, with driver-dependent behavior. # The name of the switch may change without prior notifications. # -blur-background = true; +blur-background = false; # Blur background of windows when the window frame is not opaque. # Implies: @@ -237,7 +237,7 @@ daemon = true # `xrender` is the default one. # experimental-backends = true; -backend = "glx"; +backend = "xrender"; vsync = true @@ -439,8 +439,8 @@ log-level = "info"; # wintypes: { - normal = { fade = true; shadow = true;} - tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; full-shadow = false; }; + normal = { fade = false; shadow = true;} + tooltip = { fade = false; shadow = true; opacity = 0.75; focus = true; full-shadow = false; }; dock = { full-shadow = true; } dnd = { shadow = true; } popup_menu = { shadow = true; } diff --git a/config/polybar/config b/config/polybar/config index 213b86c..a08cc24 100644 --- a/config/polybar/config +++ b/config/polybar/config @@ -140,7 +140,7 @@ label-muted = "%{T3} %{T-}--%" type = custom/script exec = pactl list sources | grep -qi 'Mute: yes' && echo "" || echo "" interval = 1 -click-left = pactl list sources | grep -qi 'Mute: yes' && pactl set-source-mute 2 false || pactl set-source-mute 2 true +click-left = $HOME/.scripts/toggle-mute.sh [module/vpn] type = custom/script diff --git a/config/sx/sxrc b/config/sx/sxrc index ee19f27..a95a311 100755 --- a/config/sx/sxrc +++ b/config/sx/sxrc @@ -1,4 +1,4 @@ -setxkbmap -option caps:backspace -xmodmap -e "clear Lock" +xrdb ~/.config/Xdefaults +setxkbmap -option caps:none exec bspwm diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc index 4869fc5..e9b0202 100644 --- a/config/sxhkd/sxhkdrc +++ b/config/sxhkd/sxhkdrc @@ -4,7 +4,7 @@ # mic super + BackSpace - pactl list sources | grep -qi 'Mute: yes' && pactl set-source-mute 2 false || pactl set-source-mute 2 true + $HOME/.scripts/toggle-mute.sh super + ctrl + alt + f pactl list sources | grep -qi 'Active Port: analog-input-rear-mic' && pactl set-source-port 2 analog-input-front-mic || pactl set-source-port 2 analog-input-rear-mic @@ -144,24 +144,24 @@ super + alt + t # record screen super + alt + s - .scripts/screenrecord + $HOME/.scripts/screenrecord #bring up calculator super + period - .scripts/calculator + $HOME/.scripts/calculator # file search and open super + slash websearch shift + super + slash - bspc rule -a \* -o state=floating && $TERMINAL -e ~/.scripts/fzf_menu.sh + bspc rule -a \* -o state=floating && $TERMINAL -e $HOME/.scripts/fzf_menu.sh # Calendar super + c - bspc rule -a \* -o state=floating && $TERMINAL -e calcurse + $HOME/.scripts/calendar super + comma - .scripts/notepad + $HOME/.scripts/notepad ################### # mpd server # @@ -188,7 +188,7 @@ super + alt + ctrl + backslash # chooser super + alt + ctrl + slash - .scripts/mpc_picker + $HOME/.scripts/mpc_picker # volume super + alt + ctrl + Next mpc volume -10 diff --git a/config/zathura/zathurarc b/config/zathura/zathurarc index 8fc40d8..5a0717d 100644 --- a/config/zathura/zathurarc +++ b/config/zathura/zathurarc @@ -30,5 +30,3 @@ set selection-clipboard clipboard set guioptions none set recolor true - -set first-page-column 1:1 diff --git a/scripts/bg.sh b/scripts/bg.sh index 34a1196..06793e9 100755 --- a/scripts/bg.sh +++ b/scripts/bg.sh @@ -1,4 +1,8 @@ #!/bin/sh + +feh --bg-fill ~/.config/bg.png +exit + setbg="feh --force-aliasing --bg-tile " image=~/.config/bg.gif diff --git a/scripts/calculator b/scripts/calculator index f092fd8..31998cc 100755 --- a/scripts/calculator +++ b/scripts/calculator @@ -1,2 +1,2 @@ #!/bin/sh -bspc rule -a \* -o state=floating && $TERMINAL -e bc -liq +bspc rule -a \* -o state=floating && $TERMINAL -e bc -l diff --git a/scripts/calendar b/scripts/calendar new file mode 100755 index 0000000..2836170 --- /dev/null +++ b/scripts/calendar @@ -0,0 +1,2 @@ +#!/bin/sh +bspc rule -a \* -o state=floating && $TERMINAL -e sh -c "cal $(date +%Y); read" diff --git a/scripts/cinema.sh b/scripts/cinema.sh index 5352a6e..c0e2938 100755 --- a/scripts/cinema.sh +++ b/scripts/cinema.sh @@ -1,3 +1,3 @@ #!/bin/sh -MAIN_DP=DP-1; +MAIN_DP=$($HOME/.scripts/primary-display.sh); v=$(xrandr --current --verbose | grep "Brightness" | cut -f2 -d " " | tr '\n' '*' | rev | cut -c 2- | rev | sed -e "s/$/==1/" | bc -l | grep -q 0 && echo 1 || echo 0); xrandr | grep " connected" | cut -f1 -d " " | while read -r line; do echo $line | grep -q $MAIN_DP && : || xrandr --output $line --brightness $v; done diff --git a/scripts/ddc-switch-inputs b/scripts/ddc-switch-inputs index 8f10c65..9bd3682 100755 --- a/scripts/ddc-switch-inputs +++ b/scripts/ddc-switch-inputs @@ -15,5 +15,5 @@ case $1 in ;; esac -ddcutil --bus=13 setvcp 60 ${OUT[0]} & +ddcutil --bus=12 setvcp 60 ${OUT[0]} & wait diff --git a/scripts/gamma.sh b/scripts/gamma.sh index 796b561..8de1b80 100755 --- a/scripts/gamma.sh +++ b/scripts/gamma.sh @@ -1,10 +1,10 @@ #!/bin/bash -MAIN_DP=eDP1; +MAIN_DP=$($HOME/.scripts/primary-display.sh); v=$1 if [ $# -ne 0 ]; then xrandr --output $MAIN_DP --gamma $(paste -d" " <(xrandr | grep " connected" | cut -f1 -d " ") <(xrandr --current --verbose | grep "Gamma" | cut -f7 -d" " | cut -f1 -d":" | xargs -I % echo "1/%") | grep $MAIN_DP | cut -d" " -f2 | xargs -I % echo "%*$v" | bc -l) else - xrandr --output $MAIN_DP --gamma 1 + xrandr --output $MAIN_DP --gamma 1.1 fi diff --git a/scripts/powermenu b/scripts/powermenu index 917f369..2ce5901 100755 --- a/scripts/powermenu +++ b/scripts/powermenu @@ -1,3 +1,3 @@ #!/bin/sh -printf "%s\n" "pm-suspend" "pm-hibernate" "reboot" "poweroff" | rofi -dmenu -p "power" | xargs -r +printf "pm-suspend reboot poweroff" | rofi -dmenu -p "power" | xargs -r diff --git a/scripts/primary-display.sh b/scripts/primary-display.sh new file mode 100755 index 0000000..310cfb6 --- /dev/null +++ b/scripts/primary-display.sh @@ -0,0 +1,3 @@ +#!/bin/sh +xrandr | awk '/ primary / {print $1}' + diff --git a/scripts/record_window.sh b/scripts/record_window.sh index f3cf452..841b756 100755 --- a/scripts/record_window.sh +++ b/scripts/record_window.sh @@ -9,13 +9,11 @@ width=$(cat $info | grep Width | cut -d' ' -f4) height=$(cat $info | grep Height | cut -d' ' -f4) size="${width}x${height}" -x=$(cat $info | grep "Absolute upper-left X" | cut -d' ' -f7) -y=$(cat $info | grep "Absolute upper-left Y" | cut -d' ' -f7) -position="+$x,$y" +position=+$(echo $geom | cut -d'+' -f2- | sed "s/+/,/g") -filename=$(date +"%F_%T.mp4") +filename=$(date +"$HOME/pics/screenshot/%F_%T.mp4") echo $size and $position -ffmpeg -y -f x11grab -video_size $size -i "$position" $filename +ffmpeg -y -f x11grab -video_size $size -i $position $filename rm $info diff --git a/scripts/tablet b/scripts/tablet index 009395a..7e91a55 100755 --- a/scripts/tablet +++ b/scripts/tablet @@ -22,11 +22,12 @@ tablet_ratio = (lambda s: float(s[0]) / float(s[1]))(sys.argv[4].split(":")) if screens = [ (0, 0, 1920, 1080), + (1920, 0, 2560, 1440), ] #TODO find this with xrandr -target = screens[0] +target = screens[1] #Physical offset of the selected screen offsetx = target[0] @@ -34,7 +35,7 @@ offsety = target[1] #Size of the full screen areas sh = 1080 -sw = 1920 +sw = 1920 + 2560 #TODO calculate using list of screens #Aspect ratio of the tablet, to avoid weird scaling problems diff --git a/scripts/toggle-mute.sh b/scripts/toggle-mute.sh new file mode 100755 index 0000000..3d08f26 --- /dev/null +++ b/scripts/toggle-mute.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# +pactl list sources | grep -qi 'Mute: yes' && pactl set-source-mute 0 false || pactl set-source-mute 0 true + |