Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updated a few things for new laptop
  • Loading branch information
z0mbix committed Mar 6, 2013
1 parent 69dfc8c commit 0faae20
Show file tree
Hide file tree
Showing 7 changed files with 80 additions and 67 deletions.
3 changes: 3 additions & 0 deletions .bashrc
Expand Up @@ -97,6 +97,9 @@ PS1=${lt_blue}'\u'${norm}'@'${HOSTCOLOUR}'\h '${norm}'['${green}'\@'${norm}'] '$
# /opt/local/{bin,sbin}?
[ -d /opt/local/bin ] && PATH=$PATH:/opt/local/bin:/opt/local/sbin

# Omnibus Chef?
[ -d /opt/chef/bin ] && PATH=$PATH:/opt/chef/bin

# Suck up those aliases
[ -f ~/.bash/aliases ] && . ~/.bash/aliases

Expand Down
2 changes: 1 addition & 1 deletion .conkyrc
Expand Up @@ -13,7 +13,7 @@ gap_y 4

# --- Colours, Sizes, Fonts & Margins --- #
update_interval 2.0
minimum_size 400
minimum_size 400
#stippled_borders 3
#border_margin 9
border_width 10
Expand Down
2 changes: 2 additions & 0 deletions .fluxbox/keys
Expand Up @@ -48,8 +48,10 @@ Control Mod1 m :RootMenu
Control Mod1 x :Close
Control Mod1 c :Minimize
Control Mod1 z :ExecCommand urxvt
Control Mod1 v :ExecCommand gvim
Control Mod1 Right :NextWorkspace
Control Mod1 Left :PrevWorkspace
Control Mod1 Space :ExecCommand fbrun



Expand Down
125 changes: 63 additions & 62 deletions .fluxbox/menu
@@ -1,68 +1,69 @@
# Generated by fluxbox-generate_menu
#
# If you read this it means you want to edit this file manually, so here
# are some useful tips:
#
# - You can add your own menu-entries to ~/.fluxbox/usermenu
#
# - If you miss apps please let me know and I will add them for the next
# release.
#
# - The -r option prevents removing of empty menu entries and lines which
# makes things much more readable.
#
# - To prevent any other app from overwriting your menu
# you can change the menu name in .fluxbox/init to:
# session.menuFile: /home/you/.fluxbox/my-menu
[begin] ()
[exec] (Terminal) {urxvt}
[exec] (Chrome) {google-chrome}
[exec] (Editor) {gnome-text-editor}
[exec] (Vim) {gvim}
[exec] (File Manager) {nautilus --no-desktop}

[submenu] (Net)
[exec] (Epiphany) {epiphany}
[exec] (Chrome) {google-chrome}
[exec] (Firefox) {firefox}
[exec] (IM) {empathy}
[exec] (VNC/RDP Client) {remmina}
#[exec] (VNC Server) {/usr/lib/vino/vino-server}
[end]
[exec] (Terminal) {urxvt}
[exec] (Gnome Terminal) {gnome-terminal}
[exec] (Chrome) {google-chrome}
[exec] (GEdit) {gnome-text-editor}
[exec] (Sublime Text 2) {/opt/sublimetext2/sublime_text}
[exec] (Vim) {gvim}
[exec] (File Manager) {nautilus --no-desktop}
[exec] (Rhythmbox) {rhythmbox}

[submenu] (Multimedia)
[exec] (GIMP) {gimp}
[exec] (VLC) {vlc}
[exec] (Rhythmbox) {rhythmbox}
#[exec] (Gnome MPlayer) {gnome-mplayer}
[end]
[submenu] (Net)
[exec] (Epiphany) {epiphany}
[exec] (Chrome) {google-chrome}
[exec] (Firefox) {firefox}
[exec] (Empathy) {empathy}
[exec] (Skype) {skype}
[exec] (VPN) {/usr/local/bin/qikea}
[exec] (VNC/RDP Client) {remmina}
[exec] (Virtualbox) {virtualbox}
[exec] (VNC Server) {/usr/lib/vino/vino-server}
[exec] (OpenXenManager) {/usr/bin/openxenmanager}
[exec] (System Monitor) {gnome-system-monitor}
[exec] (Apache Directory Studio) {/opt/apache-directory-studio/ApacheDirectoryStudio}
[exec] (AeroFS) {/usr/bin/aerofs-gui}
[end]

[submenu] (Tools)
[exec] (Window name) {xprop WM_CLASS|cut -d \" -f 2|xmessage -file - -center}
[exec] (Screenshot) {scrot -d 5 screenshot-'%Y-%m-%d'.png -e 'mv $f ~/Dropbox/Images/Screenshots/'}
[exec] (Reload .Xdefaults) {xrdb -load ~/.Xdefaults}
[end]
[submenu] (Multimedia)
[exec] (Ario) {ario}
[exec] (Sonata) {sonata}
[exec] (Rhythmbox) {rhythmbox}
[exec] (GIMP) {gimp}
[exec] (VLC) {vlc}
[exec] (Google Music Uploader) {google-musicmanager}
[end]

[submenu] (Power)
[exec] (Shutdown) {sudo shutdown -ph now}
[exec] (Reboot) {sudo shutdown -r now}
[exec] (Lock screen) {gnome-screensaver-command -l}
[end]
[submenu] (Tools)
[exec] (Window name) {xprop WM_CLASS|cut -d \" -f 2|xmessage -file - -center}
[exec] (Gnome Control Centre) {gnome-control-center}
[exec] (Conky) {pkill conky; conky}
[exec] (Guake) {guake}
[exec] (Screenshot) {scrot -d 5 screenshot-'%Y-%m-%d'.png -e 'mv $f ~/Dropbox/Images/Screenshots/'}
[exec] (Reload .Xdefaults) {xrdb -load ~/.Xdefaults}
[end]

[submenu] (fluxbox menu)
[config] (Configure)
[submenu] (System Styles) {Choose a style...}
[stylesdir] (/usr/share/fluxbox/styles)
[end]
[submenu] (User Styles) {Choose a style...}
[stylesdir] (~/.fluxbox/styles)
[end]
[workspaces] (Workspace List)
[commanddialog] (Fluxbox Command)
[reconfig] (Reload config)
[restart] (Restart)
[exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) 2> /dev/null | xmessage -file - -center}
[separator]
[exit] (Exit)
[end]
[end]
[submenu] (Power)
[exec] (Shutdown) {sudo shutdown -Ph now}
[exec] (Reboot) {sudo shutdown -r now}
[exec] (Lock screen) {gnome-screensaver-command -l}
[end]

[submenu] (fluxbox menu)
[config] (Configure)
[submenu] (System Styles) {Choose a style...}
[stylesdir] (/usr/share/fluxbox/styles)
[end]
[submenu] (User Styles) {Choose a style...}
[stylesdir] (~/.fluxbox/styles)
[end]
[workspaces] (Workspace List)
[commanddialog] (Fluxbox Command)
[reconfig] (Reload config)
[restart] (Restart)
[exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) 2> /dev/null | xmessage -file - -center}
[separator]
[exit] (Exit)
[end]

[end]
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -3,5 +3,6 @@
.DS_Store
.vim/.netrwhist
compare_git_to_home.sh
compare_file.sh
.bash/private
.zsh/private
12 changes: 8 additions & 4 deletions .gvimrc
@@ -1,9 +1,13 @@
"set guifont=Monaco:h12
set guifont=smoothansi
set guifont=Monaco\ 9
"set guifont=Inconsolata\ 11
"set guifont=smoothansi
"set guifont=terminus\ 9
set lines=48 columns=200
set lines=48 columns=180
set guioptions-=T " hide toolbar

"colorscheme z0mbix
set background=dark
colorscheme solarized
set guioptions=egmt

colorscheme molokai
"
2 changes: 2 additions & 0 deletions .zsh/aliases
Expand Up @@ -27,9 +27,11 @@ alias rake="noglob rake"
alias code='cd ~/Dropbox/Code'
alias work='cd ~/Dropbox/Documents/Work/ComQi'
alias dotfiles='cd ~/Dropbox/Configs/dotfiles'
alias serenade='~/Dropbox/Projects/Serenade'
alias pwgen='pwgen -1 -B'
alias virsh='virsh -c qemu+ssh://quinn.vaughan.zombix.org/system\?socket=/var/run/libvirt/libvirt-sock'
alias serve_cwd='python -m SimpleHTTPServer'
alias vim='gvim'

# Git stuff
alias find_git_repos='find ~ -type d -name ".git" -print|egrep -v "$HOME/Library|$HOME/.Trash"'
Expand Down

0 comments on commit 0faae20

Please sign in to comment.