ncftp

9 files changed, 29 insertions, 76 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index c0a87cd..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,71 +0,0 @@
-.Xauthority
-.abook/
-.aptitude/
-.bash*
-.cache
-.calendars/
-.ccache
-.clamz/amzfiles/
-.clamz/cookies
-.config/gtk-2.0/gtkfilechooser.ini
-.config/libimobiledevice/
-.config/vdirsyncer/
-.contacts/
-.fontconfig/
-.forward
-.gem/
-.gitconfig
-.gnuplot_history
-.imapfilter/
-.irssi/config.autosave
-.lesshst
-.links/
-.local
-.mail/
-.moc/cache
-.moc/equalizer
-.moc/last_directory
-.moc/pid
-.moc/playlist.m3u
-.moc/softmixer
-.msmtprc
-.mutt/tmp/
-.my.cnf
-.mysql_history
-.ncftp/
-.net_profiles/
-.netrc
-.newsbeuter/cache.db
-.newsbeuter/cache.db.lock
-.newsbeuter/history.cmdline
-.newsbeuter/history.search
-.newsbeuter/queue
-.newsbeuter/urls
-.notmuch-config
-.offlineimap/
-.offlineimaprc
-.pki/
-.pry_history
-.pythonhist
-.python_history
-.q3a/
-.qmail*
-.ratpoison_history
-.serverauth.*
-.ssh/
-.subversion/README.txt
-.subversion/auth/
-.subversion/servers
-.texmf/
-.trc
-.urxvt/
-.vacation.db
-.vdirsyncer/
-.vim/spell/
-.viminfo
-.vim/.netrwhist
-.zcompdump
-.zshistory
-.zshrcp
-[^.]*
-
diff --git a/.gitmodules b/.gitmodules
index 2d755f6..3eb4b41 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,9 @@
 [submodule ".vim/bundle/tagbar"]
 	path = vim/.vim/bundle/tagbar
 	url = https://github.com/majutsushi/tagbar.git
+[submodule "urxvt/.urxvt/urxvt-perls"]
+	path = urxvt/.urxvt/urxvt-perls
+	url = git://github.com/muennich/urxvt-perls.git
+[submodule "urxvt/.urxvt/urxvt-tabbedex"]
+	path = urxvt/.urxvt/urxvt-tabbedex
+	url = git://github.com/stepb/urxvt-tabbedex.git
diff --git a/X/.Xdefaults b/X/.Xdefaults
index 0fac0ee..1e4ecd4 100644
--- a/X/.Xdefaults
+++ b/X/.Xdefaults
@@ -23,9 +23,7 @@ Xft.antialias: true
 Xft.rgba: rgb
 Xft.hinting: true
 Xft.hintstyle: hintslight
-#URxvt*font:     xft:MonteCarlo:pixelsize=11:style=regular:antialias=false,xft:Inconsolata Powerline:pixelsize=11
 URxvt*font:     xft:Tamsyn:pixelsize=16:style=regular:antialias=false,xft:Inconsolata Powerline:pixelsize=16
-#URxvt*boldFont: xft:MonteCarlo:pixelsize=11:style=bold:antialias=false,xft:Inconsolata Powerline:pixelsize=11
 URxvt*boldFont: xft:Tamsyn:pixelsize=16:style=bold:antialias=false,xft:Inconsolata Powerline:pixelsize=16
 
 /* change default colors */
diff --git a/mozilla/.mozilla/firefox/profiles.ini b/mozilla/.mozilla/firefox/profiles.ini
index a7e6bf7..8330f4e 100644
--- a/mozilla/.mozilla/firefox/profiles.ini
+++ b/mozilla/.mozilla/firefox/profiles.ini
@@ -10,5 +10,5 @@ Default=1
 [Profile1]
 Name=dev-edition-default
 IsRelative=1
-Path=pks.dev-edition-default
+Path=pks.default
 
diff --git a/ncftp/.ncftp/prefs_v3 b/ncftp/.ncftp/prefs_v3
new file mode 100644
index 0000000..595ea0f
--- /dev/null
+++ b/ncftp/.ncftp/prefs_v3
@@ -0,0 +1,21 @@
+# NcFTP 3 preferences file
+# This file is loaded and overwritten each time NcFTP is run.
+#
+anon-password=NcFTP@
+auto-ascii=|.txt|.asc|.html|.htm|.css|.xml|.ini|.pl|.hqx|.cfg|.c|.h|.cpp|.hpp|.bat|.m3u|.pls|
+auto-resume=no
+autosave-bookmark-changes=no
+confirm-close=no
+connect-timeout=20
+control-timeout=135
+logsize=10240
+one-time-messages-seen=
+pager=/usr/bin/less
+passive=optional
+progress-meter=2 (statbar)
+redial-delay=20
+save-passwords=ask
+show-status-in-xterm-titlebar=no
+so-bufsize=0 (use system default)
+xfer-timeout=3600
+yes-i-know-about-NcFTPd=no
diff --git a/urxvt/.urxvt/urxvt-perls b/urxvt/.urxvt/urxvt-perls
new file mode 160000
+Subproject 7cc64be09250a508013e1f31886d5198f765978
diff --git a/urxvt/.urxvt/urxvt-tabbedex b/urxvt/.urxvt/urxvt-tabbedex
new file mode 160000
+Subproject 49c1514b218d222560600e6f20955389287ac6b
diff --git a/vim/.vim/autoload/pathogen.vim b/vim/.vim/autoload/pathogen.vim
deleted file mode 120000
index a202405..0000000
--- a/vim/.vim/autoload/pathogen.vim
+++ /dev/null
@@ -1 +0,0 @@
-../bundle/pathogen/autoload/pathogen.vim
\ No newline at end of file
diff --git a/zsh/.zshrc b/zsh/.zshrc
index ad6a22c..6bff89e 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -168,7 +168,7 @@ alias hibernate='suspend'
 alias reboot='sudo shutdown -r now'
 alias halt='sudo shutdown -h now'
 alias lock='slock'
-alias demoterm="urxvt -fn 'xft:courier:pixelsize=16' -fg #000000 -bg #ffffff"
+alias demoterm="urxvt -fn 'xft:Tamsyn:pixelsize=18' -fg #000000 -bg #ffffff"
 alias fwup='sudo ifconfig firewire0 192.168.166.100 up'
 alias gunzip='pigz -d'
 alias fastltx='pdflatex -interaction=batchmode --shell-escape -parse-first-line'