diff options
| -rw-r--r-- | .config/i3/config | 2 | ||||
| -rw-r--r-- | .config/i3status/config | 10 | ||||
| -rwxr-xr-x | .config/mpd/mpd.conf | 4 | ||||
| -rw-r--r-- | .config/pipewire/pipewire.conf | 4 | ||||
| -rw-r--r-- | .config/shell/aliasrc | 19 | ||||
| -rw-r--r-- | .config/shell/profile | 2 | ||||
| -rw-r--r-- | .config/tmux/tmux.conf | 32 |
7 files changed, 43 insertions, 30 deletions
diff --git a/.config/i3/config b/.config/i3/config index 5c66b75..b1e56cf 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -46,7 +46,7 @@ bindsym $mod+Shift+F exec firefox -P default-release bindsym $mod+Shift+B exec firefox -P less-strict bindsym $mod+Shift+E exec emacsclient -c -a "emacs" bindsym $mod+z exec boomer -bindsym $mod+c exec mpdmenu +bindsym $mod+m exec mpdmenu bindsym $mod+Shift+M exec mpdinfo bindsym $mod+b exec bm -o bindsym $mod+Control+b exec bm -y diff --git a/.config/i3status/config b/.config/i3status/config index 6e00b11..ee97759 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -13,6 +13,7 @@ general { order += "ethernet br0" order += "ethernet tun0" +order += "ethernet wg0" order += "cpu_temperature 0" order += "disk /" order += "load" @@ -26,8 +27,13 @@ ethernet br0 { } ethernet tun0 { - format_up = "VPN: %ip" - format_down = "VPN: down" + format_up = "openVPN: %ip" + format_down = "openVPN: down" +} + +ethernet wg0 { + format_up = "WG: %ip" + format_down = "WG: down" } cpu_temperature 0 { diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index ff72d84..7a575d6 100755 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -19,10 +19,12 @@ audio_output { type "httpd" name "HTTP Stream" encoder "lame" # optional, vorbis or lame - port "8001" + port "8000" quality "8.0" # do not define if bitrate is defined # bitrate "256" # do not define if quality is defined format "44100:16:1" + always_on "yes" + tags "yes" } # visualizer output diff --git a/.config/pipewire/pipewire.conf b/.config/pipewire/pipewire.conf index 7073ff8..0a871b3 100644 --- a/.config/pipewire/pipewire.conf +++ b/.config/pipewire/pipewire.conf @@ -27,9 +27,9 @@ context.properties = { ## Properties for the DSP configuration. default.clock.rate = 48000 - #default.clock.allowed-rates = [ 48000 ] + default.clock.allowed-rates = [ 44100 48000 ] default.clock.quantum = 192 - default.clock.min-quantum = 192 + default.clock.min-quantum = 1024 #default.clock.max-quantum = 2048 #default.clock.quantum-limit = 8192 #default.video.width = 640 diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 088e9ce..d41e507 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -1,8 +1,8 @@ ## MISCELLANEOUS # various shortcuts -alias reboot='doas reboot' -alias poweroff='doas shutdown -hP now' +alias reboot='sudo reboot' +alias poweroff='sudo shutdown -hP now' alias refresh='. $ZDOTDIR/.zshrc' alias mutt='cd ~/.config/mutt/attachments; mutt; cd -' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' @@ -10,7 +10,7 @@ alias emd='/usr/bin/emacs --daemon &' alias emc='emacsclient -c -a "emacs"' alias z='zathura' alias nnn='nnn -Hde' -alias cn='clear;neofetch' +alias cl='clear;fastfetch' alias ea='$EDITOR ~/.config/shell/aliasrc' alias ez='$EDITOR ~/.config/zsh/.zshrc' alias ep='$EDITOR ~/.config/shell/profile' @@ -26,6 +26,9 @@ alias clang='clang -march=native -O3 -flto=thin' # rename files in cwd in their current order to 4-digit numbers alias ofn='/bin/ls | cat -n | while read n f; do rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' +# restart pipewire after hibernation bug +alias pw-restart='pkill pipewire && sleep 3s && setsid pipewire &>/dev/null' + # set preferred keyboard options alias setkeys='xset r rate 250 30 && setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps"' alias setus='setxkbmap -layout us -option "ctrl:nocaps"' @@ -58,6 +61,8 @@ alias lc='ls | wc -l' # control audio alias headset='wpctl set-default "$(wpctl status | grep Headphones | cut -b11-12)"' alias speakers='wpctl set-default "$(wpctl status | grep Speakers | cut -b11-12)"' +alias getvol='wpctl get-volume @DEFAULT_SINK@' +alias setvol='wpctl set-volume @DEFAULT_SINK@' ## FUNCTIONS FOR CONVERTING DATE TO ISO 8601 @@ -113,11 +118,11 @@ alias qb='equery b' alias qy='equery y' alias eli='eix -c --installed' alias els='eix -c --selected' -alias esync='doas emaint sync' +alias esync='sudo emaint sync' alias pemup='emerge -pvuND @world' -alias emup='doas emerge -vuND @world' +alias emup='sudo emerge -vuND @world' alias pemin='emerge -pv' -alias emin='doas emerge -v' +alias emin='sudo emerge -v' alias pemrm='emerge -pvc' -alias emrm='doas emerge -vc' +alias emrm='sudo emerge -vc' alias emsr='emerge -s' diff --git a/.config/shell/profile b/.config/shell/profile index d0567e6..4d94449 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -30,4 +30,4 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib64/pkgconfig" export INFOPATH="$INFOPATH:/usr/local/share/info" export MANPATH="$MANPATH:/usr/local/man" -export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:$HOME/.npm/bin:/sbin:/usr/sbin" +export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:$HOME/.npm/bin:/sbin:/usr/sbin:$HOME/go/bin" diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index e2f9959..af55944 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -52,23 +52,23 @@ bind -n M-l resize-pane -R 5 # Smart pane switching with awareness of Vim splits. # See: https://github.com/christoomey/vim-tmux-navigator -is_vim="ps -o state= -o comm= -t '#{pane_tty}' \ - | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|l?n?vim?x?)(diff)?$'" -bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L' -bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D' -bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U' -bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R' -tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")' -if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \ - "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'" -if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \ - "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'" +# is_vim="ps -o state= -o comm= -t '#{pane_tty}' \ +# | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|l?n?vim?x?)(diff)?$'" +# bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L' +# bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D' +# bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U' +# bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R' +# tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")' +# if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \ +# "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'" +# if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \ +# "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'" -bind-key -T copy-mode-vi 'C-H' select-pane -L -bind-key -T copy-mode-vi 'C-J' select-pane -D -bind-key -T copy-mode-vi 'C-K' select-pane -U -bind-key -T copy-mode-vi 'C-L' select-pane -R -bind-key -T copy-mode-vi 'C-\' select-pane -l +# bind-key -T copy-mode-vi 'C-H' select-pane -L +# bind-key -T copy-mode-vi 'C-J' select-pane -D +# bind-key -T copy-mode-vi 'C-K' select-pane -U +# bind-key -T copy-mode-vi 'C-L' select-pane -R +# bind-key -T copy-mode-vi 'C-\' select-pane -l bind C-l send-keys 'C-l' bind C-k send-keys 'C-k' |
