aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-09-01 10:15:30 +0200
committerLoek Le Blansch <loek@pipeframe.xyz>2024-09-01 10:15:30 +0200
commitedf92699e07a00324a7cf06f27eb1350db658df7 (patch)
treed651680a6e996f4eee7afae2b63b970e579ac687
parentd0a498a80b8cf634ecc69f049111fb1108282b1d (diff)
various updates
- fcitx5 update (adds config keys, translated comments for some reason) - firefox userChrome + user.js tweaks - mbsyncrc SSLType -> TLSType - copy-subs update - vimrc update (hexokinase, small tweaks) - picom shadow exclude tweaks for firefox - remove whoami module from polybar - ccpreview tweaks - panic script does more now
-rw-r--r--.config/fcitx5/conf/notifications.conf2
-rw-r--r--.config/fcitx5/config60
-rw-r--r--.config/firefox/chrome/userChrome.css4
-rw-r--r--.config/firefox/user.js6
-rw-r--r--.config/mbsyncrc2
-rw-r--r--.config/mpv/scripts/copy-subs.lua1
-rw-r--r--.config/nvim/init.vim15
-rw-r--r--.config/picom.conf##template3
-rw-r--r--.config/polybar/config.ini##template10
-rwxr-xr-x.local/share/bin/ccpreview46
-rwxr-xr-x.local/share/bin/panic22
11 files changed, 94 insertions, 77 deletions
diff --git a/.config/fcitx5/conf/notifications.conf b/.config/fcitx5/conf/notifications.conf
index 6e7d1b9..32460db 100644
--- a/.config/fcitx5/conf/notifications.conf
+++ b/.config/fcitx5/conf/notifications.conf
@@ -1,3 +1,3 @@
-# Hidden Notifications
+# 隠す通知
HiddenNotifications=
diff --git a/.config/fcitx5/config b/.config/fcitx5/config
index c178a55..3ae8195 100644
--- a/.config/fcitx5/config
+++ b/.config/fcitx5/config
@@ -1,29 +1,29 @@
[Hotkey]
-# Trigger Input Method
+# 入力メソッドの切り替え
TriggerKeys=
-# Enumerate when press trigger key repeatedly
+# トリガーキーを押すたびに切り替える
EnumerateWithTriggerKeys=True
-# Temporally switch between first and current Input Method
+# 一時的に第1入力メソッドに切り替える
AltTriggerKeys=
-# Enumerate Input Method Forward
+# 次の入力メソッドに切り替える
EnumerateForwardKeys=
-# Enumerate Input Method Backward
+# 前の入力メソッドに切り替える
EnumerateBackwardKeys=
-# Skip first input method while enumerating
+# 切り替え時は第1入力メソッドをスキップする
EnumerateSkipFirst=False
-# Enumerate Input Method Group Forward
+# 次の入力メソッドグループに切り替える
EnumerateGroupForwardKeys=
-# Enumerate Input Method Group Backward
+# 前の入力メソッドグループに切り替える
EnumerateGroupBackwardKeys=
-# Activate Input Method
+# 入力メソッドを有効にする
ActivateKeys=
-# Deactivate Input Method
+# 入力メソッドをオフにする
DeactivateKeys=
-# Default Previous page
+# デフォルトの前ページ
PrevPage=
-# Default Next page
+# デフォルトの次ページ
NextPage=
-# Toggle embedded preedit
+# 埋め込みプリエディットの切り替え
TogglePreedit=
[Hotkey/PrevCandidate]
@@ -33,35 +33,41 @@ TogglePreedit=
0=Tab
[Behavior]
-# Active By Default
+# デフォルトで有効にする
ActiveByDefault=False
-# Share Input State
+# フォーカス時に状態をリセット
+resetStateWhenFocusIn=No
+# 入力状態を共有する
ShareInputState=All
-# Show preedit in application
+# アプリケーションにプリエディットを表示する
PreeditEnabledByDefault=True
-# Show Input Method Information when switch input method
+# 入力メソッドを切り替える際に入力メソッドの情報を表示する
ShowInputMethodInformation=False
-# Show Input Method Information when changing focus
+# フォーカスを変更する際に入力メソッドの情報を表示する
showInputMethodInformationWhenFocusIn=False
-# Show compact input method information
+# 入力メソッドの情報をコンパクトに表示する
CompactInputMethodInformation=True
-# Show first input method information
+# 第1入力メソッドの情報を表示する
ShowFirstInputMethodInformation=False
-# Default page size
+# デフォルトのページサイズ
DefaultPageSize=5
-# Override Xkb Option
+# XKB オプションより優先する
OverrideXkbOption=False
-# Custom Xkb Option
+# カスタム XKB オプション
CustomXkbOption=
# Force Enabled Addons
EnabledAddons=
# Preload input method to be used by default
PreloadInputMethod=True
+# パスワード欄に入力メソッドを許可する
+AllowInputMethodForPassword=False
+# パスワード入力時にプリエディットテキストを表示する
+ShowPreeditForPassword=False
+# ユーザーデータを保存する間隔(分)
+AutoSavePeriod=30
[Behavior/DisabledAddons]
0=kimpanel
-1=notificationitem
-2=notifications
-3=wayland
-4=waylandim
+1=wayland
+2=waylandim
diff --git a/.config/firefox/chrome/userChrome.css b/.config/firefox/chrome/userChrome.css
index dcf28fe..233a1ba 100644
--- a/.config/firefox/chrome/userChrome.css
+++ b/.config/firefox/chrome/userChrome.css
@@ -1,7 +1,9 @@
/* hide shit */
#alltabs-button,
#appMenu-fxa-status2,
-#appMenu-fxa-separator
+#appMenu-fxa-separator,
+#fullscreen-warning,
+.findbar-highlight
{ display: none !important; }
/* undo shit */
diff --git a/.config/firefox/user.js b/.config/firefox/user.js
index 3644cb8..778631e 100644
--- a/.config/firefox/user.js
+++ b/.config/firefox/user.js
@@ -15,14 +15,12 @@ user_pref("dom.security.https_only_mode_ever_enabled", true);
// smooth scrolling
user_pref("general.smoothScroll", true);
-user_pref("mousewheel.default.delta_multiplier_y", 85);
user_pref("general.smoothScroll.msdPhysics.enabled", true);
user_pref("general.smoothScroll.msdPhysics.continuousMotionMaxDeltaMS", 12);
-user_pref("general.smoothScroll.msdPhysics.motionBeginSpringConstant", 800);
-user_pref("general.smoothScroll.msdPhysics.regularSpringConstant", 800);
user_pref("general.smoothScroll.msdPhysics.slowdownMinDeltaMS", 25);
+user_pref("general.smoothScroll.msdPhysics.motionBeginSpringConstant", 1800);
user_pref("general.smoothScroll.msdPhysics.slowdownMinDeltaRatio", "2");
-user_pref("general.smoothScroll.msdPhysics.slowdownSpringConstant", 40);
+user_pref("general.smoothScroll.msdPhysics.slowdownSpringConstant", 60);
user_pref("general.smoothScroll.currentVelocityWeighting", "1");
user_pref("general.smoothScroll.stopDecelerationWeighting", "1");
diff --git a/.config/mbsyncrc b/.config/mbsyncrc
index b591f04..bc3bedf 100644
--- a/.config/mbsyncrc
+++ b/.config/mbsyncrc
@@ -3,7 +3,7 @@ Host mail.pipeframe.xyz
Port 993
User loek@mail.pipeframe.xyz
PassCmd "pass srv/wipper/passwd/loek"
-SSLType IMAPS
+TLSType IMAPS
CertificateFile /etc/ssl/certs/ca-certificates.crt
IMAPStore pipeframe-remote
diff --git a/.config/mpv/scripts/copy-subs.lua b/.config/mpv/scripts/copy-subs.lua
index 3b8d15f..973e1f2 100644
--- a/.config/mpv/scripts/copy-subs.lua
+++ b/.config/mpv/scripts/copy-subs.lua
@@ -7,6 +7,7 @@ function copy()
sub = sub:gsub('\u{27a1}', '')
sub = sub:gsub('\u{fffd}', '')
sub = sub:gsub('\u{3013}', '')
+ sub = sub:gsub('\u{2015}', '')
sub = sub:gsub('\n', ' ') -- replace newlines with space
sub = sub:gsub('\'', '\'\\\'\'') -- escape single quotes
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 5396755..fd1d949 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -104,8 +104,8 @@ nnoremap tt :tabnew<CR>
nmap <CR> o<Esc>
nmap <leader>qf <Plug>(coc-fix-current)
-nnoremap <A-j> :m +1<CR>
-nnoremap <A-k> :m -2<CR>
+nnoremap <silent> <A-j> :m +1<CR>
+nnoremap <silent> <A-k> :m -2<CR>
imap <C-h> <Left>
imap <C-j> <Down>
@@ -194,15 +194,10 @@ cnoreabbrev W w
cnoreabbrev sudow w !sudo tee %
" hexokinase
-let g:Hexokinase_optInPatterns = [
- \ 'full_hex',
- \ 'triple_hex',
- \ 'rgb',
- \ 'rgba',
- \ 'hsl',
- \ 'hsla'
- \ ]
+let g:Hexokinase_termDisabled = 1
+let g:Hexokinase_optOutPatterns = [ 'colour_names' ]
+" lightline
let g:lightline = {
\ 'colorscheme': 'auto',
\ 'mode_map': {
diff --git a/.config/picom.conf##template b/.config/picom.conf##template
index dee049a..ad88349 100644
--- a/.config/picom.conf##template
+++ b/.config/picom.conf##template
@@ -24,7 +24,8 @@ fade-delta = 16;
shadow-exclude = [
"!I3_FLOATING_WINDOW@:c && class_g != 'st' && _NET_WM_WINDOW_TYPE@:32a *= '_NET_WM_WINDOW_TYPE_NORMAL'",
"!I3_FLOATING_WINDOW@:c && WM_CLASS@:s = 'st'",
- "_NET_WM_WINDOW_TYPE@:32a *= '_NET_WM_WINDOW_TYPE_MENU' && override_redirect = true"
+ "_NET_WM_WINDOW_TYPE@:32a *= '_NET_WM_WINDOW_TYPE_MENU' && override_redirect = true",
+ "WM_CLASS@:s = 'Firefox' && WM_WINDOW_ROLE@:s = 'Popup'"
]
rounded-corners-exclude = [
diff --git a/.config/polybar/config.ini##template b/.config/polybar/config.ini##template
index 4ea2076..7a1cd89 100644
--- a/.config/polybar/config.ini##template
+++ b/.config/polybar/config.ini##template
@@ -46,11 +46,11 @@ font-4 = "Noto Sans KR:pixelsize=8:weight=medium:size=0;2"
{% if yadm.hostname == "thoncc" %}
modules-left = time date cal mpd
modules-center = battery1 battery2 brightness
-modules-right = wireless keyboard volume whoami
+modules-right = wireless keyboard volume
{% else %}
modules-left = time date cal
modules-center = mpd
-modules-right = dppt wacomtouch keyboard volume whoami
+modules-right = dppt wacomtouch keyboard volume
{% endif %}
separator =
@@ -115,12 +115,6 @@ format = <label>
label = %time%
label-font = 2
-[module/whoami]
-type = custom/script
-exec = echo "%{T2}$(id -u -n)%{T-}@%{T2}$(uname -n)%{T-}"
-interval = 9999999
-label-font = 2
-
[module/dppt]
type = custom/script
exec = dppt polybar
diff --git a/.local/share/bin/ccpreview b/.local/share/bin/ccpreview
index d0f8525..98843a4 100755
--- a/.local/share/bin/ccpreview
+++ b/.local/share/bin/ccpreview
@@ -3,40 +3,46 @@
caffeine
PCI_ADDRESS="0000:00:14.0"
-USB_BUS_NUM="2"
+# USB_BUS_NUM="11"
+USB_BUS_NUM="12"
VIDEO_DEVICE="/dev/v4l/by-path/pci-$PCI_ADDRESS-usb-0:$USB_BUS_NUM:1.0-video-index0"
+AUDIO_DEVICE="alsa:usbstream=CARD=MS2109"
WIDTH="$1"
HEIGHT="$2"
FRAMERATE="$3"
RESOLUTION="${WIDTH}x${HEIGHT}"
DEVICE="$(readlink -f "$VIDEO_DEVICE")"
-DEVICE_INDEX="$(grep "usb-$PCI_ADDRESS-$USB_BUS_NUM" /proc/asound/card*/usbmixer | cut -d: -f1 | tr -cd '[:digit:]')"
-DEFAULT_SINK_ALIAS="$(pw-metadata 0 default.audio.sink | grep -Po "value:'(.*?)'" | head -c-2 | cut -c8- | jq --raw-output .name)"
-CAPTURE_FL="alsa:pcm:$DEVICE_INDEX:front:$DEVICE_INDEX:capture:capture_0"
-CAPTURE_FR="alsa:pcm:$DEVICE_INDEX:front:$DEVICE_INDEX:capture:capture_1"
-OUTPUT_FL="$DEFAULT_SINK_ALIAS:playback_0"
-OUTPUT_FR="$DEFAULT_SINK_ALIAS:playback_1"
+# DEVICE_INDEX="$(grep "usb-$PCI_ADDRESS-$USB_BUS_NUM" /proc/asound/card*/usbmixer | cut -d: -f1 | tr -cd '[:digit:]')"
+# DEFAULT_SINK_ALIAS="$(pw-metadata 0 default.audio.sink | grep -Po "value:'(.*?)'" | head -c-2 | cut -c8- | jq --raw-output .name)"
-echo "link $CAPTURE_FR -> $OUTPUT_FR"
-echo "link $CAPTURE_FL -> $OUTPUT_FL"
+# CAPTURE_FL="alsa:pcm:$DEVICE_INDEX:front:$DEVICE_INDEX:capture:capture_0"
+# CAPTURE_FR="alsa:pcm:$DEVICE_INDEX:front:$DEVICE_INDEX:capture:capture_1"
+# OUTPUT_FL="$DEFAULT_SINK_ALIAS:playback_0"
+# OUTPUT_FR="$DEFAULT_SINK_ALIAS:playback_1"
-pw-link "$CAPTURE_FL" "$OUTPUT_FL"
-pw-link "$CAPTURE_FR" "$OUTPUT_FR"
+# echo "link $CAPTURE_FR -> $OUTPUT_FR"
+# echo "link $CAPTURE_FL -> $OUTPUT_FL"
+
+# pw-link "$CAPTURE_FL" "$OUTPUT_FL"
+# pw-link "$CAPTURE_FR" "$OUTPUT_FR"
v4l2-ctl -d "$DEVICE" --set-parm "$FRAMERATE"
v4l2-ctl -d "$DEVICE" --set-fmt-video "width=$WIDTH,height=$HEIGHT,pixelformat=MJPG"
v4l2-ctl -d "$DEVICE" --set-ctrl "brightness=0,contrast=128,saturation=128,hue=0"
-mpv --demuxer-lavf-format=video4linux2 \
- --demuxer-lavf-o-set=input_format=mjpeg,framerate="$FRAMERATE",resolution="$RESOLUTION" \
- --cache=no \
- --pause=no \
- --force-seekable=no \
- --no-osc \
- --no-input-default-bindings \
+mpv \
+ --no-config \
+ --input-conf=/dev/null --profile=low-latency --untimed --no-correct-pts \
+ --no-osc --no-input-default-bindings --cache=no --pause=no --force-seekable=no \
+ --demuxer-lavf-format=video4linux2 \
+ --demuxer-lavf-o-set=input_format=mjpeg,framerate="$FRAMERATE",resolution="$RESOLUTION",rw_timeout=30000000 \
+ --demuxer-thread=yes \
"av://v4l2:$DEVICE"
+# --audio-samplerate=48000 --audio-channels=stereo --audio-file="av://$AUDIO_DEVICE" \
+# --lavfi-complex="[aid1] amix [ao]; [v] [ao] concat=n=1:v=1:a=1 [vo] [ao]" \
+
+# pw-link -d "$CAPTURE_FL" "$OUTPUT_FL"
+# pw-link -d "$CAPTURE_FR" "$OUTPUT_FR"
-pw-link -d "$CAPTURE_FL" "$OUTPUT_FL"
-pw-link -d "$CAPTURE_FR" "$OUTPUT_FR"
diff --git a/.local/share/bin/panic b/.local/share/bin/panic
index e2451a6..1fa978b 100755
--- a/.local/share/bin/panic
+++ b/.local/share/bin/panic
@@ -1,5 +1,19 @@
#!/bin/sh
-i3-msg focus output primary > /dev/null
-i3-msg workspace 'panic1' > /dev/null
-i3-msg focus output right > /dev/null
-i3-msg workspace 'panic2' > /dev/null
+silent() {
+ "$@" 1>/dev/null 2> /dev/null &
+}
+
+# clear desktop
+silent i3-msg focus output primary
+silent i3-msg workspace 'panic1'
+silent i3-msg focus output right
+silent i3-msg workspace 'panic2'
+
+# stop playing media (if any)
+silent mpc pause
+silent playerctl -a pause
+
+# mute mic/headphones
+silent pactl set-sink-mute @DEFAULT_SINK@ true
+silent pactl set-source-mute @DEFAULT_SOURCE@ true
+