diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-08-14 14:40:57 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-08-14 14:40:57 -0400 |
| commit | 0f235666059f48da7e4629037a2543e9ab4558e0 (patch) | |
| tree | 7490e5dc8a2e3847bc5302c1cad5a7250e862cdc | |
| parent | c2b60a1be6932872dfad6cd0b90d42794a634996 (diff) | |
| parent | 9b1cd870ad6968a79ca6ade38014a466290dbe9f (diff) | |
Merge branch 'thinkpenguin-par' of /home/luke/. into thinkpenguin-par
| -rw-r--r-- | .config/gtk-2.0/.gitignore | 1 | ||||
| -rw-r--r-- | .config/gtk-2.0/gtkfilechooser.ini | 12 | ||||
| -rw-r--r-- | .config/symlinks | 3 | ||||
| -rw-r--r-- | .gtkrc-2.0 | 2 | ||||
| -rw-r--r-- | .irbrc | 3 | ||||
| -rw-r--r-- | .profile.local | 5 | ||||
| -rw-r--r-- | .ssh/config | 18 |
7 files changed, 19 insertions, 25 deletions
diff --git a/.config/gtk-2.0/.gitignore b/.config/gtk-2.0/.gitignore new file mode 100644 index 0000000..67b1609 --- /dev/null +++ b/.config/gtk-2.0/.gitignore @@ -0,0 +1 @@ +gtkfilechooser.ini diff --git a/.config/gtk-2.0/gtkfilechooser.ini b/.config/gtk-2.0/gtkfilechooser.ini deleted file mode 100644 index 7cb92de..0000000 --- a/.config/gtk-2.0/gtkfilechooser.ini +++ /dev/null @@ -1,12 +0,0 @@ -[Filechooser Settings] -LastFolderUri=file:///home/luke -LocationMode=filename-entry -ShowHidden=false -ShowSizeColumn=true -GeometryX=287 -GeometryY=99 -GeometryWidth=792 -GeometryHeight=585 -SortColumn=name -SortOrder=ascending -StartupMode=recent diff --git a/.config/symlinks b/.config/symlinks index 3d87984..27b837d 100644 --- a/.config/symlinks +++ b/.config/symlinks @@ -11,13 +11,10 @@ .config/bazaar/ .bazaar .config/cpan/ .cpan .config/emacs/ .emacs.d -.config/gimp-2.6/ .gimp-2.6 -.config/gimp-2.8/ .gimp-2.8 .config/maildirproc/ .maildirproc .config/mozilla/ .mozilla # .config/mplayer/ .mplayer .config/nanorc .nanorc -.config/netbeans/ .netbeans .config/purple/ .purple .config/ssh/ .ssh # .config/subversion/ .subversion @@ -1,7 +1,7 @@ # DO NOT EDIT! This file will be overwritten by LXAppearance. # Any customization should be done in ~/.gtkrc-2.0.mine instead. -gtk-theme-name="Raleigh" +gtk-theme-name="oxygen-gtk" gtk-icon-theme-name="oxygen" gtk-font-name="Sans 10" gtk-cursor-theme-name="Vanilla-DMZ" @@ -1 +1,4 @@ require 'rubygems' unless defined? Gem # only needed in 1.8 +require 'irb/ext/save-history' +IRB.conf[:SAVE_HISTORY] = 1000 +IRB.conf[:HISTORY_FILE] = "#{ENV['HOME']}/.irb-save-history"
\ No newline at end of file diff --git a/.profile.local b/.profile.local index 4ee523a..25b322b 100644 --- a/.profile.local +++ b/.profile.local @@ -3,10 +3,9 @@ # Start background programs ########################################## if [ -x "`which daemon`" ]; then daemon -i maildirproc.att maildirproc - daemon -i maildirproc.purdue maildirproc -r .maildirproc/purdue.rc + daemon -i maildirproc.purdue maildirproc -r ~/.maildirproc/purdue.rc daemon batterymon 20 " - pactl set-sink-volume 0 100%; - pactl set-sink-mute 0 0; + amixer sset Master unmute 100%; espeak 'PLUG ME IN'; sleep .2;" fi diff --git a/.ssh/config b/.ssh/config index 63519e1..1debee4 100644 --- a/.ssh/config +++ b/.ssh/config @@ -4,12 +4,18 @@ Host * ControlPath ~/.ssh/master-%r@%h:%p Compression yes -# Parabola Repo Server -Host parabola - Port 1863 - HostName repo.parabolagnulinux.org - User repo - Host lore HostName lore.cs.purdue.edu User shumakl + +Host repo + Port 1863 + HostName repo.parabolagnulinux.org + +Host rshg054 + Port 1863 + HostName parabolagnulinux.org + +Host lukeshu + Port 1863 + HostName 199.180.255.147 |