Twitchy game script

2020-03-17 04:40:27 -04:00
parent 527b573d29
commit e1dc984707
14 changed files with 107 additions and 66 deletions
--- a/aliases/key_aliases.tmpl
+++ b/aliases/key_aliases.tmpl
@@ -89,10 +89,10 @@ xcssh "bat ~/.ssh/id_rsa.pub | xclip -selection clipboard"
 # digital ocean
 ssd "mosh --ssh='ssh -p 399' kevin@165.22.239.234 tmux a"
 sdh "mosh --ssh='ssh -p 399' kevin@165.22.239.234 htop"
-sfd "sftp -P 399 kevin@165.22.239.234"
+sfd "sftp -rP 399 kevin@165.22.239.234"
 # phone
-ssp "mosh --ssh='ssh -p 8022' 192.168.0.14"
-sfp "sftp -P 8022 192.168.0.14"
+ssp "mosh --ssh='ssh -p 8022' 192.168.0.10"
+sfp "sftp -rP 8022 192.168.0.10"
 # test server sites
 # svp "firefox git.ataraxy.tk khkm.tk cal.khkm.tk pste.gq smol.gq twem.tk"
 # postgres ssh tunnel
@@ -123,6 +123,7 @@ vdr "vidir --verbose"
 l "lsd -F --group-dirs first"
 la "lsd -AF --group-dirs first"
 ll "lsd -lF --group-dirs first --size short"
+llr "lsd -lF --group-dirs first --size short -tr"
 lla "lsd -AlF --group-dirs first --size short"
 {{ else }}
 l "ls"
@@ -136,6 +137,7 @@ f "cd"
 fz "fzf -e"
 fbg "cd ~/Pictures/Backgrounds && ranger --selectfile (fzf -e --delimiter '/' --with-nth -1)"
 fnd "find . -type f -name"
+p "pwd"

 rmr "rm -rf"
 rmd "rm ~/Downloads/*"
@@ -161,7 +163,7 @@ s "systemctl suspend"
 x "exit"
 so "xset dpms force off"
 sd "tmux kill-server; systemctl poweroff"
-rbt "systemctl reboot"
+rb "tmux kill-server; systemctl reboot"
 lo "i3-msg exit"
 xm "xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE"
 X "xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE"
@@ -310,6 +312,7 @@ acs "task context sch && task"
 af "task proj:"
 afcm "task proj:codm"
 afcr "task proj:crim"
+afs "task proj:sch"
 apl "task completed"
 al "task limit:15"
 alg "task log"
@@ -364,10 +367,12 @@ it "sxiv -t *"
 ki "kill -9"
 ka "killall"
 kd "killall Discord && killall Discord"
+kf "killall firefox"
 kr "killall electron"
 kt "killall thunderbird"
 lio "libreoffice"
 # mpv "mpv --volume=50"
+mp "mpv"
 mra "man ranger"
 # mt "minetest"
 n "nvim"
@@ -392,14 +397,13 @@ stp "termdown"
 # sw "swex"
 t  "tmux"#[[[
 ta "tmux a -t"
-ta2 "tmux a -t 324 || tmux new -s 324"
-ta22 "tmux a -t 324-2 || tmux new -s 324-2"
-ta8 "tmux a -t 384 || tmux new -s 384"
-ta82 "tmux a -t 384-2 || tmux new -s 384-2"
 tacf "tmux a -t config || tmux new -s config"
 tacm "tmux a -t codm || tmux new -s codm"
 tacr "tmux a -t crimson || tmux new -s crimson"
+taf "tmux a -t fortnite || tmux new -s fortnite"
 taj "tmux a -t journal || tmux new -s journal"
+tas "tmux a -t school || tmux new -s school"
+tas2 "tmux a -t school-2 || tmux new -s school-2"
 tal "tmux a"
 tc "clear && tmux clear-history" 
 tk "tmux kill-session -t"
@@ -408,6 +412,7 @@ tl "tmux ls"
 tn "tmux new -s"
 tnb "tmux new -s backup"
 #]]]
+tw "twitchy"
 usn "usernames --num 20"
 vmd "vimdiff"
 # wg "wego"
@@ -423,7 +428,7 @@ trx "tar xvzf"

 # pass  [[[ #

-p "pass"
+# p "pass"
 pc "pass -c"
 pe "pass edit"
 pi "pass insert -m"
@@ -471,11 +476,12 @@ wl "watson log -Gcd"
 wla "watson log -Gcap"
 wlat "watson log -GcaT"
 ww "watson log -Gc"
-wwb "watson log -Gc | bat"
+wwa "watson log -Gc | bat"
 wr "watson report -Gcd"
 wra "watson report -Gcap"
 wram "watson report -Gca | rg -S '^\w.*-\s\d*h' | sort -t' ' -hk3 | sed 's/ - /,/' | xsv table"
 wrat "watson report -GcaT"
+wrm "watson report -GcmT"
 wrw "watson report -Gc"

 # ]]] log/report #
@@ -534,6 +540,8 @@ glfi "git lfs install"
 glfp "git lfs pull"
 glft "git lfs track *"

+gm "git mv"
+
 grm "git rm"
 grmf "git rm -f"
 grmc "git rm --cached"
@@ -745,14 +753,14 @@ nst "cp ~/Documents/workout-logs/stretching.md /tmp && nvim /tmp/stretching.md"

 # Red Discord bot
 rde "pyenv shell red-discord-bot-test"
-rb "redbot --dev --debug"
+rbd "redbot --dev --debug"

 # ]]] coding projs  #

 # games [[[ #

 wlm "watson log --all --project=minetest"
-wrm "watson report --all --project=minetest"
+# wrm "watson report --all --project=minetest"
 wamv "watson start minetest +video"

 # minetest [[[ #
@@ -770,7 +778,13 @@ mtsv "minetestserver --gameid minimal --worldname Test --terminal"
 tet "pandoc -f markdown -t html twitch-emote-conversion.md | xclip -selection clipboard"
 shrg "printf '¯\\\\\\\\\\_(ツ)_/¯' | xclip -selection clipboard"

-dce "mono DiscordChatExporter.Cli.exe"
+dcec "mono DiscordChatExporter.Cli.exe"
+dcec "mono DiscordChatExporter.Cli.exe export -t $DISCORD_TOKEN -c"
+
+ifm "sxiv ~/Documents/fortnite/maps/boat-campfire-slurp.png"
+twf "watch -n60 'twitchy-game Fortnite'"
+# mp "mpv --video-zoom=1.5"
+# ufn "source trn-api-key.fish && curl --request GET --url https://api.fortnitetracker.com/v1/profile/pc/Vole%20on%20Mobile --header 'trn-api-key: 584d8eca-30d9-4119-92d8-5067dd301118' --cookie __cfduid=d4f0daac7eee3687b481bd55dcf00f3581581900091 > stats.json"

 # ]]] games #

--- a/aliases/key_dirs.tmpl
+++ b/aliases/key_dirs.tmpl
@@ -12,6 +12,7 @@ D  ~/Documents
 k ~/
 lc ~/linux-config
 lf /mnt/linux-files
+Lfp /mnt/linux-files/Pictures
 Lfv /mnt/linux-files/Videos
 me /run/media/kevin
 o /
@@ -38,8 +39,9 @@ hbd ~/.habitctl
 ib ~/linux-config/dot_config/i3blocks/scripts
 ra ~/linux-config/dot_config/ranger
 rd ~/Documents/red-discord-bot
+rda ~/Documents/red-discord-bot/repos/gobcog-kevin/adventure
 rdt ~/coding/discord-bots
-rdp ~/coding/discord-bots/pinky/cogs
+rdp ~/coding/discord-bots/pinky/cogs/CogManager/cogs/adventure
 sr ~/linux-config/scripts
 snp ~/.vim/plugged/vim-snippets/UltiSnips
 sw ~/.local/share/nvim/swap/
@@ -56,7 +58,7 @@ lh ~/Documents/listening-history
 mmd ~/coding/move-mouse-with-head
 ms ~/coding/mf-site
 ml ~/coding/mf-site/content/letter
-mp ~/coding/mf-site/static/pdf
+# mp ~/coding/mf-site/static/pdf
 pn ~/coding/red-discord-bot
 sv ~/coding/spotify-lib-vis/src
 svg ~/coding/spotify-lib-vis/src/graphs/static/graphs/scripts
@@ -67,7 +69,7 @@ wo ~/Documents/workout-logs

 # gaming [[[ #

-te ~/Documents/twitch-emotes
+te ~/Pictures/twitch-emotes

 mt ~/.minetest
 mta ~/.minetest/clientmods/custom_aliases
@@ -90,27 +92,24 @@ adP ~/Pictures/ada-mario

 # ]]] cdn #

+# gaming [[[ #
+
 cm ~/Documents/codm
 cs ~/Documents/codm/site
 csi ~/Documents/codm/site/static/images
 Css ~/Pictures/screenshots/mobile/codm

+fn ~/Documents/fortnite
+fns ~/Documents/fortnite/stats/api
+fnv /mnt/linux-files/Videos/personal-fortnite-games
+
+# ]]] gaming #
+
 # sch [[[ #

 sc ~/school
 lt ~/school/latex-notes

-# 324
-2 ~/school/324
-2a ~/school/324-a2
-2e ~/school/324/e/10
-2f ~/school/324/final
-2l ~/school/324/l/9
-2m ~/school/324/midterm
-
-# 384
-8 ~/school/384
-8a ~/school/384/a4
-# 8t ~/school/latex-notes/384/a2
+ph ~/school/phl

 # ]]] sch #
--- a/aliases/key_files.tmpl
+++ b/aliases/key_files.tmpl
@@ -43,7 +43,7 @@ hh ~/.habitctl/habits
 hlg ~/coding/spotify-lib-vis/src/api/management/commands/update-history.log
 id ~/Documents/journal/todo/ideas.md
 ig ./.gitignore
-jn ~/Documents/journal/todo/9.md
+jn ~/Documents/journal/todo/2.md
 jt ~/Documents/journal/todo/todo.md
 lh ~/Documents/listening-history/polarbier.csv
 mc ~/coding/mf-site/assets/sass/main.scss
@@ -51,6 +51,7 @@ mi ~/coding/mf-site/ideas.md
 ne ~/linux-config/configs/neofetch/config.conf
 re README.md
 rda ~/Documents/red-discord-bot/repos/gobcog-kevin/adventure/adventure.py
+rdc ~/Documents/red-discord-bot/commands-freq.md
 td todo.md
 tg ~/.config/watson/tags_cache
 tt txt/todo.md
@@ -82,8 +83,14 @@ wh ~/Documents/journal/todo/work-habit.md

 # ]]] sch #

-# gaming
+# gaming [[[ #
+
+cmr ~/Documents/codm/discord-recruitment.md
 cra ~/Documents/red-discord-bot/repos/gobcog-kevin/adventure/data/default/attribs.json
 crm ~/Documents/red-discord-bot/repos/gobcog-kevin/adventure/data/default/monsters.json
+fn ~/Documents/fortnite/notes/fortnite-notes.md
+fv ~/Documents/fortnite/notes/vods.md
 mta ~/.minetest/clientmods/custom_aliases/init.lua
 pk ~/Downloads/pokecord/pokecord2.md
+
+# ]]] gaming #
--- a/dot_config/fish/config.fish.tmpl
+++ b/dot_config/fish/config.fish.tmpl
@@ -38,8 +38,9 @@ status --is-interactive; and source (pyenv init -|psub)
 #]]]

 # space prompt[[[
-set SPACEFISH_PROMPT_ORDER time user dir host git package node docker ruby golang php rust haskell julia aws conda pyenv kubecontext exec_time line_sep battery jobs exit_code vi_mode char
-# set SPACEFISH_PROMPT_ORDER vi_mode dir git pyenv exec_time jobs exit_code line_sep char
+# set SPACEFISH_PROMPT_ORDER time user dir host git package node docker ruby golang php rust haskell julia aws conda pyenv kubecontext exec_time line_sep battery jobs exit_code vi_mode char
+set SPACEFISH_ADD_NEWLINE false
+set SPACEFISH_PROMPT_ORDER vi_mode dir git pyenv exec_time jobs exit_code line_sep char
 set SPACEFISH_DIR_PREFIX ''
 set SPACEFISH_DIR_TRUNC 0
 set SPACEFISH_DIR_TRUNC_REPO false
@@ -151,7 +152,7 @@ abbr gclg "git-clone-gitea"
 abbr gdf "git-diff-files"
 abbr gpsi "git-push-initial"
 abbr gpsmt "git-push-multiple"
-abbr gpng "git-push-new-gitea origin"
+abbr gpng "git-push-new-gitea"
 abbr gpngg "git-push-new-gitea gitea"
 abbr gremotes "git-mult-remotes"
 abbr grmb "git-delete-branch"
@@ -166,7 +167,6 @@ abbr mat "math"
 abbr mdf "mkdir-cd"
 abbr pgr "grep-pdf"
 abbr pgrf "grep-pdf-file"
-abbr png "git-push-new-gitea"
 abbr pst "pastebin"
 abbr qh "qalc-history"
 abbr rf "refresh-config"
--- a/dot_config/fish/functions/git/git-push-new-gitea.fish
+++ b/dot_config/fish/functions/git/git-push-new-gitea.fish
@@ -1,4 +1,4 @@
 function git-push-new-gitea
-    git remote add $argv[1] ssh://git@kevin-mok.com:399/Kevin-Mok/$argv[2].git
-    and git push --set-upstream $argv[1] master
+    git remote add origin ssh://git@kevin-mok.com:399/Kevin-Mok/$argv[1].git
+    and git push --set-upstream origin master
 end
--- a/dot_config/i3/config.tmpl
+++ b/dot_config/i3/config.tmpl
@@ -16,7 +16,8 @@ exec wal -i $(/home/kevin/scripts/shuffler "$HOME/Pictures/Backgrounds/dim/non-e
 # exec xrdb ~/.Xresources && grep wallpaper ~/.cache/wal/colors.sh | cut -d\' -f2 | xargs wal -i > /dev/null
 exec --no-startup-id i3-msg 'workspace $ws2; exec $term'
 exec --no-startup-id i3-msg 'workspace $ws3; exec $browser'
-exec --no-startup-id i3-msg 'workspace $ws6; exec discord'
+# exec --no-startup-id i3-msg 'workspace $ws5; exec $term -e twitchy'
+# exec --no-startup-id i3-msg 'workspace $ws6; exec discord'

 #  ]]] startup # 

@@ -73,8 +74,8 @@ bindsym Mod4+$mod+s exec $type_delay_cmd && xdotool type 'https://smol.gq/'
 bindsym Mod4+t exec xclip -selection clipboard ~/.password-store/social/trapbot && $type_delay_cmd && xdotool key 'Control_L+v'
 bindsym Mod4+u exec $type_delay_cmd && xdotool type 'kevin.mok@mail.utoronto.ca'
 # bindsym Mod4+$mod+u exec pass -c uoft/acorn
-bindsym Mod4+w exec notify-send "watson status" "$(watson status)"
-bindsym Mod4+$mod+w exec notify-send "watson stop" "$(watson status && watson stop)"
+# bindsym Mod4+w exec notify-send "watson status" "$(watson status)"
+# bindsym Mod4+$mod+w exec notify-send "watson stop" "$(watson status && watson stop)"
 bindsym Control+Mod4+w exec $term -e nvim /home/kevin/.config/watson/state.tmp
 # bindsym Mod4+x exec $swex
 bindsym Control+$mod+x exec $type_delay_cmd && xdotool type 'http://codm.ataraxy.tk/'
@@ -304,12 +305,14 @@ set $ws2 "2 "
 workspace $ws2 output $secondary
 bindsym $mod+F2 workspace $ws2; exec $term
 # bindsym Control+Shift+F2 workspace $ws2; exec $term -e fish -c 'tmux-attach codm'
-bindsym Control+Shift+F2 workspace $ws2; exec $term -e fish -c 'tmux-attach crimson'
-bindsym Control+$mod+Shift+F2 workspace $ws2; exec $term -e fish -c 'tmux-attach codm'
+bindsym Control+Shift+F2 workspace $ws2; exec $term -e fish -c 'tmux-attach fortnite'
+bindsym Control+$mod+Shift+F2 workspace $ws2; exec $term -e fish -c 'tmux-attach crimson'
+# bindsym Control+Shift+F2 workspace $ws2; exec $term -e fish -c 'tmux-attach crimson'
+# bindsym Control+$mod+Shift+F2 workspace $ws2; exec $term -e fish -c 'tmux-attach codm'

 set $ws3 "3 "
 # set $ws3 "3 "
-workspace $ws3 output $main
+# workspace $ws3 output $main
 bindsym $mod+F3 workspace $ws3; exec $browser
 # bindsym Mod4+b workspace $ws3; layout stacked; exec $term -e fish -c "buku-fzf"
 # bindsym Mod4+$mod+b workspace $ws3; layout stacked; exec $term -e fish -c "buku-fzf fq"
@@ -323,7 +326,7 @@ workspace $ws4 output $secondary
 bindsym $mod+F4 workspace $ws4; exec $term

 set $ws5 "5 "
-workspace $ws5 output $secondary
+# workspace $ws5 output $secondary
 assign [class="Steam"] $ws5
 bindsym $mod+F5 workspace $ws5; exec $browser
 bindsym $mod+Mod4+F5 workspace $ws5; exec firefox --private-window
@@ -333,6 +336,8 @@ bindsym Mod4+g workspace $ws5; layout tabbed; exec gimp
 bindsym Mod4+i workspace $ws5; exec idea
 # bindsym Mod4+m workspace $ws5; layout tabbed; exec $term -e ~/.minetest/minetest/bin/minetest
 bindsym Mod4+$mod+t workspace $ws5; exec thunderbird
+# bindsym Mod4+$mod+w workspace $ws5; exec $term -e twitchy
+bindsym Mod4+w workspace $ws5; exec $term -e twitchy
 bindsym Mod4+5 workspace $ws5; exec godot
 bindsym Mod4+F5 workspace $ws5; exec cd ~/coding/ada-mario && godot -e
 # for_window [class="Move_mouse_with_head"] floating enable; move absolute position 0 0
@@ -346,9 +351,11 @@ set $ws6 "6 "
 workspace $ws6 output $secondary
 assign [class="Slack"] $ws6
 # bindsym Mod4+$mod+d workspace $ws6; exec discord
-# bindsym Mod4+d workspace $ws6; exec riot-desktop
-bindsym Mod4+d workspace $ws6; exec discord
-bindsym Mod4+$mod+d workspace $ws6; exec riot-desktop
+bindsym Mod4+d workspace $ws6; exec riot-desktop
+bindsym Mod4+$mod+d workspace $ws6; exec discord
+# bindsym Mod4+d workspace $ws6; exec discord
+# bindsym Mod4+$mod+d workspace $ws6; exec riot-desktop
+# bindsym Mod4+d workspace $ws6; exec firefox --new-window https://discordapp.com/channels/430798446723727367/443950744996020228
 # bindsym Mod4+i workspace $ws6; exec firefox -new-window https://riot.im/app/#/home
 bindsym Mod4+k workspace $ws6; exec slack

@@ -356,6 +363,7 @@ set $ws7 "7 "
 workspace $ws7 output $secondary
 # bindsym $mod+F7 workspace $ws7; exec $term
 bindsym $mod+F7 workspace $ws7; exec $term -e mosh --ssh='ssh -p 399' kevin@165.22.239.234 tmux a
+bindsym Mod4+a workspace $ws7; exec android-file-transfer
 # bindsym Mod4+v workspace $ws7; exec VBoxManage startvm "369-a1"

 set $ws8 "8 "
@@ -388,7 +396,7 @@ set $ws11 "11 "
 workspace $ws11 output $secondary
 bindsym $mod+F11 workspace $ws11; exec $term -e htop -s PERCENT_CPU
 # bindsym $mod+F11 workspace $ws11; exec $term -e gotop -m
-bindsym Mod4+a workspace $ws11; exec antimicro
+# bindsym Mod4+a workspace $ws11; exec antimicro

 set $ws12 "12 "
 bindsym $mod+F12 workspace $ws12; exec $term
--- a/dot_config/mpv/input.conf
+++ b/dot_config/mpv/input.conf
@@ -1,13 +1,14 @@
 # volume
-WHEEL_UP        add volume 1
-WHEEL_DOWN      add volume -1
+WHEEL_UP        add volume 5
+WHEEL_DOWN      add volume -5
+v cycle mute

 # speed
 r set speed 1.0
 g set speed 1.6
 h set speed 2.4
-s add speed -.2
-d add speed .2
+a add speed -.2
+s add speed .2

 # seek
 Shift+RIGHT seek  1
--- a/dot_config/neofetch/config.conf
+++ b/dot_config/neofetch/config.conf
@@ -337,7 +337,7 @@ public_ip_host="http://ident.me"
 #      'Disk (/): 74G / 118G (66%)'
 #
 # disk_show=('/' '/home' '/mnt/linux-files' )
-disk_show=('/dev/sda1' '/dev/sda3' '/dev/sdb2' )
+disk_show=('/dev/sda1' '/dev/sda3' '/dev/sdc2' )

 # Disk subtitle.
 # What to append to the Disk subtitle.
--- a/dot_config/zathura/zathurarc
+++ b/dot_config/zathura/zathurarc
@@ -1,4 +1,4 @@
-set recolor true
+# set recolor true
 # black
 set recolor-darkcolor "#ffffff"
 set recolor-lightcolor "#000000"
--- a/6
+++ b/6
@@ -51,11 +51,11 @@ taskd.credentials=Hevin\/Kevin\/eb6225dc-80fb-4721-8b03-9114c6c4423d

 urgency.due.coefficient=18
 urgency.user.project.codm.coefficient=2
-urgency.user.project.crim.coefficient=7
+urgency.user.project.crim.coefficient=5
 urgency.user.project.mny.coefficient=7
 urgency.user.project.ms.coefficient=3
-urgency.user.project.pey.coefficient=5
-urgency.user.project.sch.coefficient=7
+urgency.user.project.pey.coefficient=7
+urgency.user.project.sch.coefficient=10
 urgency.uda.priority.H.coefficient=10
 urgency.uda.priority.L.coefficient=-7
 urgency.uda.priority..coefficient=1
--- a/dot_tmux.conf
+++ b/dot_tmux.conf
@@ -31,12 +31,12 @@ bind-key -n M-h if-shell "$is_vim" "send-keys M-h"  "select-pane -L"
 bind-key -n M-j if-shell "$is_vim" "send-keys M-j"  "select-pane -D"
 bind-key -n M-k if-shell "$is_vim" "send-keys M-k"  "select-pane -U"
 bind-key -n M-l if-shell "$is_vim" "send-keys M-l"  "select-pane -R"
-bind-key -n M-\ if-shell "$is_vim" "send-keys M-\\" "select-pane -l"
+# bind-key -n M-\ if-shell "$is_vim" "send-keys M-\\" "select-pane -l"
 bind-key -T copy-mode-vi M-h select-pane -L
 bind-key -T copy-mode-vi M-j select-pane -D
 bind-key -T copy-mode-vi M-k select-pane -U
 bind-key -T copy-mode-vi M-l select-pane -R
-bind-key -T copy-mode-vi M-\ select-pane -l
+# bind-key -T copy-mode-vi M-\ select-pane -l

 bind-key -n M-Enter split-window -h
 # bind-key -n M-v split-window -h
--- a/dot_vimrc.tmpl
+++ b/dot_vimrc.tmpl
@@ -171,12 +171,13 @@ Plug 'lervag/vimtex'
 	" au BufWritePost *.tex silent call Tex_RunLaTeX()
 	au BufWritePost *.tex silent !pkill -USR1 xdvi.bin
 	let g:Tex_MultipleCompileFormats = 'dvi,pdf'
-	let g:vimtex_view_general_viewer = 'zathura'
+	let g:vimtex_view_general_viewer = 'evince'
    let g:vimtex_quickfix_latexlog = {
          \ 'overfull' : 0,
          \ 'underfull' : 0,
          \ 'global' : 0,
          \ 'packages' : {
+          \   'biblatex' : 0,
          \   'gensymb' : 0,
          \ },
          \ 'references' : 0,
@@ -327,6 +328,7 @@ Plug 'neovimhaskell/haskell-vim'
 Plug 'masukomi/vim-markdown-folding'
  autocmd FileType markdown set foldexpr=NestedMarkdownFolds()
 Plug 'cespare/vim-toml'
+Plug 'dpelle/vim-LanguageTool'
 " ]]] vim-plug "

 " Mappings [[[ "
@@ -398,7 +400,7 @@ nnoremap <leader>ftd /TODO<CR>
 nnoremap <leader>g :YcmCompleter GoTo<CR>
 " vimdiff split
 nnoremap <leader>gd :Gvdiff 
-nnoremap <leader>gdh :Gvdiff HEAD~
+nnoremap <leader>gdh :Gvdiff HEAD^
 nnoremap <leader>gdm :Gvdiff master<CR>
 " toggle search highlighting
 nnoremap <leader>h :set hlsearch! hlsearch?<CR>
@@ -439,18 +441,19 @@ nnoremap <leader>plu :PlugUpdate<CR>
 " don't break lines
 nnoremap <leader>py :set tw=0<CR>
 " replace in next x lines
-nnoremap <leader>r q:i.,.+s///g<ESC>Fsi
+" nnoremap <leader>r q:i.,.+s///g<ESC>Fsi
 " replace in line
-nnoremap <leader>rl q:i.s///g<left><left><left>
+nnoremap <leader>r q:i.s///g<left><left><left>
 " replace in visual selection
+vnoremap <leader>r q:is///g<ESC>3ha
+" replace in entire file
+" nnoremap <leader>R q:i%s///g<ESC>2F/i
+nnoremap <leader>ra q:i%s///g<ESC>2F/i
 " remove italics tags
 nnoremap <leader>rmi :%s/<\/\?i>//g<CR>
 nnoremap <leader>rs :res 
 " reload vim config
 nnoremap <leader>rv :source $MYVIMRC<CR>
-vnoremap <leader>r q:is///g<ESC>3ha
-" replace in entire file
-nnoremap <leader>R q:i%s///g<ESC>2F/i
 vnoremap <leader>s :sort<CR>
 nnoremap <leader>sc :set spell spelllang=en_us<CR>
 " run current file in shell
--- a/dot_xinitrc.tmpl
+++ b/dot_xinitrc.tmpl
@@ -7,7 +7,8 @@ xmodmap ~/.Xmodmap
 {{ else }}
 xmodmap ~/.Xmodmap-laptop
 {{ end }}
-redshift -O 2000
+# redshift -O 2000
+redshift -O 3000
 xset r rate $XSET_DELAY $XSET_RATE
 # exec /home/kevin/Downloads/dwm/reload-dwm.sh

--- a/scripts/executable_twitchy-game
+++ b/scripts/executable_twitchy-game
@@ -0,0 +1,8 @@
+#!/usr/bin/fish
+
+set TEMP_CSV /tmp/twitchy-fortnite.csv
+set HEADER "Game,Channel,Viewers,Uptime,Title"
+
+echo $HEADER > $TEMP_CSV
+twitchy --non-interactive >> $TEMP_CSV
+xsv search -is1 $argv[1] $TEMP_CSV | xsv sort -NRs3 | xsv table