diff options
22 files changed, 121 insertions, 101 deletions
diff --git a/.config/i3/config b/.config/i3/config index b67d6a0..5c66b75 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -48,7 +48,8 @@ bindsym $mod+Shift+E exec emacsclient -c -a "emacs" bindsym $mod+z exec boomer bindsym $mod+c exec mpdmenu bindsym $mod+Shift+M exec mpdinfo -bindsym $mod+b exec bm +bindsym $mod+b exec bm -o +bindsym $mod+Control+b exec bm -y bindsym --release Print exec scrot -u -e 'mv $f ~/pics/' bindsym --release $mod+Print exec scrot -s -e 'mv $f ~/pics/' diff --git a/.config/i3status/config b/.config/i3status/config index 903d43d..6e00b11 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -31,12 +31,12 @@ ethernet tun0 { } cpu_temperature 0 { - format = "CPU Temp: %degrees °C" + format = "T: %degrees °C" path = "/sys/devices/platform/nct6775.2592/hwmon/hwmon3/temp1_input" } disk "/" { - format = "Porn Folder: %used" + format = "ssd: %used" } load { diff --git a/.ncmpcpp/bindings b/.config/ncmpcpp/bindings index 6962dea..6962dea 100644 --- a/.ncmpcpp/bindings +++ b/.config/ncmpcpp/bindings diff --git a/.ncmpcpp/config b/.config/ncmpcpp/config index a2b23af..11e5c71 100644 --- a/.ncmpcpp/config +++ b/.config/ncmpcpp/config @@ -1,5 +1,5 @@ # Files -ncmpcpp_directory = ~/.ncmpcpp +ncmpcpp_directory = ~/.config/ncmpcpp lyrics_directory = ~/.config/mpd/lyrics mpd_host = localhost diff --git a/.config/nnn/nnn.bash b/.config/nnn/nnn.bash index 966ba30..29abfb8 100755 --- a/.config/nnn/nnn.bash +++ b/.config/nnn/nnn.bash @@ -1,4 +1,4 @@ # NNN -export NNN_PLUG='t:preview-tui;b:preview-tabbed' +export NNN_PLUG='t:preview-tui' export NNN_FIFO="/tmp/nnn.fifo" diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 1385f11..8759fa6 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -4,7 +4,7 @@ alias reboot='doas reboot' alias poweroff='doas poweroff' alias refresh='. $ZDOTDIR/.zshrc' -alias mutt='cd ~/.mutt/attachments; mutt; cd -' +alias mutt='cd ~/.config/mutt/attachments; mutt; cd -' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' alias emd='/usr/bin/emacs --daemon &' alias emc='emacsclient -c -a "emacs"' @@ -23,14 +23,11 @@ alias tmn='tmux new-session -s' # compiler alias clang='clang -march=native -O3 -flto=thin' -# rename files in pwd in their current order to 4-digit numbers +# 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' -# start freyr docker image to download music from spotify -# alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev' - -# set my preferred keyboard options -alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"' +# 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"' # pad numbers in filenames with zeros @@ -49,6 +46,8 @@ alias mkd='mkdir -pv' # colorize grep output alias grep='grep --color=auto -i' +alias zgrep='zgrep --color=auto -i' +alias egrep='egrep --color=auto -i' # ls shortcuts alias ls='ls --color=always --group-directories-first' @@ -57,8 +56,8 @@ alias la='ll -A' 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 headset='wpctl set-default "$(wpctl status | grep Headphones | cut -b11-12)"' +alias speakers='wpctl set-default "$(wpctl status | grep Speakers | cut -b11-12)"' ## FUNCTIONS FOR CONVERTING DATE TO ISO 8601 @@ -82,11 +81,11 @@ date-reverse() { # convert video files to webm mkwebm() { - ffmpeg -i "${1}" -c:v libvpx-vp9 -crf 12 -b:v 1M -c:a libvorbis "${1%.*}".webm + ffmpeg -i "${1}" -c:v libvpx-vp9 -crf 32 -c:a libvorbis "${1%.*}.webm" } mkmp4() { - ffmpeg -i "${1}" -c:v libx264 -crf 32 -b:v 1M -c:a aac "${1%.*}".mp4 + ffmpeg -i "${1}" -c:v libx264 -crf 32 -c:a aac "${1%.*}.mp4" } ## GIT @@ -114,6 +113,7 @@ alias qb='equery b' alias qy='equery y' alias eli='eix -c --installed' alias els='eix -c --selected' +alias esync='doas emaint sync' alias pemup='emerge -pvuND @world' alias emup='doas emerge -vuND @world' alias pemin='emerge -pv' diff --git a/.config/shell/profile b/.config/shell/profile index 7b86bda..d0567e6 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -1,5 +1,3 @@ -umask 0077 - export _JAVA_AWT_WM_NONREPARENTING=1 export EDITOR="vim" export TERMINAL="urxvt" @@ -30,5 +28,6 @@ export LC_ALL=en_US.utf8 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" diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 389f1ff..e2f9959 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -12,10 +12,10 @@ set -g set-titles-string "#T" set -g automatic-rename off # Enable RGB colour if running in xterm(1) -set-option -sa terminal-overrides ",xterm*:Tc" +# set-option -sa terminal-overrides ",xterm*:Tc" # Change the default $TERM to tmux-256color -set -g default-terminal "tmux-256color" +# set -g default-terminal "tmux-256color" # Set history-limit set -g history-limit 30000 diff --git a/.config/wireplumber/main.lua.d/51-camera-microphone-input-rename.lua b/.config/wireplumber/main.lua.d/51-camera-microphone-input-rename.lua deleted file mode 100644 index c7db70e..0000000 --- a/.config/wireplumber/main.lua.d/51-camera-microphone-input-rename.lua +++ /dev/null @@ -1,13 +0,0 @@ -rule = { - matches = { - { - { "node.name", "equals", "alsa_input.usb-SunplusIT_Inc_FHD_Camera_Microphone_01.00.00-02.analog-stereo"}, - }, - }, - apply_properties = { - ["node.description"] = "Camera Microphone", - ["node.nick"] = "Camera Microphone", - }, -} - -table.insert(alsa_monitor.rules,rule) diff --git a/.config/wireplumber/main.lua.d/51-soundblaster-output-rename.lua b/.config/wireplumber/main.lua.d/51-soundblaster-output-rename.lua deleted file mode 100644 index cb5d4a3..0000000 --- a/.config/wireplumber/main.lua.d/51-soundblaster-output-rename.lua +++ /dev/null @@ -1,14 +0,0 @@ -rule = { - matches = { - { - { "node.name", "equals", "alsa_output.pci-0000_29_00.0.analog-stereo"}, - }, - }, - - apply_properties = { - ["node.description"] = "Headphones", - ["node.nick"] = "Headphones", - }, -} - -table.insert(alsa_monitor.rules,rule) diff --git a/.config/wireplumber/main.lua.d/51-starshipmatisse-output-rename.lua b/.config/wireplumber/main.lua.d/51-starshipmatisse-output-rename.lua deleted file mode 100644 index 0a3c278..0000000 --- a/.config/wireplumber/main.lua.d/51-starshipmatisse-output-rename.lua +++ /dev/null @@ -1,14 +0,0 @@ -rule = { - matches = { - { - { "node.name", "equals", "alsa_output.pci-0000_31_00.4.analog-stereo"}, - }, - }, - - apply_properties = { - ["node.description"] = "Speakers", - ["node.nick"] = "Speakers", - }, -} - -table.insert(alsa_monitor.rules,rule) diff --git a/.config/wireplumber/main.lua.d/52-hdmi-card-disable.lua b/.config/wireplumber/main.lua.d/52-hdmi-card-disable.lua deleted file mode 100644 index 63eb9e4..0000000 --- a/.config/wireplumber/main.lua.d/52-hdmi-card-disable.lua +++ /dev/null @@ -1,12 +0,0 @@ -rule = { - matches = { - { - { "device.name", "equals", "alsa_card.pci-0000_2f_00.1"}, - }, - }, - apply_properties = { - ["device.disabled"] = true, - }, -} - -table.insert(alsa_monitor.rules,rule) diff --git a/.config/wireplumber/main.lua.d/52-soundblaster-input-disable.lua b/.config/wireplumber/main.lua.d/52-soundblaster-input-disable.lua deleted file mode 100644 index 825c7d9..0000000 --- a/.config/wireplumber/main.lua.d/52-soundblaster-input-disable.lua +++ /dev/null @@ -1,12 +0,0 @@ -rule = { - matches = { - { - { "node.name", "equals", "alsa_input.pci-0000_29_00.0.analog-stereo"}, - }, - }, - apply_properties = { - ["node.disabled"] = true, - }, -} - -table.insert(alsa_monitor.rules,rule) diff --git a/.config/wireplumber/main.lua.d/52-starshipmatisse-input-disable.lua b/.config/wireplumber/main.lua.d/52-starshipmatisse-input-disable.lua deleted file mode 100644 index 51edd83..0000000 --- a/.config/wireplumber/main.lua.d/52-starshipmatisse-input-disable.lua +++ /dev/null @@ -1,12 +0,0 @@ -rule = { - matches = { - { - { "node.name", "equals", "alsa_input.pci-0000_31_00.4.analog-stereo"}, - }, - }, - apply_properties = { - ["node.disabled"] = true, - }, -} - -table.insert(alsa_monitor.rules,rule) diff --git a/.config/wireplumber/wireplumber.conf.d/51-camera-microphone-input-rename.conf b/.config/wireplumber/wireplumber.conf.d/51-camera-microphone-input-rename.conf new file mode 100644 index 0000000..8656458 --- /dev/null +++ b/.config/wireplumber/wireplumber.conf.d/51-camera-microphone-input-rename.conf @@ -0,0 +1,15 @@ +monitor.alsa.rules = [ + { + matches = [ + { + node.name = "alsa_input.usb-SunplusIT_Inc_FHD_Camera_Microphone_01.00.00-02.analog-stereo" + } + ] + actions = { + update-props = { + node.description = "Camera Microphone", + node.nick = "Camera Microphone" + } + } + } +] diff --git a/.config/wireplumber/wireplumber.conf.d/51-soundblaster-output-rename.conf b/.config/wireplumber/wireplumber.conf.d/51-soundblaster-output-rename.conf new file mode 100644 index 0000000..75dd728 --- /dev/null +++ b/.config/wireplumber/wireplumber.conf.d/51-soundblaster-output-rename.conf @@ -0,0 +1,16 @@ +monitor.alsa.rules = [ + { + matches = [ + { + node.name = "alsa_output.pci-0000_29_00.0.analog-stereo" + } + ] + actions = { + update-props = { + node.description = "Headphones", + node.nick = "Headphones" + } + } + } +] + diff --git a/.config/wireplumber/wireplumber.conf.d/51-starshipmatisse-output-rename.conf b/.config/wireplumber/wireplumber.conf.d/51-starshipmatisse-output-rename.conf new file mode 100644 index 0000000..a6c6697 --- /dev/null +++ b/.config/wireplumber/wireplumber.conf.d/51-starshipmatisse-output-rename.conf @@ -0,0 +1,18 @@ +monitor.alsa.rules = [ + { + matches = [ + { + node.name = "alsa_output.pci-0000_31_00.4.iec958-stereo" + } + ] + + actions = { + update-props = { + node.description = "Speakers", + node.nick = "Speakers" + } + } + } +] + + diff --git a/.config/wireplumber/wireplumber.conf.d/52-hdmi-card-disable.conf b/.config/wireplumber/wireplumber.conf.d/52-hdmi-card-disable.conf new file mode 100644 index 0000000..6f038d2 --- /dev/null +++ b/.config/wireplumber/wireplumber.conf.d/52-hdmi-card-disable.conf @@ -0,0 +1,16 @@ +monitor.alsa.rules = [ + { + matches = [ + { + device.name = "alsa_card.pci-0000_2f_00.1" + } + ] + actions = { + update-props = { + device.disabled = true + } + } + } +] + + diff --git a/.config/wireplumber/wireplumber.conf.d/52-soundblaster-input-disable.conf b/.config/wireplumber/wireplumber.conf.d/52-soundblaster-input-disable.conf new file mode 100644 index 0000000..b36545c --- /dev/null +++ b/.config/wireplumber/wireplumber.conf.d/52-soundblaster-input-disable.conf @@ -0,0 +1,15 @@ +monitor.alsa.rules = [ + { + matches = [ + { + node.name = "alsa_input.pci-0000_29_00.0.analog-stereo" + } + ] + actions = { + update-props = { + node.disabled = true + } + } + } +] + diff --git a/.config/wireplumber/wireplumber.conf.d/52-starshipmatisse-input-disable.conf b/.config/wireplumber/wireplumber.conf.d/52-starshipmatisse-input-disable.conf new file mode 100644 index 0000000..86cdd32 --- /dev/null +++ b/.config/wireplumber/wireplumber.conf.d/52-starshipmatisse-input-disable.conf @@ -0,0 +1,15 @@ +monitor.alsa.rules = [ + { + matches = [ + { + node.name = "alsa_input.pci-0000_31_00.4.analog-stereo" + } + ] + actions = { + update-props = { + node.disabled = true + } + } + } +] + diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 091a42d..9f257ed 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -9,8 +9,8 @@ eval "$(ssh-agent)" xrandr --addmode HDMI-A-0 1280x960 xrandr --output HDMI-A-0 --mode 1280x960 --primary -xrandr --output DisplayPort-1 --mode 1920x1080 --right-of HDMI-A-0 -xrandr --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 +xrandr --output DisplayPort-1 --mode 1920x1080 --left-of HDMI-A-0 +# xrandr --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 xset r rate 250 30 xset s off -dpms diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 6a5661f..8271c67 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -1,3 +1,5 @@ +umask 0077 + autoload -U colors && colors stty stop undef @@ -64,8 +66,8 @@ export FZF_DEFAULT_OPS="--extended" export FZF_DEFAULT_COMMAND="find -type f" export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" -if [ -f $HOME/.fzf/fzf.zsh ]; then - . $HOME/.fzf/fzf.zsh +if [ -f $HOME/.local/src/fzf/fzf.zsh ]; then + . $HOME/.local/src/fzf/fzf.zsh fi # NNN |