diff --git a/Makefile b/Makefile index fa224ba..bafa210 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,11 @@ auto-images/auto-shell-%.svg: auto-images/%.out auto-images/%.out: shell/% mkdir -p auto-images shell/$* | bin/tidy | bin/prompt > $@ - + +auto-images/auto-download-%: + mkdir -p auto-images + bin/download-image $@ + open: main.pdf setsid zathura main.pdf & diff --git a/bin/download-image b/bin/download-image new file mode 100755 index 0000000..486ada5 --- /dev/null +++ b/bin/download-image @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +name="$1" +basename="$(basename "$name")" +b64="${basename%%.*}" +b64="${b64##*-}" +url="$(echo -n "$b64" | base64 -d)" +curl -L -o "$name" "$url" + diff --git a/main.latex b/main.latex index d81ceef..24d5bc4 100644 --- a/main.latex +++ b/main.latex @@ -1,6 +1,5 @@ \documentclass{beamer} - \usepackage{pgfpages} %showNotes%\setbeameroption{show notes on second screen=right} %\setbeamertemplate{note page}{\pagecolor{yellow!5}\insertnote} @@ -1038,22 +1037,13 @@ can really help. } \end{frame} -\begin{frame} - \frametitle{Git $\ne$ GitHub} - \begin{itemize} - \item GitHub is one of many services that offer hosting for git remotes - \item It is owned by Microsoft now - \item It is not open source - \item You can't self host it - \item It it very popular - \end{itemize} - \note{% - } -\end{frame} - \begin{frame} \frametitle{Useful supporting tools} \framesubtitle{Bat} + \begin{center} + \includegraphics[width=\textwidth,height=0.8\textheight,keepaspectratio]{auto-download-aHR0cHM6Ly9jYW1vLmdpdGh1YnVzZXJjb250ZW50LmNvbS82N2U0NGY0YTY4MTUwMzI1Zjc0YjNhNDY4MjBiNzQ3M2ZmN2I5MWE2LzY4NzQ3NDcwNzMzYTJmMmY2OTJlNjk2ZDY3NzU3MjJlNjM2ZjZkMmYzMjZjNTM1NzM0NTI0NTJlNzA2ZTY3.png} + \end{center} + \href{https://github.com/sharkdp/bat}{https://github.com/sharkdp/bat} \note{% Bat is described as cat with wings. @@ -1066,6 +1056,9 @@ can really help. \begin{frame} \frametitle{Useful supporting tools} \framesubtitle{RigGrep / Fd} + \href{https://github.com/sharkdp/fd}{https://github.com/sharkdp/fd} + + \href{https://github.com/BurntSushi/ripgrep}{https://github.com/BurntSushi/ripgrep} \note{% Alternatives to grep and find @@ -1078,6 +1071,10 @@ can really help. \begin{frame} \frametitle{Useful supporting tools} \framesubtitle{Delta} + \begin{center} + \includegraphics[width=\textwidth,height=0.6\textheight,keepaspectratio]{auto-download-aHR0cHM6Ly91c2VyLWltYWdlcy5naXRodWJ1c2VyY29udGVudC5jb20vNTIyMDUvNjUyNDg1MjUtMzIyNTA0ODAtZGFlYS0xMWU5LTk5NjUtMWEwNWM2YTRiZGY0LnBuZw==.png} + \end{center} + \href{https://github.com/dandavison/delta}{https://github.com/dandavison/delta} \note{% This is a tool that can make your diff output look better. } @@ -1085,42 +1082,68 @@ can really help. \begin{frame} \frametitle{Useful supporting tools} - \framesubtitle{Shell Integration} + \framesubtitle{BFG Repo Cleaner} + You'll need something like this when you realise you have just committed your ssh keys + + \href{https://rtyley.github.io/bfg-repo-cleaner/}{https://rtyley.github.io/bfg-repo-cleaner/} \note{% - Takes 2 forms. Prompt and completion + For the time that you accidentally commit your ssh keys. + + I accidentally committed a database for an Woocommerce site. } \end{frame} \begin{frame} \frametitle{Useful supporting tools} - \framesubtitle{Pass} + \framesubtitle{Shell Integration} + Git ships with completion for bash, zsh and tcsh. You may need to source it in the relevant rc + file. + + Prompt customisation is available out of the box for bash and zsh. \note{% - Password manager + If you haven't ever tried zsh, give it a shot. Tab completion is so much more useful than + Bash's. } \end{frame} \begin{frame} \frametitle{Useful supporting tools} - \framesubtitle{BFG Repo Cleaner} + \framesubtitle{Pass} + \begin{itemize} - \item You'll need something like this when you realise you have just committed your ssh keys - \item Mistakes happen + \item Password Manager + \item Uses Git for keeping track of history + \item Syncs using Git + \item Everything is encrypted with a GPG key + \item Has compatible android, ios and browser apps. \end{itemize} - \note{% - For the time that you accidentally commit your ssh keys. - I accidentally committed a database for an Woocommerce site. + \href{https://www.passwordstore.org/}{https://www.passwordstore.org/} + + \note{% + A password manager that uses Git for sync and history. } \end{frame} + \begin{frame} \frametitle{Useful supporting tools} \framesubtitle{tldr} - Git's built in help is very thorough - sometimes you don't want that though. + + The man page for git pull is over 700 lines. + + \begin{center} + \includegraphics[width=\textwidth,height=0.8\textheight,keepaspectratio]{auto-shell-tldr.pdf} + \end{center} + + \href{https://github.com/tldr-pages/tldr}{https://github.com/tldr-pages/tldr} + \note{% - For the time that you accidentally commit your ssh keys. + Sometimes incredibly thorough documentation isn't what you want. Sometimes you know the + command you need but you can't remember exactly how to use it. + + This is not specific to git commands, it covers a LOT. - I accidentally committed a database for an Woocommerce site. } \end{frame} diff --git a/shell/tldr b/shell/tldr new file mode 100755 index 0000000..2a771d9 --- /dev/null +++ b/shell/tldr @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +echo '$ tldr git-pull' +tldr git-pull