Update configs

master
Taeyeon Mori 3 years ago
parent e8a9befa8b
commit 8832b455f5
  1. 2
      config/mpv/input.conf
  2. 2
      config/nvim/init.vim
  3. 3
      config/pulse/daemon.conf
  4. 2
      config/youtube-dl/config
  5. 2
      dotfiles/XCompose
  6. 9
      dotfiles/makepkg.conf
  7. 2
      dotfiles/xinputrc
  8. 15
      git/config
  9. 2
      zsh/zplug
  10. 11
      zsh/zprofile
  11. 18
      zsh/zshrc

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

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

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

@ -20,7 +20,7 @@
# 247 VP9 720p # 247 VP9 720p
# 244 VP9 480p # 244 VP9 480p
#--format "(336/308/271/335/303/248/334/302/247/244)+(251/250/140/249)/best" #--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 # Keep record of already downloaded files in a folder
--download-archive ".youtube-dl" --download-archive ".youtube-dl"
# Post-Processing # Post-Processing

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

@ -8,15 +8,12 @@ PACKAGER="$REALNAME <$EMAIL>"
INTEGRITY_CHECK=(sha512 sha256) INTEGRITY_CHECK=(sha512 sha256)
# Optimizations # 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" LDFLAGS="$LDFLAGS"
MAKEFLAGS="-j${MAKEPKG_MAKETHREADS:-`nproc`}" MAKEFLAGS="-j${MAKEPKG_MAKETHREADS:-`nproc`}"
NINJAFLAGS="-j${MAKEPKG_MAKETHREADS:-`nproc`}"
COMPRESSXZ=(xz -T 0 -c -z -) COMPRESSXZ=(xz -T 0 -c -z -)
# Store stuff # Store stuff

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

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

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

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

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

Loading…
Cancel
Save