summaryrefslogtreecommitdiff
path: root/.config
diff options
context:
space:
mode:
Diffstat (limited to '.config')
-rw-r--r--.config/i3/config3
-rw-r--r--.config/i3status/config4
-rw-r--r--.config/ncmpcpp/bindings543
-rw-r--r--.config/ncmpcpp/config41
-rwxr-xr-x.config/nnn/nnn.bash2
-rw-r--r--.config/shell/aliasrc22
-rw-r--r--.config/shell/profile3
-rw-r--r--.config/tmux/tmux.conf4
-rw-r--r--.config/wireplumber/main.lua.d/51-camera-microphone-input-rename.lua13
-rw-r--r--.config/wireplumber/main.lua.d/51-soundblaster-output-rename.lua14
-rw-r--r--.config/wireplumber/main.lua.d/51-starshipmatisse-output-rename.lua14
-rw-r--r--.config/wireplumber/main.lua.d/52-hdmi-card-disable.lua12
-rw-r--r--.config/wireplumber/main.lua.d/52-soundblaster-input-disable.lua12
-rw-r--r--.config/wireplumber/main.lua.d/52-starshipmatisse-input-disable.lua12
-rw-r--r--.config/wireplumber/wireplumber.conf.d/51-camera-microphone-input-rename.conf15
-rw-r--r--.config/wireplumber/wireplumber.conf.d/51-soundblaster-output-rename.conf16
-rw-r--r--.config/wireplumber/wireplumber.conf.d/51-starshipmatisse-output-rename.conf18
-rw-r--r--.config/wireplumber/wireplumber.conf.d/52-hdmi-card-disable.conf16
-rw-r--r--.config/wireplumber/wireplumber.conf.d/52-soundblaster-input-disable.conf15
-rw-r--r--.config/wireplumber/wireplumber.conf.d/52-starshipmatisse-input-disable.conf15
-rw-r--r--.config/x11/xinitrc4
-rw-r--r--.config/zsh/.zshrc6
22 files changed, 704 insertions, 100 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/.config/ncmpcpp/bindings b/.config/ncmpcpp/bindings
new file mode 100644
index 0000000..6962dea
--- /dev/null
+++ b/.config/ncmpcpp/bindings
@@ -0,0 +1,543 @@
+##############################################################
+## This is the example bindings file. Copy it to ##
+## ~/.ncmpcpp/bindings or $XDG_CONFIG_HOME/ncmpcpp/bindings ##
+## and set up your preferences ##
+##############################################################
+##
+##### General rules #####
+##
+## 1) Because each action has runtime checks whether it's
+## ok to run it, a few actions can be bound to one key.
+## Actions will be bound in order given in configuration
+## file. When a key is pressed, first action in order
+## will test itself whether it's possible to run it. If
+## test succeeds, action is executed and other actions
+## bound to this key are ignored. If it doesn't, next
+## action in order tests itself etc.
+##
+## 2) It's possible to bind more that one action at once
+## to a key. It can be done using the following syntax:
+##
+## def_key "key"
+## action1
+## action2
+## ...
+##
+## This creates a chain of actions. When such chain is
+## executed, each action in chain is run until the end of
+## chain is reached or one of its actions fails to execute
+## due to its requirements not being met. If multiple actions
+## and/or chains are bound to the same key, they will be
+## consecutively run until one of them gets fully executed.
+##
+## 3) When ncmpcpp starts, bindings configuration file is
+## parsed and then ncmpcpp provides "missing pieces"
+## of default keybindings. If you want to disable some
+## bindings, there is a special action called 'dummy'
+## for that purpose. Eg. if you want to disable ability
+## to crop playlists, you need to put the following
+## into configuration file:
+##
+## def_key "C"
+## dummy
+##
+## After that ncmpcpp will not bind any default action
+## to this key.
+##
+## 4) To let you write simple macros, the following special
+## actions are provided:
+##
+## - push_character "character" - pushes given special
+## character into input queue, so it will be immediately
+## picked by ncmpcpp upon next call to readKey function.
+## Accepted values: mouse, up, down, page_up, page_down,
+## home, end, space, enter, insert, delete, left, right,
+## tab, ctrl-a, ctrl-b, ..., ctrl-z, ctrl-[, ctrl-\\,
+## ctrl-], ctrl-^, ctrl-_, f1, f2, ..., f12, backspace.
+## In addition, most of these names can be prefixed with
+## alt-/ctrl-/shift- to be recognized with the appropriate
+## modifier key(s).
+##
+## - push_characters "string" - pushes given string into
+## input queue.
+##
+## - require_runnable "action" - checks whether given action
+## is runnable and fails if it isn't. This is especially
+## useful when mixed with previous two functions. Consider
+## the following macro definition:
+##
+## def_key "key"
+## push_characters "custom_filter"
+## apply_filter
+##
+## If apply_filter can't be currently run, we end up with
+## sequence of characters in input queue which will be
+## treated just as we typed them. This may lead to unexpected
+## results (in this case 'c' will most likely clear current
+## playlist, 'u' will trigger database update, 's' will stop
+## playback etc.). To prevent such thing from happening, we
+## need to change above definition to this one:
+##
+## def_key "key"
+## require_runnable "apply_filter"
+## push_characters "custom_filter"
+## apply_filter
+##
+## Here, first we test whether apply_filter can be actually run
+## before we stuff characters into input queue, so if condition
+## is not met, whole chain is aborted and we're fine.
+##
+## - require_screen "screen" - checks whether given screen is
+## currently active. accepted values: browser, clock, help,
+## media_library, outputs, playlist, playlist_editor,
+## search_engine, tag_editor, visualizer, last_fm, lyrics,
+## selected_items_adder, server_info, song_info,
+## sort_playlist_dialog, tiny_tag_editor.
+##
+## - run_external_command "command" - runs given command using
+## system() function.
+##
+## 5) In addition to binding to a key, you can also bind actions
+## or chains of actions to a command. If it comes to commands,
+## syntax is very similar to defining keys. Here goes example
+## definition of a command:
+##
+## def_command "quit" [deferred]
+## stop
+## quit
+##
+## If you execute the above command (which can be done by
+## invoking action execute_command, typing 'quit' and pressing
+## enter), ncmpcpp will stop the player and then quit. Note the
+## presence of word 'deferred' enclosed in square brackets. It
+## tells ncmpcpp to wait for confirmation (ie. pressing enter)
+## after you typed quit. Instead of 'deferred', 'immediate'
+## could be used. Then ncmpcpp will not wait for confirmation
+## (enter) and will execute the command the moment it sees it.
+##
+## Note: while command chains are executed, internal environment
+## update (which includes current window refresh and mpd status
+## update) is not performed for performance reasons. However, it
+## may be desirable to do so in some situration. Therefore it's
+## possible to invoke by hand by performing 'update enviroment'
+## action.
+##
+## Note: There is a difference between:
+##
+## def_key "key"
+## action1
+##
+## def_key "key"
+## action2
+##
+## and
+##
+## def_key "key"
+## action1
+## action2
+##
+## First one binds two single actions to the same key whilst
+## second one defines a chain of actions. The behavior of
+## these two is different and is described in (1) and (2).
+##
+## Note: Function def_key accepts non-ascii characters.
+##
+##### List of unbound actions #####
+##
+## The following actions are not bound to any key/command:
+##
+## - set_volume
+##
+#
+#def_key "mouse"
+# mouse_event
+#
+def_key "k"
+ scroll_up
+
+#def_key "shift-up"
+# select_item
+# scroll_up
+#
+def_key "j"
+ scroll_down
+
+#def_key "shift-down"
+# select_item
+# scroll_down
+#
+#def_key "["
+# scroll_up_album
+#
+#def_key "]"
+# scroll_down_album
+#
+#def_key "{"
+# scroll_up_artist
+#
+#def_key "}"
+# scroll_down_artist
+#
+def_key "u"
+ page_up
+
+def_key "d"
+ page_down
+
+#def_key "home"
+# move_home
+#
+#def_key "end"
+# move_end
+#
+#def_key "insert"
+# select_item
+#
+#def_key "enter"
+# enter_directory
+#
+#def_key "enter"
+# toggle_output
+#
+#def_key "enter"
+# run_action
+#
+#def_key "enter"
+# play_item
+#
+#def_key "space"
+# add_item_to_playlist
+#
+#def_key "space"
+# toggle_lyrics_update_on_song_change
+#
+#def_key "space"
+# toggle_visualization_type
+#
+#def_key "delete"
+# delete_playlist_items
+#
+#def_key "delete"
+# delete_browser_items
+#
+#def_key "delete"
+# delete_stored_playlist
+#
+#def_key "right"
+# next_column
+#
+#def_key "right"
+# slave_screen
+#
+#def_key "right"
+# volume_up
+#
+#def_key "+"
+# volume_up
+#
+#def_key "left"
+# previous_column
+#
+#def_key "left"
+# master_screen
+#
+#def_key "left"
+# volume_down
+#
+#def_key "-"
+# volume_down
+#
+#def_key ":"
+# execute_command
+#
+#def_key "tab"
+# next_screen
+#
+#def_key "shift-tab"
+# previous_screen
+#
+#def_key "f1"
+# show_help
+#
+#def_key "1"
+# show_playlist
+#
+#def_key "2"
+# show_browser
+#
+#def_key "2"
+# change_browse_mode
+#
+#def_key "3"
+# show_search_engine
+#
+#def_key "3"
+# reset_search_engine
+#
+#def_key "4"
+# show_media_library
+#
+#def_key "4"
+# toggle_media_library_columns_mode
+#
+#def_key "5"
+# show_playlist_editor
+#
+#def_key "6"
+# show_tag_editor
+#
+#def_key "7"
+# show_outputs
+#
+#def_key "8"
+# show_visualizer
+#
+#def_key "="
+# show_clock
+#
+#def_key "@"
+# show_server_info
+#
+#def_key "s"
+# stop
+#
+#def_key "p"
+# pause
+#
+#def_key ">"
+# next
+#
+#def_key "<"
+# previous
+#
+#def_key "ctrl-h"
+# jump_to_parent_directory
+#
+#def_key "ctrl-h"
+# replay_song
+#
+#def_key "backspace"
+# jump_to_parent_directory
+#
+#def_key "backspace"
+# replay_song
+#
+#def_key "f"
+# seek_forward
+#
+#def_key "b"
+# seek_backward
+#
+#def_key "r"
+# toggle_repeat
+#
+#def_key "z"
+# toggle_random
+#
+#def_key "y"
+# save_tag_changes
+#
+#def_key "y"
+# start_searching
+#
+#def_key "y"
+# toggle_single
+#
+#def_key "R"
+# toggle_consume
+#
+#def_key "Y"
+# toggle_replay_gain_mode
+#
+#def_key "T"
+# toggle_add_mode
+#
+#def_key "|"
+# toggle_mouse
+#
+#def_key "#"
+# toggle_bitrate_visibility
+#
+#def_key "Z"
+# shuffle
+#
+#def_key "x"
+# toggle_crossfade
+#
+#def_key "X"
+# set_crossfade
+#
+def_key "U"
+ update_database
+
+#def_key "ctrl-s"
+# sort_playlist
+#
+#def_key "ctrl-s"
+# toggle_browser_sort_mode
+#
+#def_key "ctrl-s"
+# toggle_media_library_sort_mode
+#
+#def_key "ctrl-r"
+# reverse_playlist
+#
+#def_key "ctrl-f"
+# apply_filter
+#
+#def_key "ctrl-_"
+# select_found_items
+#
+#def_key "/"
+# find
+#
+#def_key "/"
+# find_item_forward
+#
+#def_key "?"
+# find
+#
+#def_key "?"
+# find_item_backward
+#
+#def_key "."
+# next_found_item
+#
+#def_key ","
+# previous_found_item
+#
+#def_key "w"
+# toggle_find_mode
+#
+#def_key "e"
+# edit_song
+#
+#def_key "e"
+# edit_library_tag
+#
+#def_key "e"
+# edit_library_album
+#
+#def_key "e"
+# edit_directory_name
+#
+#def_key "e"
+# edit_playlist_name
+#
+#def_key "e"
+# edit_lyrics
+#
+#def_key "i"
+# show_song_info
+#
+#def_key "I"
+# show_artist_info
+#
+#def_key "g"
+# jump_to_position_in_song
+#
+#def_key "l"
+# show_lyrics
+#
+#def_key "ctrl-v"
+# select_range
+#
+#def_key "v"
+# reverse_selection
+#
+#def_key "V"
+# remove_selection
+#
+#def_key "B"
+# select_album
+#
+#def_key "a"
+# add_selected_items
+#
+#def_key "c"
+# clear_playlist
+#
+#def_key "c"
+# clear_main_playlist
+#
+#def_key "C"
+# crop_playlist
+#
+#def_key "C"
+# crop_main_playlist
+#
+#def_key "m"
+# move_sort_order_up
+#
+#def_key "m"
+# move_selected_items_up
+#
+#def_key "n"
+# move_sort_order_down
+#
+#def_key "n"
+# move_selected_items_down
+#
+#def_key "M"
+# move_selected_items_to
+#
+#def_key "A"
+# add
+#
+#def_key "S"
+# save_playlist
+#
+#def_key "o"
+# jump_to_playing_song
+#
+#def_key "G"
+# jump_to_browser
+#
+#def_key "G"
+# jump_to_playlist_editor
+#
+#def_key "~"
+# jump_to_media_library
+#
+#def_key "E"
+# jump_to_tag_editor
+#
+#def_key "U"
+# toggle_playing_song_centering
+#
+#def_key "P"
+# toggle_display_mode
+#
+#def_key "\\"
+# toggle_interface
+#
+#def_key "!"
+# toggle_separators_between_albums
+#
+#def_key "L"
+# toggle_lyrics_fetcher
+#
+#def_key "F"
+# fetch_lyrics_in_background
+#
+#def_key "alt-l"
+# toggle_fetching_lyrics_in_background
+#
+#def_key "ctrl-l"
+# toggle_screen_lock
+#
+#def_key "`"
+# toggle_library_tag_type
+#
+#def_key "`"
+# refetch_lyrics
+#
+#def_key "`"
+# add_random_items
+#
+#def_key "ctrl-p"
+# set_selected_items_priority
+#
+#def_key "q"
+# quit
+#
diff --git a/.config/ncmpcpp/config b/.config/ncmpcpp/config
new file mode 100644
index 0000000..11e5c71
--- /dev/null
+++ b/.config/ncmpcpp/config
@@ -0,0 +1,41 @@
+# Files
+ncmpcpp_directory = ~/.config/ncmpcpp
+lyrics_directory = ~/.config/mpd/lyrics
+
+mpd_host = localhost
+mpd_port = 6600
+mpd_music_dir = /media/hdd/music
+mpd_connection_timeout = 5
+
+# Playlist
+playlist_disable_highlight_delay = 0
+playlist_display_mode = classic
+playlist_show_remaining_time = yes
+
+browser_display_mode = columns
+autocenter_mode = yes
+follow_now_playing_lyrics = yes
+lyrics_fetchers = azlyrics, musixmatch, justsomelyrics, genius, internet
+
+# UI and colors
+external_editor = vim
+colors_enabled = yes
+current_item_prefix = $(blue)$r
+current_item_suffix = $/r$(end)
+current_item_inactive_column_prefix = $(cyan)$r
+current_item_inactive_column_suffix = $/r$(end)
+header_window_color = cyan
+main_window_color = white
+active_window_border = blue
+song_columns_list_format = (5)[blue]{l} (35)[green]{t|f:Title} (30)[magenta]{aE} (30)[yellow]{bE}
+song_list_format = {$3%n | $9}{$7%a - $9}{$5%t$9}|{$8%f$9}$R{$6 | %b$9}{$3 | %l$9}
+volume_color = red
+progressbar_color = cyan
+progressbar_elapsed_color = white
+statusbar_color = white
+user_interface = classic
+selected_item_prefix = *
+now_playing_prefix = "> "
+centered_cursor = yes
+display_bitrate = yes
+enable_window_title = yes
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