Moving some parts around

network/git/gitconfig

@@ -1,47 +0,0 @@
-[user]
-	name = Thomas Lovén
-	email = thomasloven@gmail.com
-[credential]
-	helper = cache
-[color]
-	ui = auto
-	branch = auto
-	diff = auto
-	status = auto
-[color "branch"]
-	current = yellow reverse
-	local = yellow
-	remote = green
-[color "diff"]
-	meta = yellow
-	frag = magenta
-	old = red
-	new = green
-[color "status"]
-	added = yellow
-	changed = green
-	untracked = cyan
-
-[push]
-	default = current
-[core]
-	pager = less -F -X
-
-[alias]
-  st = status
-  ci = commit
-  co = checkout
-  di = diff
-  dc = diff --cached
-  wd = diff --word-diff=color
-  amend = commit --amend
-  aa = add --all
-  b = branch
-  updateall = submodule foreach 'git pull'
-  l = !prettygit
-  p = "!echo $PATH"
-  la = !git l --all
-  r = !git l -30
-  ra = !git r --all
-[merge]
-  tool = vimdiff

network/git/gitignore_global

@@ -1,38 +0,0 @@
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
-
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-
-*.log
-*.sql
-*.sqlite
-
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-Icon?
-ehthumbs.db
-Thumbs.db
-
-#Latex files
-*.aux
-*.bcf
-*.blg
-*.fdb_latexmk
-*.fls
-*.out
-
-tags

network/git/setup.sh

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-source ${DOTFILES}/helpers.sh
-
-function main()
-{
-  local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
-
-  print_info "Configuring git"
-
-  brewget git
-
-  if [ ! -f "${HOME}/.gitconfig" ]; then
-    cat << EOF > ${HOME}/.gitconfig
-[include]
-  path = ${scriptdir}/gitconfig
-[core]
-  excludesfile = ${scriptdir}/gitignore_global
-EOF
-  fi
-
-  print_ok "Git configured"
-}
-
-main "$@"

network/netscan

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+scans=`arp-scan -l | grep -E '^(\d{1,3}\.){3}\d{1,3}'| sort -n -t . -k 1,1 -k 2,2 -k 3,3 -k 4,4`
+
+
+while read -r line; do
+  items=($line)
+  ip=${items[0]}
+  mac=${items[1]}
+  vendor=${items[@]:2}
+  cmd="awk '\$1 == \"$mac\" { \$1=\"\"; print \$0 }' < ~/.config/mac-list"
+  name=$(eval $cmd)
+  echo "\\033[32m$ip}\\033[36m$mac}\\033[0m$name}[\\033[33m$vendor\\033[0m]"
+done <<< "$scans" |
+ columnize -t -s '}'
+

network/setup.sh

@@ -7,10 +7,14 @@ function main()
   local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
 
   ${scriptdir}/ssh/setup.sh
-  ${scriptdir}/git/setup.sh
   ${scriptdir}/NAS_mounts/setup.sh
 
   brewget arp-scan
+  brewget nmap
+
+  makedir ${HOME}/bin
+  linkfile ${scriptdir}/netscan ${HOME}/bin/netscan
+
 }
 
 main "$@"