Merge branch 'master' of https://github.com/Matir/skel

bin/install_tool

@@ -140,6 +140,25 @@ case ${TOOL} in
     tar zx -C ${DESTDIR} -f /tmp/mitmproxy.tar.gz
     rm /tmp/mitmproxy.tar.gz
     ;;
+  esp)
+    src="https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-61-gab8375a-5.2.0.tar.gz"
+    download ${src} /tmp/esp32.tar.gz
+    mkdir -p ${DESTDIR}
+    tar zx -C ${DESTDIR} -f /tmp/esp32.tar.gz
+    rm /tmp/esp32.tar.gz
+    git clone --recursive https://github.com/espressif/esp-idf.git ${DESTDIR}/esp-idf
+    ;;
+  dex2jar)
+    src="https://github.com/pxb1988/dex2jar/releases/download/2.0/dex-tools-2.0.zip"
+    download ${src} /tmp/dex2jar.zip
+    tmpd=`mktemp -d`
+    unzip -d ${tmpd} /tmp/dex2jar.zip
+    mv ${tmpd}/* ${DESTDIR}
+    rm /tmp/dex2jar.zip
+    rm -rf ${tmpd}
+    rm ${DESTDIR}/*.bat
+    chmod +x ${DESTDIR}/*.sh
+    ;;
   *)
     echo "Unknown tool: ${TOOL}" >/dev/stderr
     exit 1

dotfiles/config/i3/config

@@ -87,6 +87,10 @@ bindsym $mod+Shift+8 move container to workspace 8
 bindsym $mod+Shift+9 move container to workspace 9
 bindsym $mod+Shift+0 move container to workspace 10
 
+# Move workspaces between monitors
+bindsym $mod+Shift+greater move workspace to output right
+bindsym $mod+Shift+less move workspace to output left
+
 # reload the configuration file
 bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
@@ -126,9 +130,10 @@ bindsym $alt+Control+Left workspace prev
 
 # i3 lock
 exec --no-startup-id ~/bin/i3lock.sh &
-bindsym $mod+l exec "i3lock -c 000000 -d && (sleep 2; xset dpms force off) &"
+bindsym $mod+l exec \
+  bash -c "i3lock -c 000000 -d && (sleep 2 && xset dpms force off) &"
 bindsym $alt+Control+l exec \
-  "i3lock -c 000000 -d && (sleep 2; xset dpms force off) &"
+  bash -c "i3lock -c 000000 -d && (sleep 2 && xset dpms force off) &"
 
 # things to start quickly
 bindsym $mod+g exec /usr/bin/google-chrome-beta --password-store=gnome
@@ -151,15 +156,15 @@ bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 10
 set $scrotformat %F-%T.png
 set $screendir ~/Pictures/Screenshots
 # whole screen
-bindsym Print exec --no-startup-id \
+bindsym --release Print exec --no-startup-id \
   mkdir -p $screendir && \
   /usr/bin/scrot $screendir/$scrotformat
 # current window
-bindsym Shift+Print exec --no-startup-id \
+bindsym --release Shift+Print exec --no-startup-id \
   mkdir -p $screendir && \
   /usr/bin/scrot -u $screendir/$scrotformat
 # selection
-bindsym --release $alt+Print exec --no-startup-id \
+bindsym --release $alt+Sys_Req exec --no-startup-id \
   mkdir -p $screendir && \
   /usr/bin/scrot -s $screendir/$scrotformat
 

dotfiles/vimrc

@@ -8,6 +8,7 @@ if filereadable(glob("~/.vim/bundle/Vundle.vim/README.md"))
   call vundle#begin()
   Plugin 'gmarik/Vundle.vim'
   Plugin 'nvie/vim-flake8'
+  Plugin 'tell-k/vim-autopep8'
   Plugin 'tpope/vim-fugitive'
   Plugin 'mileszs/ack.vim'
   Plugin 'tpope/vim-unimpaired'
@@ -18,6 +19,7 @@ if filereadable(glob("~/.vim/bundle/Vundle.vim/README.md"))
   Plugin 'altercation/vim-colors-solarized'
   Plugin 'vimoutliner/vimoutliner'
   Plugin 'PotatoesMaster/i3-vim-syntax'
+  Plugin 'Matt-Deacalion/vim-systemd-syntax'
   call vundle#end()
 endif
 

dotfiles/zsh_custom/plugins/jekyll/jekyll.plugin.zsh

@@ -1,4 +1,14 @@
-JEKYLL_DIR=${JEKYLL_DIR:-${HOME}/Projects/blog}
+function _jekyll_locate_dir {
+  if [[ -n "${JEKYLL_DIR}" && -f "${JEKYLL_DIR}" ]] ; then
+    echo ${JEKYLL_DIR}
+  elif test -f `pwd`/_config.yml ; then
+    pwd
+  elif test -f ${HOME}/Projects/blog/_config.yml ; then
+    echo ${HOME}/Projects/blog
+  else
+    echo "Jekyll instance not found!" >&2
+  fi
+}
 
 function _jekyll_set_date {
   local FILENAME
@@ -11,20 +21,24 @@ function _jekyll_set_date {
 function _jekyll_find_post {
   local files
   local fname
+  local jekyll_dir
+
+  jekyll_dir="${3}"
+
   if [ -f "${1}" ] ; then
     printf -- "${1}"
     return 0
   fi
-  if [ -f "${JEKYLL_DIR}/_posts/${1}" ] ; then
+  if [ -f "${jekyll_dir}/_posts/${1}" ] ; then
-    printf -- "${JEKYLL_DIR}/_posts/${1}"
+    printf -- "${jekyll_dir}/_posts/${1}"
     return 0
   fi
-  if [ -f "${JEKYLL_DIR}/_drafts/${1}" ] ; then
+  if [ -f "${jekyll_dir}/_drafts/${1}" ] ; then
-    printf -- "${JEKYLL_DIR}/_drafts/${1}"
+    printf -- "${jekyll_dir}/_drafts/${1}"
     return 0
   fi
   fname=${2:-${1}}
-  files=(${JEKYLL_DIR}/_posts/*${fname}* ${JEKYLL_DIR}/_drafts/*${fname}*)
+  files=(${jekyll_dir}/_posts/*${fname}* ${jekyll_dir}/_drafts/*${fname}*)
   if [ ${#files} -eq "0" ] ; then
     echo "No post found for ${fname}" >&2
     return 1
@@ -45,6 +59,13 @@ function jekyll {
   local FILENAME
   local DATE
   local NEWNAME
+  local JEKYLL_DIR
+
+  JEKYLL_DIR=`_jekyll_locate_dir`
+
+  if [ -z "${JEKYLL_DIR}" ] ; then
+    return 1
+  fi
 
   JTEMPLATE="---\n"
   JTEMPLATE+="layout: post\n"
@@ -106,7 +127,7 @@ function jekyll {
         echo "slug is required."
         return 1
       fi
-      FILENAME=$(_jekyll_find_post "${TITLE}" "${SLUG}")
+      FILENAME=$(_jekyll_find_post "${TITLE}" "${SLUG}" "${JEKYLL_DIR}")
       if [ $? -ne 0 ] ; then
         return
       fi

dotfiles/zshrc

@@ -62,3 +62,12 @@ fi
 
 # Load any local settings
 if [ -e $HOME/.zshrc.local ] ; then source $HOME/.zshrc.local ; fi
+
+function start_esp {
+  if [ ! -d ${HOME}/tools/esp ] ; then
+    echo "ESP not installed!" >/dev/stderr
+    return 1
+  fi
+  export PATH="${PATH}:${HOME}/tools/esp/xtensa-esp32-elf/bin"
+  export IDF_PATH="${HOME}/tools/esp/esp-idf"
+}

packages

@@ -36,6 +36,7 @@ python-scapy
 python-virtualenv
 python-yara
 python3
+python3-pip
 python3-virtualenv
 radare2
 scapy

packages.kali

@@ -1 +1,2 @@
 volatility
+bettercap