Compare commits
10 Commits
46a749bc24
...
07fce8fd3f
Author | SHA1 | Date |
---|---|---|
Sam Greytalon | 07fce8fd3f | |
Sam Greytalon | 79d4f90021 | |
Sam Greytalon | 938e066003 | |
Sam Greytalon | 6291bf288a | |
Sam Greytalon | 000ec85709 | |
Sam Greytalon | fcc3421283 | |
Sam Greytalon | 16f91967c4 | |
Sam Greytalon | 80dc1c58f0 | |
Sam Greytalon | 8edf1581d4 | |
Sam Greytalon | 3ae22bef36 |
|
@ -4,9 +4,10 @@ set -x PATH "$HOME/bin:$PATH"
|
||||||
|
|
||||||
alias sudo="doas"
|
alias sudo="doas"
|
||||||
|
|
||||||
alias nvim="vim -u ~/.config/vim/vimrc"
|
alias vim="nvim"
|
||||||
alias vim="vim -u ~/.config/vim/vimrc"
|
set -x EDITOR "nvim"
|
||||||
set -x EDITOR "vim -u ~/.config/vim/vimrc"
|
|
||||||
|
alias datenow="date '+%Y-%m-%d'"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -48,8 +49,10 @@ if status --is-interactive
|
||||||
alias g="git"
|
alias g="git"
|
||||||
|
|
||||||
mkdir -p ~/.local
|
mkdir -p ~/.local
|
||||||
if [ (expr (date '+%s') - (cat "$HOME/.local/last_shell" 2>/dev/null || echo 0)) -gt "28800" ]
|
set time_diff (expr (date '+%s') - (cat "$HOME/.local/last_shell" 2>/dev/null || echo 0))
|
||||||
timeout 5 git sit && date '+%s' > "$HOME/.local/last_shell"
|
if [ "$time_diff" -gt "28800" ]
|
||||||
|
[ -d "$HOME/tmp" ] && rm -rf "$HOME/tmp/*"
|
||||||
|
git sit && date '+%s' > "$HOME/.local/last_shell"
|
||||||
echo ""
|
echo ""
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = main
|
defaultBranch = main
|
||||||
[user]
|
[user]
|
||||||
name = Sam Greytalon
|
name = Sam Talonborn
|
||||||
email = sam@oaktal.com
|
email = sam@oaktal.com
|
||||||
[pull]
|
[pull]
|
||||||
rebase = false
|
rebase = false
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
source ~/.config/vim/vimrc
|
|
@ -1,6 +1,5 @@
|
||||||
nnoremap gf :let @a='../'.expand('%')<CR>vi>y<Esc>:tabnew <C-R>"<CR>:let @"=@a
|
nnoremap gl vi)y<Esc>:tabnew <C-R>"<CR>
|
||||||
vnoremap gf y<Esc>:let @a='../'.expand('%')<CR>:tabnew <C-R>"<CR>:let @"=@a
|
vnoremap gl y<Esc>:tabnew <C-R>"<CR>
|
||||||
nnoremap mf viwc[]<Esc>hpla(<>)<Left><Left><C-R>=expand('%')<CR><Esc>F/l"_dt>hpa.md<Esc>
|
nnoremap ml viwc[]<Esc>hpla()<Esc>hpa.md<Esc>
|
||||||
vnoremap mf c[]<Esc>hpla(<>)<Left><Left><C-R>=expand('%')<CR><Esc>F/l"_dt>hpa.md<Esc>
|
vnoremap ml c[]<Esc>hpla()<Esc>hpa.md<Esc>
|
||||||
nnoremap ml :r!grep -Rl '' .<Left><Left><Left>
|
|
||||||
vnoremap ml y<Esc>:execute 'r!grep -Rl '.shellescape(@", 1).' .'<CR>
|
|
||||||
|
|
|
@ -6,6 +6,10 @@ autocmd FileType markdown set columns=80
|
||||||
autocmd FileType markdown set linebreak
|
autocmd FileType markdown set linebreak
|
||||||
autocmd FileType markdown setlocal comments+=">"
|
autocmd FileType markdown setlocal comments+=">"
|
||||||
|
|
||||||
|
autocmd FileType gemtext setlocal wrap
|
||||||
|
autocmd FileType gemtext setlocal linebreak
|
||||||
|
autocmd FileType gemtext setlocal columns=80
|
||||||
|
|
||||||
autocmd FileType text setlocal textwidth=120
|
autocmd FileType text setlocal textwidth=120
|
||||||
autocmd FileType text setlocal formatoptions=tcroqawn
|
autocmd FileType text setlocal formatoptions=tcroqawn
|
||||||
autocmd FileType text,markdown,gemtext set spell
|
autocmd FileType text,markdown,gemtext set spell
|
||||||
|
|
|
@ -4,4 +4,4 @@ Host *
|
||||||
IgnoreUnknown UseKeychain
|
IgnoreUnknown UseKeychain
|
||||||
UseKeychain yes
|
UseKeychain yes
|
||||||
AddKeysToAgent yes
|
AddKeysToAgent yes
|
||||||
IdentityFile ~/.ssh/id_rsa
|
IdentityFile ~/.ssh/id_ed25519
|
||||||
|
|
|
@ -7,7 +7,7 @@ dest="$3"
|
||||||
root="$(pwd)"
|
root="$(pwd)"
|
||||||
|
|
||||||
rm -r "$dest"
|
rm -r "$dest"
|
||||||
cp -r "$src" "$dest"
|
rsync -a --exclude '.*' "$src" "$dest"
|
||||||
|
|
||||||
files="$(find "$dest" -type f)"
|
files="$(find "$dest" -type f)"
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,20 @@ while [ $# -ne 0 ]; do
|
||||||
echo "$time $file"
|
echo "$time $file"
|
||||||
done | sort -k 1,1 | awk '{ $1="" }1')"
|
done | sort -k 1,1 | awk '{ $1="" }1')"
|
||||||
;;
|
;;
|
||||||
|
TITLE)
|
||||||
|
files="$(echo "$files" | while read -r file; do
|
||||||
|
path="$(echo "$file" | awk '{ print $1 }')"
|
||||||
|
title="$(cat "$file" | sed '1!d')"
|
||||||
|
echo "$path $title"
|
||||||
|
done | sort -k 2 | awk '{ print $1 }')"
|
||||||
|
;;
|
||||||
|
SUBTITLE)
|
||||||
|
files="$(echo "$files" | while read -r file; do
|
||||||
|
path="$(echo "$file" | awk '{ print $1 }')"
|
||||||
|
subtitle="$(cat "$file" | sed '2!d')"
|
||||||
|
echo "$path $subtitle"
|
||||||
|
done | sort -k 2 | awk '{ print $1 }')"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
shift
|
shift
|
||||||
|
@ -75,6 +89,12 @@ while [ $# -ne 0 ]; do
|
||||||
echo "$file $(head -n1 "$path" 2> /dev/null | sed 's/^#//g' | sed 's/^ //g')"
|
echo "$file $(head -n1 "$path" 2> /dev/null | sed 's/^#//g' | sed 's/^ //g')"
|
||||||
done)"
|
done)"
|
||||||
;;
|
;;
|
||||||
|
SUBTITLE)
|
||||||
|
files="$(echo "$files" | while read -r file; do
|
||||||
|
[ "$file" = "" ] && continue
|
||||||
|
path="$(echo "$file" | awk '{ print $1 }')"
|
||||||
|
echo "$file $(cat "$path" 2> /dev/null | sed '2!d' | sed 's/^##//g' | sed 's/^ //g')"
|
||||||
|
done)"
|
||||||
esac
|
esac
|
||||||
|
|
||||||
shift
|
shift
|
||||||
|
|
Loading…
Reference in New Issue