Makeshift

How to sync Obsidian with Git on Android

Limitations

• If Termux is closed in the background by Android, the cron service will stop updating your repository and you must open Termux again. Refer to instructions for your device model to disable the killing of certain background applications.
• This may negatively affect your devices battery life. I'm not entirely sure yet.

Setup

• Install Termux – Apps on Google Play

triangletodd

On the host

Ensure these modules are loaded

cat /proc/sys/net/bridge/bridge-nf-call-iptables

Disable swap

sysctl vm.swappiness=0
swapoff -a

akhenakh

apiVersion: apps/v1
kind: Deployment
metadata:
  labels:
    app: traefik
  name: traefik
  namespace: default
spec:
  replicas: 1
  selector:

davialexandre

{
  "background" : "#282828",
  "black" : "#282828",
  "blue" : "#458588",
  "brightBlack" : "#928374",
  "brightBlue" : "#83A598",
  "brightCyan" : "#8EC07C",
  "brightGreen" : "#B8BB26",
  "brightPurple" : "#D3869B",
  "brightRed" : "#FB4934",

mgoral

! "Enabled modi" Set from: Default
! rofi.modi:                           window,run,ssh
! "Window opacity" Set from: Default
! rofi.opacity:                        100
! "Window width" Set from: File
rofi.width:                          20
! "Number of lines" Set from: Default
! rofi.lines:                          15
! "Number of columns" Set from: Default
! rofi.columns:                        1

mattratleph

vimdiff cheat sheet

##git mergetool

In the middle file (future merged file), you can navigate between conflicts with ]c and [c.

Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).

:diffupdate (to remove leftover spacing issues)

:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)