From 696c88361535f4361eaad5d157d174597d9bfa2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petar=20Kapri=C5=A1?= <kayprish@bonsai.cool>
Date: Thu, 24 Apr 2025 21:19:39 +0200
Subject: [PATCH] Merge conflicting dotfiles

---
 .config/VSCodium/User/settings.json |  2 +
 .config/mpv/input.conf              | 71 ++---------------------------
 .config/mpv/mpv.conf                |  9 +++-
 .config/user-dirs.dirs              | 17 ++++---
 .gnupg/gpg-agent.conf               |  2 +-
 5 files changed, 24 insertions(+), 77 deletions(-)

diff --git a/.config/VSCodium/User/settings.json b/.config/VSCodium/User/settings.json
index 7ed842e5..205a5662 100644
--- a/.config/VSCodium/User/settings.json
+++ b/.config/VSCodium/User/settings.json
@@ -1126,4 +1126,6 @@
   ],
   "editor.matchBrackets": "never",
   "workbench.statusBar.visible": false
+  "dart.flutterSdkPath": "/home/kappa/down/pkgs/flutter",
+  "dart.flutterCustomEmulators": []
 }
diff --git a/.config/mpv/input.conf b/.config/mpv/input.conf
index 064f76ec..74382920 100644
--- a/.config/mpv/input.conf
+++ b/.config/mpv/input.conf
@@ -1,66 +1,5 @@
-# Progress
-# 60 seconds
-CTRL+SHIFT+l seek 60
-CTRL+SHIFT+l seek -60
-CTRL+SHIFT+RIGHT seek 60
-CTRL+SHIFT+LEFT seek -60
-
-# 30 seconds
-SHIFT+l seek 30
-SHIFT+h seek -30
-SHIFT+RIGHT seek 30
-SHIFT+LEFT seek -30
-
-# 10 seconds
-CTRL+l seek 10
-CTRL+h seek -10
-CTRL+RIGHT seek 10
-CTRL+LEFT seek -10
-
-# 5 seconds
-l seek 5
-h seek -5
-RIGHT seek 5
-LEFT seek -5
-
-# 2 seconds
-ALT+l seek 2
-ALT+h seek -2
-ALT+RIGHT seek 2
-ALT+LEFT seek -2
-
-# Disables all normal mouse scrolls
-WHEEL_LEFT ignore
-WHEEL_RIGHT ignore
-
-
-# Audio
-# 100%
-CTRL+SHIFT+k add volume 100
-CTRL+SHIFT+j add volume -100
-CTRL+SHIFT+UP add volume 100
-CTRL+SHIFT+DOWN add volume -100
-
-# 50%
-SHIFT+k add volume 50
-SHIFT+j add volume -50
-SHIFT+UP add volume 50
-SHIFT+DOWN add volume -50
-
-# 25%
-CTRL+k add volume 25
-CTRL+j add volume -25
-CTRL+UP add volume 25
-CTRL+DOWN add volume -25
-
-# 10%
-k add volume 10
-j add volume -10
-UP add volume 10
-DOWN add volume -10
-
-# 5%
-ALT+k add volume 5
-ALT+j add volume -5
-ALT+UP add volume 5
-ALT+DOWN add volume -5
+n       script-binding chapters/add_chapter
+ctrl+m  script-binding chapters/remove_chapter
+ctrl+.  script-binding chapters/edit_chapter
+N       script-binding chapters/write_chapters
+ctrl+,  script-binding chapters/bake_chapters
diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf
index d22e48b8..c4a217a7 100644
--- a/.config/mpv/mpv.conf
+++ b/.config/mpv/mpv.conf
@@ -3,6 +3,7 @@
 #vo=gpu
 # Can cause performance problems with some GPU drivers and GPUs.
 #profile=gpu-hq
+gpu-context=wayland
 
 # ===== REMOVE THE ABOVE FOUR LINES AND RESAVE IF YOU ENCOUNTER PLAYBACK ISSUES AFTER =====
 
@@ -19,7 +20,7 @@ osd-color='#cad3f5'
 osd-shadow-color='#24273a'
 
 # Screenshots
-screenshot-directory='~/Imagenes/Capturas/PC'
+screenshot-directory='~'
 screenshot-template='mpv-%f-%p'
 
 # Enables best HW decoder; turn off for software decoding
@@ -55,6 +56,10 @@ profile-restore=copy-equal
 
 # Sets volume to 100%.
 volume=100
+# Sets maximum volume to 200%.
+volume-max=200
+# Audio language: German
+alang=ger
 
 # Normalizes audio
 # af-add='dynaudnorm=g=5:f=250:r=0.9:p=0.5'
@@ -79,6 +84,8 @@ deband-grain=48 # dynamic grain: set to "0" if using the static grain shader
 
 # ===== Subtitles =====
 blend-subtitles=yes
+sub-auto=fuzzy
+slang=ger
 
 # ===== Motion Interpolation =====
 override-display-fps=75
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 94beb6cc..3bea8a8a 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -5,12 +5,11 @@
 # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
 # absolute path. No other format is supported.
 # 
-XDG_DESKTOP_DIR="$HOME/desktop"
-XDG_DOCUMENTS_DIR="$HOME/documents"
-XDG_DOWNLOAD_DIR="$HOME/downloads"
-XDG_MUSIC_DIR="$HOME/music"
-XDG_PICTURES_DIR="$HOME/pictures"
-XDG_PUBLICSHARE_DIR="$HOME/"
-XDG_TEMPLATES_DIR="$HOME/"
-XDG_VIDEOS_DIR="$HOME/videos"
-XDG_GAMES_DIR="$HOME/games"
+XDG_DESKTOP_DIR="$HOME/Desktop"
+XDG_DOWNLOAD_DIR="$HOME/down"
+XDG_TEMPLATES_DIR="$HOME/Templates"
+XDG_PUBLICSHARE_DIR="$HOME/Public"
+XDG_DOCUMENTS_DIR="$HOME/docs"
+XDG_MUSIC_DIR="$HOME/Music"
+XDG_PICTURES_DIR="$HOME/media/pics"
+XDG_VIDEOS_DIR="$HOME/media/vids"
diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
index 3e8ef2ac..e6bcc68a 100644
--- a/.gnupg/gpg-agent.conf
+++ b/.gnupg/gpg-agent.conf
@@ -1,7 +1,7 @@
 default-cache-ttl 21600 # 6 hours
 max-cache-ttl 64800 # 18 hours
 
-pinentry-program /usr/bin/pinentry-gnome3
+pinentry-program /usr/bin/pinentry-qt
 
 # SSH
 enable-ssh-support