diff --git a/aliases b/aliases index 9ebbe2a..ac76cf2 100644 --- a/aliases +++ b/aliases @@ -29,6 +29,8 @@ alias gp='git pull' alias gP='git push' alias ga='git add' alias fabric='fab -H $H' +alias pbc='pbcopy' +alias pbp='pbpaste' alias jbc='$JBOSS_HOME/bin/jboss-cli.sh -c $JBOSS_URL' title() { echo -ne "\e]0;$1\a" diff --git a/bashrc b/bashrc index 70f2de4..40c9b99 100644 --- a/bashrc +++ b/bashrc @@ -31,7 +31,8 @@ function __git_prompt { echo -en $P fi } -PS1='\[\e[1;31m\]\u\[\e[0m\]@\[\e[1;34m\]\h\[\e[0m\] [\[\e[0;37m\]\W\[\e[0m\]] $(__git_prompt)\n$ ' +#PS1='\[\e[1;31m\]\u\[\e[0m\]@\[\e[1;34m\]\h\[\e[0m\] [\[\e[0;37m\]\W\[\e[0m\]] $(__git_prompt)\n$ ' +PS1='[\[\e[1;31m\]\W\[\e[0m\]]$(__git_prompt)$ ' source ~/.aliases @@ -39,7 +40,6 @@ HISTSIZE=1000 export GOPATH="/usr/local/go" export PYTHONSTARTUP=~/.pythonrc.py -export PYTHONPATH=$PYTHONPATH:~/Workspace/lib export PATH=~/Workspace/bin:$GOPATH/bin:$PATH if [ -f ~/.bashlocal ]; then @@ -49,3 +49,4 @@ fi if [ -f ~/.todo ]; then cat ~/.todo fi +unset PYTHONPATH diff --git a/install.sh b/install.sh index e6f0a01..bfa22a1 100755 --- a/install.sh +++ b/install.sh @@ -36,7 +36,8 @@ function pysetup() { rm ~/.pythonrc.py fi ln -s $DOTFILES/pythonrc.py ~/.pythonrc.py - sudo pip3 install numpy scapy-python3 paramiko boto3 urllib3 netaddr PyYaml requests flask + sudo pip3 install numpy scapy-python3 paramiko boto3 urllib3 netaddr PyYaml requests flask unqlite + unqlite } function vimsetup() { diff --git a/pythonrc.py b/pythonrc.py index 3261fde..f84706a 100644 --- a/pythonrc.py +++ b/pythonrc.py @@ -13,6 +13,7 @@ import paramiko import xml.etree.ElementTree as ET import json +import csv import boto3 import requests import urllib3 @@ -22,6 +23,10 @@ from ctypes import * import numpy as np import heapq +import bz2 +import gzip +import sqlite3 +from unqlite import UnQlite #PS1 variable sys.ps1 = "$ " @@ -61,6 +66,13 @@ def save_history(histPath=histPath): region_name='us-west-1', aws_access_key_id='any', aws_secret_access_key='any') +#SQLite db +sdb = sqlite3.connect("main.db") +sdbc = sdb.cursor() + +#UnQlite db +udb = UnQlite("umain.db") + #Mylock def mylock(): subprocess.Popen('mylock') diff --git a/vimrc b/vimrc index 6a8068c..445c40b 100755 --- a/vimrc +++ b/vimrc @@ -67,7 +67,7 @@ Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'} Plugin 'fatih/vim-go' set background=dark -colorscheme solarized +colorscheme Benokai highlight LiteralTabs ctermbg=darkgreen guibg=darkgreen match LiteralTabs /\s\ / @@ -102,7 +102,7 @@ nmap :ConqueTermTab bash nmap :ConqueTermTab python3 nmap :TagbarToggle -nnoremap za +nnoremap za nnoremap :call compile_and_run()