From 8832b455f562f34012a687730d63b8c28b4d6a53 Mon Sep 17 00:00:00 2001 From: Taeyeon Mori Date: Thu, 4 Nov 2021 17:55:06 +0100 Subject: [PATCH] Update configs --- config/mpv/input.conf | 2 +- config/nvim/init.vim | 2 ++ config/pulse/daemon.conf | 3 ++- config/youtube-dl/config | 2 +- dotfiles/XCompose | 2 ++ dotfiles/makepkg.conf | 9 +++------ dotfiles/xinputrc | 2 +- git/config | 15 +++++++++++++++ zsh/zplug | 2 +- zsh/zprofile | 11 ++++++++++- zsh/zshrc | 18 ++++++++++++++---- 11 files changed, 52 insertions(+), 16 deletions(-) diff --git a/config/mpv/input.conf b/config/mpv/input.conf index 56440bc..23a3311 100644 --- a/config/mpv/input.conf +++ b/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 diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 6b12575..5e810a3 100644 --- a/config/nvim/init.vim +++ b/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 diff --git a/config/pulse/daemon.conf b/config/pulse/daemon.conf index 164ae11..873c0c5 100644 --- a/config/pulse/daemon.conf +++ b/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 diff --git a/config/youtube-dl/config b/config/youtube-dl/config index 752ae89..666305b 100644 --- a/config/youtube-dl/config +++ b/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 diff --git a/dotfiles/XCompose b/dotfiles/XCompose index 5a60fa0..1b6b09b 100644 --- a/dotfiles/XCompose +++ b/dotfiles/XCompose @@ -4,6 +4,8 @@ # Part 1 - Manual definitions + : "⊕" U2295 # CIRCLED PLUS + # Spacing versions of dead accents : "~" asciitilde # TILDE : "~" asciitilde # TILDE diff --git a/dotfiles/makepkg.conf b/dotfiles/makepkg.conf index febbb9d..48a3343 100644 --- a/dotfiles/makepkg.conf +++ b/dotfiles/makepkg.conf @@ -8,15 +8,12 @@ PACKAGER="$REALNAME <$EMAIL>" INTEGRITY_CHECK=(sha512 sha256) # Optimizations -function fix_march { - echo $@ | sed 's/-march=[\w-]+ -mtune=\w+/-march=native/' -} - -CFLAGS="`fix_march $CFLAGS`" -CXXFLAGS="`fix_march $CXXFLAGS`" +CFLAGS="-march=native -O3 -pipe -fno-plt -flto=auto" +CXXFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" MAKEFLAGS="-j${MAKEPKG_MAKETHREADS:-`nproc`}" +NINJAFLAGS="-j${MAKEPKG_MAKETHREADS:-`nproc`}" COMPRESSXZ=(xz -T 0 -c -z -) # Store stuff diff --git a/dotfiles/xinputrc b/dotfiles/xinputrc index 866cb7b..9ac68a2 100755 --- a/dotfiles/xinputrc +++ b/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 diff --git a/git/config b/git/config index 6416565..320a2f6 100644 --- a/git/config +++ b/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/ + diff --git a/zsh/zplug b/zsh/zplug index 5336436..c4dea76 160000 --- a/zsh/zplug +++ b/zsh/zplug @@ -1 +1 @@ -Subproject commit 5336436631240778bba74a5323e76b6f77df7603 +Subproject commit c4dea766566b168a32dbfa8d10335e525ce39fcc diff --git a/zsh/zprofile b/zsh/zprofile index 6912db8..73bbee8 100644 --- a/zsh/zprofile +++ b/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 diff --git a/zsh/zshrc b/zsh/zshrc index 5cb107a..3eca1ba 100644 --- a/zsh/zshrc +++ b/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 + git checkout -b merge $ORIGIN/$OBRANCH 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