dotfiles

commit ff4d1c1a6b0cf464ac38f8d9613661eadce59b6c
parent a6b9622203e184fc9faa86f2530e101a11a86d74
Author: finwo <finwo@pm.me>
Date:   Mon, 10 Oct 2022 15:02:58 +0200

After sync-conflict without registered commits

Diffstat:
M
git/home/.gitconfig
 | 
4
++--
M
neovim/home/.vimrc
 | 
2
+-
A
slip/home/slip.sh
 | 
56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M
zsh/home/.zshrc
 | 
47
++++++++++++++++++++++++++++++++++++++++++-----

4 files changed, 101 insertions(+), 8 deletions(-)
diff --git a/git/home/.gitconfig b/git/home/.gitconfig
@@ -6,8 +6,8 @@
 [credential]
   helper = store
 [pull]
-	rebase = false
+  rebase = false
 [init]
-	defaultBranch = master
+  defaultBranch = master
 [core]
 	ignorecase = false
diff --git a/neovim/home/.vimrc b/neovim/home/.vimrc
@@ -147,6 +147,7 @@ colorscheme gruvbox " nice theme
 nnoremap <leader>c :nohlsearch<cr>
 nnoremap <leader>s :Ag<cr>
 nnoremap <leader>o :Files<cr>
+nnoremap <silent> <leader><enter> :Buffers<cr>
 nnoremap <tab> :bnext<cr>
 nnoremap <s-tab> :bprevious<cr>
 nnoremap <c-w> :BD<cr>
@@ -183,7 +184,6 @@ let g:fzf_buffers_jump = 1
 let g:fzf_commits_log_options = '--graph --color=always --format="%C(auto)%h%d %s %C(black)%C(bold)%cr"'
 let g:fzf_tags_command = 'ctags -R'
 let g:fzf_commands_expext = 'alt-enter,ctrl-x'
-nnoremap <silent> <leader><enter> :Buffers<cr>
 " }}}
 " NERDTree {{{
 
diff --git a/slip/home/slip.sh b/slip/home/slip.sh
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+
+_term() {
+	echo "Caught SIGTERM"
+	kill -TERM "$child" 2>/dev/null
+}
+
+DEV=/dev/ttyS2
+SPD=1500000
+MOD=client
+
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    -s|--speed)
+      shift
+      SPD=$1
+      ;;
+    -d|--dev|--tty)
+      shift
+      DEV=$1
+      ;;
+    -m|--mode)
+      shift
+      MOD=$1
+      ;;
+  esac
+  shift
+done
+
+trap _term SIGTERM
+sudo stty -F $DEV $SPD
+sudo slattach -L -s $SPD -p cslip $DEV &
+child=$!
+
+echo "nameserver 127.0.0.1" | sudo tee -a /etc/resolv.conf
+echo "nameserver 1.1.1.1"   | sudo tee -a /etc/resolv.conf
+echo "nameserver 1.0.0.1"   | sudo tee -a /etc/resolv.conf
+echo "nameserver 8.8.8.8"   | sudo tee -a /etc/resolv.conf
+echo "nameserver 8.8.4.4"   | sudo tee -a /etc/resolv.conf
+
+case "$MOD" in
+  client)
+    sudo ifconfig sl0 192.168.16.2 pointtopoint 192.168.16.1 up
+    sudo route add default dev sl0
+    ;;
+  host)
+    PHY=$(route -n | grep UG | tr ' ' '\n' | tail -1)
+    sudo iptables -t nat -A POSTROUTING -o $PHY -j MASQUERADE
+    sudo iptables -A FORWARD -i sl0 -o $PHY -j ACCEPT
+    sudo iptables -A FORWARD -i $PHY -o sl0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
+    sudo iptables -A FORWARD -j DROP
+    sudo ifconfig sl0 192.168.16.1 pointopoint 192.168.16.2 up
+    ;;
+esac
+
+wait "$child"
diff --git a/zsh/home/.zshrc b/zsh/home/.zshrc
@@ -3,6 +3,7 @@
 
 # Homebrew {{{
 
+# Linuxbrew
 if [ -d /home/linuxbrew/.linuxbrew ]; then
   # eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)
   export HOMEBREW_PREFIX="/home/linuxbrew/.linuxbrew";
@@ -13,6 +14,11 @@ if [ -d /home/linuxbrew/.linuxbrew ]; then
   export INFOPATH="/home/linuxbrew/.linuxbrew/share/info${INFOPATH+:$INFOPATH}";
 fi
 
+# openjdk 11 on osx
+if [ -d "/opt/homebrew/opt/openjdk@11/bin" ]; then
+  export PATH="/opt/homebrew/opt/openjdk@11/bin:$PATH"
+fi
+
 # }}}
 # History {{{
 
@@ -38,6 +44,11 @@ function version() {
 }
 
 # }}}
+# Local binaries {{{
+if [ -d "${HOME}/.local/bin" ]; then
+  export PATH="${HOME}/.local/bin:${PATH}"
+fi
+# }}}
 # OSX coreutil fixes {{{
 
 command -v gcp &>/dev/null && alias cp="gcp"
@@ -77,6 +88,11 @@ if [[ -s '/etc/zsh_command_not_found' ]]; then
   source '/etc/zsh_command_not_found'
 fi
 
+# Typo corrector
+if command -v thefuck &>/dev/null; then
+  eval "$(thefuck --alias)"
+fi
+
 # }}}
 # Tab-completion {{{
 
@@ -167,11 +183,6 @@ if [ -d "${HOME}/go/bin" ]; then
   export PATH="${HOME}/go/bin:${PATH}"
 fi
 # }}}
-# Python binaries {{{
-if [ -d "${HOME}/.local/bin" ]; then
-  export PATH="${HOME}/.local/bin:${PATH}"
-fi
-# }}}
 # Symfony {{{
 if [ -d "${HOME}/.symfony/bin" ]; then
   export PATH="${HOME}/.symfony/bin:${PATH}"
@@ -285,4 +296,30 @@ fi
 export PNPM_HOME="/home/finwo/.local/share/pnpm"
 export PATH="$PNPM_HOME:$PATH"
 # }}}
+# Android Studio {{{
+
+# On a mac
+if [ -d ~/Library/Android/sdk ]; then
+  export ANDROID_HOME=~/Library/Android/sdk
+  export ANDROID_SDK_ROOT=~/Library/Android/sdk
+  export ANDROID_AVD_HOME=~/.android/avd
+fi
+
+# On linux
+if [ -d ~/Android/Sdk ]; then
+  export ANDROID_HOME=~/Android/Sdk
+  export ANDROID_SDK_ROOT=~/Android/Sdk
+  export ANDROID_AVD_HOME=~/.android/avd
+fi
 
+# }}}
+# kind completion {{{
+if command -v kind &>/dev/null; then
+  eval "$(kind completion zsh)"
+fi
+# }}}
+# Difftastic in git {{{
+if command -v difft &>/dev/null; then
+  export GIT_EXTERNAL_DIFF=difft
+fi
+# }}}