Skip to content

Commit 8936892

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents af898cf + 98247bf commit 8936892

4 files changed

Lines changed: 17 additions & 7 deletions

File tree

.functions

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,12 @@ todatauri () {
179179
}
180180

181181

182-
# lazy initialize nvm
182+
##
183+
# lazy initialize nvm, rvm, miniconda
183184
# https://news.ycombinator.com/item?id=33582219
184-
# Alternatives:
185+
##
186+
187+
# npm alternatives:
185188
# * i kinda like volta more but i forget it.
186189
# * https://github.com/Schniz/fnm also exists.
187190
# * https://asdf-vm.com/ has lots of fans. i want to try it.

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,11 @@ Rust folks have made a few things that are changing things.
118118
- https://github.com/ogham/exa is better `ls` and gets all the trapd00r/LS_COLORS stuff etc.
119119
- https://github.com/bigH/git-fuzzy interactive git thing. deprecates my `git recent` script. and probably some other things.
120120

121-
Also I'd like to migrate to using homesick or https://www.atlassian.com/git/tutorials/dotfiles
121+
### Dotfiles mgmt todo
122+
Also I'd like to migrate to using one of these:
123+
- homesick or
124+
- https://www.atlassian.com/git/tutorials/dotfiles
125+
- https://github.com/nix-community/home-manager
126+
- https://www.chezmoi.io/
122127

123128
also interested in https://github.com/dandavison/open-in-editor

fish/functions.fish

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ end
3838

3939
function stab --description "stabalize a video"
4040
set -l vid $argv[1]
41-
ffmpeg -i "$vid" -vf vidstabdetect=stepsize=32 -f null -;
42-
ffmpeg -i "$vid" -vf vidstabtransform=interpol=bicubic "$vid.stab.mkv";
43-
ffmpeg -i "$vid" -i "$vid.stab.mkv" -filter_complex vstack "$vid.stacked.mkv"
41+
ffmpeg -i "$vid" -vf vidstabdetect=stepsize=32:result="$vid.trf" -f null -;
42+
ffmpeg -i "$vid" -b:v 5700K -vf vidstabtransform=interpol=bicubic:input="$vid.trf" "$vid.mkv"; # :optzoom=2 seems nice in theory but i dont love it. kinda want a combo of 1 and 2. (dont zoom in past the static zoom level, but adaptively zoom out to full when possible)
43+
ffmpeg -i "$vid" -i "$vid.mkv" -b:v 3000K -filter_complex hstack "$vid.stack.mkv"
44+
# vid=Dalton1990/Paultakingusaroundthehouseagai ffmpeg -i "$vid.mp4" -i "$vid.mkv" -b:v 3000K -filter_complex hstack $HOME/Movies/"Paultakingusaroundthehouseagai.stack.mkv"
45+
command rm $vid.trf
4446
end
4547

4648

fish/path.fish

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set -l PATH_DIRS (cat "$HOME/.extra" | grep "^PATH" | \
1111
sed "s/~\//{\$HOME}\//")
1212

1313

14-
set -l PA ""
14+
set -l PA $PATH
1515

1616

1717

0 commit comments

Comments
 (0)