diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl index a7eaab6..0eb0342 100755 --- a/dot_config/i3/config.tmpl +++ b/dot_config/i3/config.tmpl @@ -288,7 +288,8 @@ workspace $ws5 output $secondary assign [class="Steam"] $ws5 bindsym $mod+F5 workspace $ws5; exec $browser # bindsym Mod4+g workspace $ws5; layout stacking; exec urxvt -e steam -bindsym Mod4+g workspace $ws5; layout tabbed; exec gimp +# bindsym Mod4+g workspace $ws5; layout tabbed; exec gimp +bindsym Mod4+g workspace $ws5; exec mgba-qt bindsym Mod4+t workspace $ws5; exec thunderbird bindsym Mod4+5 workspace $ws5; exec godot bindsym Mod4+F5 workspace $ws5; exec cd ~/coding/ada-mario && godot -e diff --git a/dot_config/i3blocks/scripts/executable_wifi b/dot_config/i3blocks/scripts/executable_wifi index ef2c0aa..1ce6ee0 100755 --- a/dot_config/i3blocks/scripts/executable_wifi +++ b/dot_config/i3blocks/scripts/executable_wifi @@ -36,16 +36,22 @@ W_name=$(nmcli d | grep "$W_inter" | awk '{print $4}') #------------------------------------------------------------------------ -echo $QUALITY% "$W_name" # full text +echo $QUALITY% # full text echo $QUALITY% # short text +. "/home/kevin/.cache/wal/colors.sh" # color -if [[ $QUALITY -ge 80 ]]; then - echo "#00FF00" -elif [[ $QUALITY -lt 80 ]]; then - echo "#FFF600" -elif [[ $QUALITY -lt 60 ]]; then - echo "#FFAE00" -elif [[ $QUALITY -lt 40 ]]; then +if [[ $QUALITY -lt 50 ]]; then echo "#FF0000" +else + echo "$color7" fi +# if [[ $QUALITY -ge 80 ]]; then + # echo "#00FF00" +# elif [[ $QUALITY -lt 80 ]]; then + # echo "#FFF600" +# elif [[ $QUALITY -lt 60 ]]; then + # echo "#FFAE00" +# elif [[ $QUALITY -lt 40 ]]; then + # echo "#FF0000" +# fi diff --git a/dot_config/mgba/config-tmpl.ini b/dot_config/mgba/config-tmpl.ini new file mode 100755 index 0000000..77dddc1 --- /dev/null +++ b/dot_config/mgba/config-tmpl.ini @@ -0,0 +1,187 @@ +[ports.qt] +gbc.bios= +sgb.bios= +preload=0 +width=1818 +useBios=1 +audioBuffers=1536 +lockAspectRatio=1 +volume=20 +autoload=1 +shader= +sgb.borders=1 +savestatePath= +screenshotPath= +libraryStyle=0 +autosave=0 +fastForwardRatio=4 +logToStdout=0 +useDiscordPresence=0 +logLevel=7 +sampleRate=44100 +mute=0 +rewindBufferCapacity=300 +allowOpposingDirections=0 +suspendScreensaver=1 +savegamePath= +patchPath= +showFps=1 +cheatAutosave=1 +idleOptimization=ignore +pauseOnMinimize=1 +lastDirectory=C:/Users/Kevin/Downloads/mgba/emerald/1 +gba.bios= +audioSync=1 +frameskip=0 +fastForwardVolume=20 +cheatsPath= +fpsTarget=59.72750056960583 +scaleMultiplier=5 +skipBios=0 +autofireThreshold=3 +rewindEnable=0 +cheatAutoload=1 +loadStateExtdata=9 +gb.bios= +videoSync=0 +fastForwardMute=0 +pauseOnFocusLost=1 +showLibrary=0 +useCgbColors=1 +interframeBlending=0 +logToFile=0 +fastForwardHeldRatio=-1 +height=1011 +fullscreen=0 +lockIntegerScaling=0 +resampleVideo=0 +saveStateExtdata=31 +logFile= +gba.audioHle=0 +videoScale=1 +hwaccelVideo=0 + +[gba.input-profile.] +keyR=5 +keyL=4 +axisUpAxis=-1 +hat0Right=4 +keyStart=7 +keyLeft=-1 +keyDown=-1 +hat0Left=5 +axisLeftAxis=-0 +keyB=1 +keyUp=-1 +hat0Down=7 +axisRightValue=12288 +axisRightAxis=+0 +axisUpValue=-8613 +axisDownAxis=+1 +axisDownValue=15963 +keyA=0 +keyRight=-1 +hat0Up=6 +axisLeftValue=-12288 +keySelect=6 + +[gba.input.SDLB] +keyR=5 +keyL=4 +axisUpAxis=-1 +hat0Right=4 +gyroSensitivity=2e+09 +keyStart=7 +keyLeft=-1 +keyDown=-1 +hat0Left=5 +axisLeftAxis=-0 +keyB=1 +keyUp=-1 +hat0Down=7 +axisRightValue=12288 +axisRightAxis=+0 +axisUpValue=-8297 +axisDownAxis=+1 +gyroAxisX=0 +tiltAxisX=2 +axisDownValue=16279 +keyA=0 +keyRight=-1 +device0=Microsoft X-Box 360 pad +hat0Up=6 +gyroAxisY=1 +axisLeftValue=-12288 +keySelect=6 +tiltAxisY=3 + +[gba.input.QT_K] +keyR=16777220 +keyL=16777219 +keyStart=83 +keyLeft=16777234 +keyDown=16777237 +keyB=70 +keyUp=16777235 +keyA=68 +keyRight=16777236 +keySelect=65 + +[gba.input-profile.Microsoft X-Box 360 pad] +keyR=5 +keyL=4 +axisUpAxis=-1 +hat0Right=4 +gyroSensitivity=2e+09 +keyStart=7 +keyLeft=-1 +keyDown=-1 +hat0Left=5 +axisLeftAxis=-0 +keyB=1 +keyUp=-1 +hat0Down=7 +axisRightValue=12288 +axisRightAxis=+0 +axisUpValue=-8297 +axisDownAxis=+1 +gyroAxisX=0 +tiltAxisX=2 +axisDownValue=16279 +keyA=0 +keyRight=-1 +hat0Up=6 +gyroAxisY=1 +axisLeftValue=-12288 +keySelect=6 +tiltAxisY=3 + +[gba.input-profile.XInput Controller #1] +keyR=5 +keyL=4 +axisUpAxis=-1 +hat0Right=4 +gyroSensitivity=2e+009 +keyStart=7 +keyLeft=-1 +keyDown=-1 +hat0Left=5 +axisLeftAxis=-0 +keyB=1 +keyUp=-1 +hat0Down=7 +axisRightValue=12288 +axisRightAxis=+0 +axisUpValue=-8613 +axisDownAxis=+1 +gyroAxisX=0 +tiltAxisX=2 +axisDownValue=15963 +keyA=0 +keyRight=-1 +hat0Up=6 +gyroAxisY=1 +axisLeftValue=-12288 +keySelect=6 +tiltAxisY=3 + diff --git a/dot_config/mgba/qt-tmpl.ini b/dot_config/mgba/qt-tmpl.ini new file mode 100755 index 0000000..d876882 --- /dev/null +++ b/dot_config/mgba/qt-tmpl.ini @@ -0,0 +1,66 @@ +[General] +audioDriver=1 +cameraDriver=0 +displayDriver=1 +language=en +windowPos=@Point(2144 0) + +[mru] +0=/home/kevin/Downloads/gba/mgba/pokemon/emerald/1/emerald-1.gba +1=C:\\Users\\Kevin\\Downloads\\mgba\\emerald\\1\\emerald-1.gba +2=C:\\Users\\Kevin\\Downloads\\mgba\\Pokemon - Emerald Version Randomized (U) 1.gba +3=C:\\Users\\Kevin\\Downloads\\mgba\\Pokemon - Emerald Version (U).gba +4=C:/Users/Kevin/Downloads/mgba/Pokemon - Emerald Version Randomized (U) 1.gba + +[shader.default.0] +bias%5B0%5D=0 +bias%5B1%5D=0 +bias%5B2%5D=0 +desaturation%5B0%5D=0 +desaturation%5B1%5D=0 +desaturation%5B2%5D=0 +gamma=1 +scale%5B0%5D=1 +scale%5B1%5D=1 +scale%5B2%5D=1 + +[shortcutAxis] +autofireA=@String(\0-1) +fastForward=@String(\0-1) +holdFastForward=@String(\0-1) +holdRewind=@String(\0-1) + +[shortcutButton] +autofireA=2 +fastForward=3 +holdFastForward=-1 +holdRewind=-1 + +[shortcutKey] +autofireA=E +fastForward=Space +holdFastForward=R + +[shortcutProfileAxis.Microsoft%20X-Box%20360%20pad] +autofireA=@String(\0-1) +fastForward=@String(\0-1) +holdFastForward=@String(\0-1) +holdRewind=@String(\0-1) + +[shortcutProfileAxis.XInput%20Controller%20%231] +autofireA=@String(\0-1) +fastForward=@String(\0-1) +holdFastForward=+2 +holdRewind=@String(\0-1) + +[shortcutProfileButton.Microsoft%20X-Box%20360%20pad] +autofireA=2 +fastForward=3 +holdFastForward=-1 +holdRewind=-1 + +[shortcutProfileButton.XInput%20Controller%20%231] +autofireA=2 +fastForward=3 +holdFastForward=-1 +holdRewind=-1 diff --git a/dot_vimrc.tmpl b/dot_vimrc.tmpl index 9265b53..6a7991c 100755 --- a/dot_vimrc.tmpl +++ b/dot_vimrc.tmpl @@ -376,6 +376,10 @@ nnoremap yo :Goyo nnoremap yg ggyG " toggle fold nnoremap z za +" close all folds +nnoremap zm zM +" open all folds +nnoremap zr zR " ]]] leader mappings " diff --git a/key_aliases.tmpl b/key_aliases.tmpl index 2765ce1..8a0dc25 100755 --- a/key_aliases.tmpl +++ b/key_aliases.tmpl @@ -46,6 +46,10 @@ ctls "sudo systemctl stop" ctlt "sudo systemctl status" ctltd "sudo systemctl status dhcpcd" ctlr "sudo systemctl restart" + +nct "sudo netctl" +nct "sudo netctl" + # ]]] systemctl # ct "crontab" @@ -245,7 +249,7 @@ wla "watson log --all --tag=" ww "watson log" # wlm "watson log --project coding --tag mfs" wr "watson report --day" -wra "watson report --all" +wra "watson report --all --tag=" wrw "watson report" wre "watson restart" wree "watson restart && watson edit" @@ -299,12 +303,13 @@ grmor "rm (fd -e orig --no-ignore -H)" # diff/log [[[ # -gd "git difftool -w --tool=vimdiff" -gdc "git difftool -w --cached --tool=vimdiff" -gdl "git diff -w" -gdlc "git diff --cached -w" +gd "git diff -w" +gdc "git diff -w --cached" gdh "git diff --cached -w HEAD~1" gds "git diff --stat" +gdt "git difftool -w --tool=vimdiff" +gdtc "git difftool -w --cached --tool=vimdiff" + gl "git log" glm "git log master" gsl "git shortlog" @@ -349,7 +354,7 @@ gc "git commit -S" gcu "git commit" gca "git add -A && git commit --amend --no-edit -S" gcam "git add -A && git commit --amend -S" -# gcamp "git add -A && git commit --amend --no-edit -S && gpsf" +gcap "git add -A && git commit --amend --no-edit -S && gpsf" psgi "git add -A && git commit -m 'Update' -S && git push" gps "git push" @@ -490,14 +495,18 @@ dea "deactivate" # school [[[ # +# basic # wlf "watson log --all --tag=final" # wrf "watson report --all --tag=final" ssc "ssh mokkar@teach.cs.utoronto.ca" +# alg course jc "javac -d out *.java" jr "java -cp \"$CLASSPATH:out\"" +# 263 wl6 "watson log --all --project=263 --tag=a3" wr6 "watson report --all --project=263 --tag=a3" +pd3 "pdflatex a3" # ]]] school # diff --git a/key_dirs.tmpl b/key_dirs.tmpl index 7a0e764..a246708 100755 --- a/key_dirs.tmpl +++ b/key_dirs.tmpl @@ -87,3 +87,5 @@ al1 ~/school/algorithms/w1-union-find # ]]] 309 # # ]]] sch # + +pk /home/kevin/Downloads/gba/mgba/pokemon/emerald/1 diff --git a/key_files.tmpl b/key_files.tmpl index 43c884e..0e09bd6 100755 --- a/key_files.tmpl +++ b/key_files.tmpl @@ -24,10 +24,10 @@ z ~/linux-config/aliases/zsh_aliases # cdn [[[ # -cm /tmp/commit-msg.txt bid ~/coding/project-ideas/blog.md ci ~/linux-config/txt/ideas.md -cmd ./commit-msg.txt +cm ./commit-msg.txt +cmt /tmp/commit-msg.txt hlg ~/coding/spotify-lib-vis/src/api/management/commands/update-history.log id ~/coding/project-ideas/ideas.md ig ./.gitignore diff --git a/scripts/executable_backup b/scripts/executable_backup index 41a8e9e..c613496 100755 --- a/scripts/executable_backup +++ b/scripts/executable_backup @@ -15,15 +15,17 @@ exclude_dirs_list="/home/kevin/txt/exclude-dirs-backup.txt" exclude_dirs_list_full="/home/kevin/txt/exclude-dirs-backup-full.txt" case $2 in - tar ) + tar-root ) # Labels for backup name distro="arch" datetime=$(date "+%m.%d-%H.%M") - backup_file="$backup_dest/tar/$datetime-$distro.tar.gz" + backup_file="$backup_dest/tar/$datetime-$distro-root.tar.gz" - sudo tar -czpvf "$backup_file" --exclude-from="$exclude_dirs_list" / + sudo tar -czpvf "$backup_file" --exclude-from="$exclude_dirs_list" --exclude=/home / ;; full ) sudo rsync -PraAX --exclude-from="$exclude_dirs_list_full" / "$backup_dest/full" - # sudo rsync -PraAX /home "$backup_dest/full" + ;; + home ) + sudo rsync -PraAX --exclude-from="$exclude_dirs_list_full" /home "$backup_dest/full" esac diff --git a/txt/exclude-dirs-backup.txt.tmpl b/txt/exclude-dirs-backup.txt.tmpl index 33ad9a8..954342d 100755 --- a/txt/exclude-dirs-backup.txt.tmpl +++ b/txt/exclude-dirs-backup.txt.tmpl @@ -16,5 +16,6 @@ /proc /run /sys +/tmp /var/cache/pacman /var/lib/systemd/coredump