diff options
| -rw-r--r-- | alias | 12 | ||||
| -rw-r--r-- | tigrc | 1 | ||||
| -rw-r--r-- | tools/osm/osm | 3 |
3 files changed, 11 insertions, 5 deletions
| @@ -113,7 +113,7 @@ alias pfl='pacman -Fl' | |||
| 113 | alias pqe='pacman -Qqe' | 113 | alias pqe='pacman -Qqe' |
| 114 | alias pR='sudo pacman -R' | 114 | alias pR='sudo pacman -R' |
| 115 | psi() { | 115 | psi() { |
| 116 | pqe | grep $1 >/dev/null && echo -e "$(tput setaf 13)[Installed]$(tput sgr0)" | 116 | [[ $(pacman -Qqe $1) != '' ]] 2>/dev/null && echo -e "$(tput setaf 13)[Installed]$(tput sgr0)" |
| 117 | pacman -Si $1 | 117 | pacman -Si $1 |
| 118 | } | 118 | } |
| 119 | 119 | ||
| @@ -243,6 +243,8 @@ alias adb.list='adb shell dumpsys package d' | |||
| 243 | alias rmcache='rm -rf ~/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/*' | 243 | alias rmcache='rm -rf ~/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/*' |
| 244 | alias adb.screenshot='DIR=/sdcard/Pictures/Screenshots/; adb pull $DIR/`adb shell ls -t $DIR | head -1` .' | 244 | alias adb.screenshot='DIR=/sdcard/Pictures/Screenshots/; adb pull $DIR/`adb shell ls -t $DIR | head -1` .' |
| 245 | alias adb.camera='DIR=/sdcard/DCIM/Camera; adb pull $DIR/`adb shell ls -t $DIR | head -1` .' | 245 | alias adb.camera='DIR=/sdcard/DCIM/Camera; adb pull $DIR/`adb shell ls -t $DIR | head -1` .' |
| 246 | alias adb.camera='DIR=/sdcard/DCIM/Camera; adb pull $DIR/`adb shell ls -t $DIR | head -1` .' | ||
| 247 | alias adb.input='adb shell input text' | ||
| 246 | adb.push() { | 248 | adb.push() { |
| 247 | adb push $1 /sdcard/Download | 249 | adb push $1 /sdcard/Download |
| 248 | } | 250 | } |
| @@ -306,15 +308,17 @@ alias xo='xsel -ob' | |||
| 306 | alias xl='history | tail -1 | grep -oP "^\s*[0-9]+\s\s\K.*" | xsel -ib && echo Copied to clipboard && xsel -ob' | 308 | alias xl='history | tail -1 | grep -oP "^\s*[0-9]+\s\s\K.*" | xsel -ib && echo Copied to clipboard && xsel -ob' |
| 307 | 309 | ||
| 308 | # image | 310 | # image |
| 309 | image_vertical() { | 311 | image.vertical() { |
| 310 | suffix=${1##*.} | 312 | suffix=${1##*.} |
| 311 | convert "$@" -append $(basename -s .$suffix $1)-$(basename -s .$suffix ${@: -1}).${format:-$suffix} | 313 | convert "$@" -append $(basename -s .$suffix $1)-$(basename -s .$suffix ${@: -1}).${format:-$suffix} |
| 312 | } | 314 | } |
| 313 | image_horizontal() { | 315 | image.horizontal() { |
| 314 | convert "$@" +append output.png | 316 | convert "$@" +append output.png |
| 315 | } | 317 | } |
| 316 | image_from_data_url() { | 318 | image.from_data_url() { |
| 319 | [[ $1 == '' ]] && echo File name needed && return 1 | ||
| 317 | xsel -ob | sed -E 's/^.+,//' | base64 -d >$1 | 320 | xsel -ob | sed -E 's/^.+,//' | base64 -d >$1 |
| 321 | identify $1 | ||
| 318 | } | 322 | } |
| 319 | 323 | ||
| 320 | # thunderbird | 324 | # thunderbird |
| @@ -57,6 +57,7 @@ bind generic w :toggle ignore-case | |||
| 57 | # see reflog, reset refernece | 57 | # see reflog, reset refernece |
| 58 | bind generic gl ?git checkout HEAD@{"%(prompt Enter HEAD@{} number: )"} | 58 | bind generic gl ?git checkout HEAD@{"%(prompt Enter HEAD@{} number: )"} |
| 59 | bind generic gL ?git reset --hard HEAD@{"%(prompt Enter HEAD@{} number: )"} | 59 | bind generic gL ?git reset --hard HEAD@{"%(prompt Enter HEAD@{} number: )"} |
| 60 | bind reflog c ?git checkout %(commit) | ||
| 60 | 61 | ||
| 61 | # highlight diff without +/- | 62 | # highlight diff without +/- |
| 62 | # set diff-show-signs = false | 63 | # set diff-show-signs = false |
diff --git a/tools/osm/osm b/tools/osm/osm index a595fb7..344f906 100644 --- a/tools/osm/osm +++ b/tools/osm/osm | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | #! /bin/sh | 1 | #! /bin/sh |
| 2 | 2 | ||
| 3 | #export OSM_SERVER=https://master.apis.dev.openstreetmap.org | 3 | export OSM_TEST_SERVER=https://master.apis.dev.openstreetmap.org |
| 4 | export OSM_SERVER=https://api.openstreetmap.org | 4 | export OSM_SERVER=https://api.openstreetmap.org |
| 5 | export OSM_TES_SERVER=https://api.openstreetmap.org | ||
| 5 | 6 | ||
| 6 | export OSM_API=$OSM_SERVER/api/0.6 | 7 | export OSM_API=$OSM_SERVER/api/0.6 |
| 7 | export OSM_USER_PASSWD=$(cat $SETTING_DIR/tokens/osm 2>/dev/null) | 8 | export OSM_USER_PASSWD=$(cat $SETTING_DIR/tokens/osm 2>/dev/null) |