Update configs

config/mpv/input.conf

@@ -2,5 +2,5 @@
 0 add ao-volume 2
 9 add ao-volume -2
 m cycle ao-mute
-
+k seek 85
 

config/nvim/init.vim

@@ -32,6 +32,8 @@ Plug 'junegunn/fzf'
 
 Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
 
+Plug 'nfnty/vim-nftables'
+
 call plug#end()
 
 " User interface

config/pulse/daemon.conf

@@ -76,7 +76,8 @@ flat-volumes = no
 ; rlimit-rtprio = 9
 ; rlimit-rttime = 200000
 
-default-sample-format = s32le
+;default-sample-format = float32le
+default-sample-format = s16
 default-sample-rate = 48000
 ; alternate-sample-rate = 48000
 default-sample-channels = 2

config/youtube-dl/config

@@ -20,7 +20,7 @@
 # 247 VP9 720p
 # 244 VP9 480p
 #--format "(336/308/271/335/303/248/334/302/247/244)+(251/250/140/249)/best"
---format '(bestvideo[vcodec=vp9]/bestvideo)+(bestaudio[acodec=opus]/bestaudio)/best'
+--format '(bestvideo[vcodec^=avc1]/bestvideo)+(bestaudio[acodec=opus]/bestaudio)/best[vcodec^=avc1]/best'
 # Keep record of already downloaded files in a folder
 --download-archive ".youtube-dl"
 # Post-Processing

dotfiles/XCompose

@@ -4,6 +4,8 @@
 
 # Part 1 - Manual definitions
 
+<Multi_key> <parenleft> <plus> <parenright> : "⊕" U2295 # CIRCLED PLUS
+
 # Spacing versions of dead accents
 <dead_tilde> <space>             	: "~"   asciitilde # TILDE
 <dead_tilde> <dead_tilde>        	: "~"   asciitilde # TILDE

dotfiles/makepkg.conf

@@ -8,15 +8,12 @@ PACKAGER="$REALNAME <$EMAIL>"
 INTEGRITY_CHECK=(sha512 sha256)
 
 # Optimizations
-function fix_march {
+CFLAGS="-march=native -O3 -pipe -fno-plt -flto=auto"
-    echo $@ | sed 's/-march=[\w-]+ -mtune=\w+/-march=native/'
+CXXFLAGS="$CFLAGS"
-}
-
-CFLAGS="`fix_march $CFLAGS`"
-CXXFLAGS="`fix_march $CXXFLAGS`"
 LDFLAGS="$LDFLAGS"
 
 MAKEFLAGS="-j${MAKEPKG_MAKETHREADS:-`nproc`}"
+NINJAFLAGS="-j${MAKEPKG_MAKETHREADS:-`nproc`}"
 COMPRESSXZ=(xz -T 0 -c -z -)
 
 # Store stuff

dotfiles/xinputrc

@@ -10,5 +10,5 @@ if xinput --list --name-only | grep -q "$trackpoint_dev"; then
 fi
 
 # Set up Compose Key
-setxkbmap -option lv3:ralt_switch_multikey
+setxkbmap -option compose:ralt
 

git/config

@@ -7,6 +7,9 @@
 [merge]
     tool = kdiff3
 
+[init]
+    defaultBranch = main
+
 [includeIf "gitdir:~/Development/KDE/"]
     path = "kde.local"
 
@@ -23,6 +26,14 @@
 	pushInsteadOf = https://github.com/
     pushInsteadOf = gh:
 
+# GitLab
+[url "https://gitlab.com/"]
+    insteadOf = git://gitlab.com/
+
+[url "git@gitlab.com:"]
+    pushInsteadOf = git://gitlab.com/
+    pushInsteadOf = https://gitlab.com/
+
 # KDE
 [url "https://anongit.kde.org/"]
     insteadOf = kde:
@@ -30,3 +41,7 @@
 [url "git@git.kde.org:"]
     pushInsteadOf = kde:
 
+# OSM
+[url "git@git.oro.sodimm.me:"]
+    pushInsteadOf = https://git.oro.sodimm.me/
+

zsh/zplug

@@ -1 +1 @@
-Subproject commit 5336436631240778bba74a5323e76b6f77df7603
+Subproject commit c4dea766566b168a32dbfa8d10335e525ce39fcc

zsh/zprofile

@@ -102,6 +102,15 @@ else
 fi
 
 
+#
+# Vitasdk
+#
+export VITASDK="/usr/local/vitasdk"
+if [ -d "$VITASDK/bin" ]; then
+    VITASDK_BIN="$VITASDK/bin"
+fi
+
+
 #
 # Paths
 #
@@ -115,8 +124,8 @@ fi
 path=(
   $HOME/.local/bin
   $DOTFILES/bin
-  $HOME/junest/bin
   $KDE_SRC_BUILD
+  $VITASDK_BIN
   /usr/local/{bin,sbin}
   /snap/bin
   $path

zsh/zshrc

@@ -45,15 +45,14 @@ alias gst="git status"
 function gupf {
     (
     set -e
-    local ORIGIN=${1-origin}
-    local UPSTREAM=${2-upstream}
     local LBRANCH=`git symbolic-ref --short HEAD`
+    local ORIGIN=${1-`git config --get branch.$LBRANCH.remote`}
+    local UPSTREAM=${2-upstream}
     local OBRANCH=${3-$LBRANCH}
     local UBRANCH=${4-$OBRANCH}
     git fetch $ORIGIN
     git fetch $UPSTREAM
-    git checkout $ORIGIN/$OBRANCH
+    git checkout -b merge $ORIGIN/$OBRANCH
-    git checkout -b merge
     git merge $UPSTREAM/$UBRANCH -m "merge upstream from `git ls-remote --get-url $UPSTREAM`"
     git checkout $LBRANCH
     git rebase merge
@@ -125,6 +124,17 @@ function clearbuf {
 #
 alias lns="ln -sr"
 
+#
+# Please
+#
+function please {
+    if [ -z "$*" ]; then
+        sudo $(fc -ln -1)
+    else
+        sudo "$@"
+    fi
+}
+
 
 #
 # Local overrides