From a29b0fb21cccdbbc6bea568190b076c920300fa1 Mon Sep 17 00:00:00 2001 From: Mosder Date: Wed, 9 Sep 2026 18:24:34 +0200 Subject: changed default branch to main in gitconfig; added in/decrementation of letters in nvim config; changed indent in .bashrc --- common/home/mosder/.bashrc | 70 ++++++++++++++------------------ common/home/mosder/.config/nvim/init.lua | 3 ++ common/home/mosder/.gitconfig | 2 + 3 files changed, 35 insertions(+), 40 deletions(-) diff --git a/common/home/mosder/.bashrc b/common/home/mosder/.bashrc index 7ca9c2f..4645823 100644 --- a/common/home/mosder/.bashrc +++ b/common/home/mosder/.bashrc @@ -17,54 +17,44 @@ alias lobbycode='clip ~/.local/share/Steam/steamapps/common/PAYDAY\ 2/lobby_code alias yap='~/projects/yap/start.sh' restart() { - wezterm & - exit + wezterm & + exit } clip() { - wl-copy < "$@" + wl-copy < "$@" } open(){ - for file in "$@" - do - xdg-open "$file" - done + for file in "$@" + do + xdg-open "$file" + done } resizeVideo() { - if [[ $# != 3 ]]; then - echo "Usage: resizeVideo " - else - inputFile=$1 - outputFile=$2 - sizeInMiB=$3 - videoLength=$(ffprobe -i $inputFile -show_entries format=duration -v quiet -of csv="p=0") - bitrateInkb=$(echo "$sizeInMiB*8300/$videoLength" | bc) - ffmpeg -y -i $inputFile -c:v libx264 -b:v ${bitrateInkb}k -pass 1 -an -f null /dev/null && \ - ffmpeg -i $inputFile -c:v libx264 -b:v ${bitrateInkb}k -pass 2 -c:a aac -b:a 128k $outputFile - rm ffmpeg2pass-0.log ffmpeg2pass-0.log.mbtree - fi + if [[ $# != 3 ]]; then + echo "Usage: resizeVideo " + else + inputFile=$1 + outputFile=$2 + sizeInMiB=$3 + videoLength=$(ffprobe -i $inputFile -show_entries format=duration -v quiet -of csv="p=0") + bitrateInkb=$(echo "$sizeInMiB*8300/$videoLength" | bc) + ffmpeg -y -i $inputFile -c:v libx264 -b:v ${bitrateInkb}k -pass 1 -an -f null /dev/null && \ + ffmpeg -i $inputFile -c:v libx264 -b:v ${bitrateInkb}k -pass 2 -c:a aac -b:a 128k $outputFile + rm ffmpeg2pass-0.log ffmpeg2pass-0.log.mbtree + fi } music() { - if [[ $# == 0 ]]; then - command find /nfs/music -printf "\"%p\"\n" | grep .mp3 | xargs vlc - else - if [[ $@ == list ]]; then - command ls -AldQ $HOME/music/*/ | grep -v ^downloadLinkFiles/$ | awk -F'"' '{print $2}' | awk -F'/' '{print $5}' - elif [[ $@ == metal ]]; then - music alestorm dickinson dżem fighters ghost gloryhammer maiden kult lindemann littlev grubasa metallica nanowar powerwolf rammstein peppers sabaton samurai lawder accept/ sevenfold pestilence purple/ emigrate iggy asgard queen/ rainbow - elif [[ $@ == payday ]]; then - music Norén/ Coutinho/ Vania/ Viklund/ - elif [[ $@ == eurobeat ]]; then - music Ace/ Annerley/ STANTON/ ROGERS/ SIMON/ Dejo/ Love/ Dusty/ Boys/ Elisa/ Fastway/ Go2/ Jager/ Blast/ Cherry/ Parrish/ GRANT/ MANUEL/ Polo/ MAN/ B./ GROOVE/ Nathalie/ Niko/ NUAGE/ OVERLOAD/ Priscilla/ Sara/ SOPHIE/ SYMBOL/ MARS/ Vale/ VICTORIA/ WAIN - else - rx="\($1" - for regexp in "${@:2}" - do - rx="$rx\|$regexp" - done - rx="$rx\)" - command find /nfs/music -printf "\"%p\"\n" | grep -i "$rx.*\.mp3\"$" | xargs vlc - fi - fi + if [[ $# == 0 ]]; then + find /nfs/music -printf "\"%p\"\n" | grep \\.opus\"$ | xargs vlc + else + rx="\($1" + for regexp in "${@:2}" + do + rx="$rx\|$regexp" + done + rx="$rx\)" + find /nfs/music -printf "\"%p\"\n" | grep -i "$rx.*\.opus\"$" | xargs vlc + fi } export PATH="$PATH:/home/mosder/.bin:/home/mosder/.local/bin:/usr/bin" diff --git a/common/home/mosder/.config/nvim/init.lua b/common/home/mosder/.config/nvim/init.lua index d47d738..d817c31 100644 --- a/common/home/mosder/.config/nvim/init.lua +++ b/common/home/mosder/.config/nvim/init.lua @@ -36,6 +36,9 @@ do -- Enable mouse mode, can be useful for resizing splits for example! vim.o.mouse = 'a' + -- Enable incrementation of letters + vim.o.nrformats = 'alpha,hex,bin' + -- Don't show the mode, since it's already in the status line vim.o.showmode = false diff --git a/common/home/mosder/.gitconfig b/common/home/mosder/.gitconfig index b61872d..0229c37 100644 --- a/common/home/mosder/.gitconfig +++ b/common/home/mosder/.gitconfig @@ -3,3 +3,5 @@ name = Mosder [pull] rebase = false +[init] + defaultBranch = main -- cgit v1.2.3