Merge branch 'master' of http://nas.afterdark.lan/git/tadgy/dotfiles-tadgy

.bashrc

@@ -34,7 +34,7 @@ _PLATFORM="$(uname -s)"
 if [ "$_PLATFORM" = "Linux" ]; then
   # Linux specific aliases.
   hash ftpwho >/dev/null 2>&1 && alias ftpwho='ftpwho -v'
-  hash iftop >/dev/null 2>&1 && alias iftop='iftop -c'
+  hash iftop >/dev/null 2>&1 && alias iftop='TERM=vt100 iftop'
   hash last less >/dev/null 2>&1 && alias laston='last -a | less'
   hash ls >/dev/null 2>&1 && alias ls='ls -bFv --color=auto'
   hash lynx >/dev/null 2>&1 && alias lynx='lynx -cfg=~/.lynx.cfg -lss=~/.lynx.lss'
@@ -64,5 +64,4 @@ hash diff >/dev/null 2>&1 && alias diff='diff -u'
 hash egrep >/dev/null 2>&1 && alias egrep='egrep --color=auto'
 hash fgrep >/dev/null 2>&1 && alias fgrep='fgrep --color=auto'
 hash grep >/dev/null 2>&1 && alias grep='grep --color=auto'
-hash ls >/dev/null 2>&1 && alias ll='ls -al'
 hash screen >/dev/null 2>&1 && alias screen='screen -Ua'

.inputrc

@@ -1,3 +1,7 @@
+# Enable coloured tab-completion.
+set colored-completion-prefix on
+set colored-stats on
+
 # Enable 8 bit input.
 set input-meta on
 set output-meta on

.local/share/applications/firefox-default.desktop

@@ -0,0 +1,25 @@
+[Desktop Entry]
+Version=1.0
+Name=Firefox (Default)
+Comment=Browse the World Wide Web
+GenericName=Web Browser
+Keywords=Internet;WWW;Browser;Web;Explorer
+Exec=firefox -P default %u
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=firefox
+Categories=GNOME;GTK;Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
+StartupNotify=true
+Actions=NewWindow;NewPrivateWindow;
+
+[Desktop Action NewWindow]
+Name=Open a New Window
+Exec=firefox -P default -new-window
+OnlyShowIn=Unity;
+
+[Desktop Action NewPrivateWindow]
+Name=Open a New Private Window
+Exec=firefox -P default -private-window
+OnlyShowIn=Unity;

.local/share/applications/firefox-tor.desktop

@@ -0,0 +1,25 @@
+[Desktop Entry]
+Version=1.0
+Name=Firefox (Tor)
+Comment=Browse the World Wide Web
+GenericName=Web Browser
+Keywords=Internet;WWW;Browser;Web;Explorer
+Exec=firefox -P tor %u
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=firefox
+Categories=GNOME;GTK;Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
+StartupNotify=true
+Actions=NewWindow;NewPrivateWindow;
+
+[Desktop Action NewWindow]
+Name=Open a New Window
+Exec=firefox -P tor -new-window
+OnlyShowIn=Unity;
+
+[Desktop Action NewPrivateWindow]
+Name=Open a New Private Window
+Exec=firefox -P tor -private-window
+OnlyShowIn=Unity;

.nanorc

@@ -20,75 +20,27 @@
 ## versions of nano installed (e.g. your home directory is on NFS).
 set quiet
 
+## When soft line wrapping is enabled, make it wrap lines at blank characters.
+set atblanks
+
 ## Use auto-indentation.
 # set autoindent
 
-## Back up files to the current filename plus a tilde.
-# set backup
-
-## The directory to put unique backup files in.
-# set backupdir ""
-
-## Do backwards searches by default.
-# set backwards
-
-## Use bold text instead of reverse video text.
-# set boldtext
-
-## The characters treated as closing brackets when justifying
-## paragraphs.  They cannot contain blank characters.  Only closing
-## punctuation, optionally followed by closing brackets, can end
-## sentences.
-# set brackets ""')>]}"
-
 ## Do case-sensitive searches by default.
 # set casesensitive
 
-## Constantly display the cursor position in the statusbar.  Note that
-## this overrides "quickblank".
-# set constantshow
-## (The old form, 'const', is deprecated.)
-
-## Use cut-to-end-of-line by default.
-# set cut
-
 ## Set the line length for wrapping text and justifying paragraphs.
-## If the value is 0 or less, the wrapping point will be the screen
-## width less this number.
 set fill -2
 
 ## Remember the used search/replace strings for the next session.
 set historylog
 
-## Have the justify command kill whitespace at the end of lines
+## Display line numbers to the left of the text area.
-# set justifytrim
+# set linenumbers
 
-## Enable vim-style lock-files.  This is just to let a vim user know you
+## Enable vim-style lock-files.
-## are editing a file [s]he is trying to edit and vice versa. There are
-## no plans to implement vim-style undo state in these files.
 set locking
 
-## The opening and closing brackets that can be found by bracket
-## searches.  They cannot contain blank characters.  The former set must
-## come before the latter set, and both must be in the same order.
-# set matchbrackets "(<[{)>]}"
-
-## Use the blank line below the titlebar as extra editing space.
-# set morespace
-
-## Enable mouse support, if available for your system.  When enabled,
-## mouse clicks can be used to place the cursor, set the mark (with a
-## double click), and execute shortcuts.  The mouse will work in the X
-## Window System, and on the console when gpm is running.
-# set mouse
-
-## Switch on multiple file buffers (inserting a file will put it into
-## a separate buffer).
-# set multibuffer
-
-## Don't convert files from DOS/Mac format.
-# set noconvert
-
 ## Don't display the helpful shortcut lists at the bottom of the screen.
 set nohelp
 
@@ -98,51 +50,13 @@ set nohelp
 ## Don't wrap text at all.
 set nowrap
 
-## Set operating directory.  nano will not read or write files outside
+## Do quick statusbar blanking.
-## this directory and its subdirectories.  Also, the current directory
-## is changed to here, so any files are inserted from this dir.  A blank
-## string means the operating-directory feature is turned off.
-# set operatingdir ""
-
-## Remember the cursor position in each file for the next editing session.
-# set positionlog
-## (The old form, 'poslog', is deprecated.)
-
-## Preserve the XON and XOFF keys (^Q and ^S).
-# set preserve
-
-## The characters treated as closing punctuation when justifying
-## paragraphs.  They cannot contain blank characters.  Only closing
-## punctuation, optionally followed by closing brackets, can end
-## sentences.
-# set punct "!.?"
-
-## Do quick statusbar blanking.  Statusbar messages will disappear after
-## 1 keystroke instead of 26.  Note that "const" overrides this.
 set quickblank
 
-## The email-quote string, used to justify email-quoted paragraphs.
-## This is an extended regular expression if your system supports them,
-## otherwise a literal string.
-## If you have extended regular expression support, the default is:
-# set quotestr "^([ 	]*[#:>\|}])+"
-## Otherwise:
-# set quotestr "> "
-
-## Fix Backspace/Delete confusion problem.
-# set rebinddelete
-
-## Fix numeric keypad key confusion problem.
-# set rebindkeypad
-
 ## Do extended regular expression searches by default.
 # set regexp
 
-## Make the Home key smarter.  When Home is pressed anywhere but at the
+## Make the Home key smarter.
-## very beginning of non-whitespace characters on a line, the cursor
-## will jump to that beginning (either forwards or backwards).  If the
-## cursor is already at that position, it will jump to the true
-## beginning of the line.
 # set smarthome
 
 ## Use smooth scrolling as the default.
@@ -151,33 +65,12 @@ set quickblank
 ## Enable soft line wrapping (AKA full-line display).
 # set softwrap
 
-## Use this spelling checker instead of the internal one.  This option
+## Use this spelling checker instead of the internal one.
-## does not properly have a default value.
 # set speller "aspell -x -c"
 
 ## Allow nano to be suspended.
 set suspend
 
-## Use this tab size instead of the default; it must be greater than 0.
-# set tabsize 8
-
-## Convert typed tabs to spaces.
-# set tabstospaces
-
-## Save automatically on exit; don't prompt.
-# set tempfile
-
-## Disallow file modification.  Why would you want this in an rcfile? ;)
-# set view
-
-## The two single-column characters used to display the first characters
-## of tabs and spaces.  187 in ISO 8859-1 (0000BB in Unicode) and 183 in
-## ISO-8859-1 (0000B7 in Unicode) seem to be good values for these.
-## The default when in a UTF-8 locale:
-# set whitespace "»·"
-## The default otherwise:
-# set whitespace ">."
-
 ## Detect word boundaries more accurately by treating punctuation
 ## characters as parts of words.
 # set wordbounds
@@ -185,60 +78,20 @@ set suspend
 
 ## Paint the interface elements of nano.
 ## This is an example; by default there are no colors.
-set titlecolor brightmagenta,black
+set errorcolor brightwhite,magenta
-set statuscolor brightwhite,magenta
+set functioncolor magenta
-set keycolor magenta
+set keycolor brightwhite
-set functioncolor brightwhite
+set numbercolor magenta
+set selectedcolor brightwhite,magenta
+set statuscolor brightmagenta
+set titlecolor brightmagenta
 
 
-## Setup of syntax coloring.
+## Include all existing syntax highlight definitions.
-##
-## Format:
-##
-## syntax "short description" ["filename regex" ...]
-##
-## The "none" syntax is reserved; specifying it on the command line is
-## the same as not having a syntax at all.  The "default" syntax is
-## special: it takes no filename regexes, and applies to files that
-## don't match any other syntax's filename regexes.
-##
-## color foreground,background "regex" ["regex"...]
-## or
-## icolor foreground,background "regex" ["regex"...]
-##
-## "color" will do case-sensitive matches, while "icolor" will do
-## case-insensitive matches.
-##
-## Valid colors: white, black, red, blue, green, yellow, magenta, cyan.
-## For foreground colors, you may use the prefix "bright" to get a
-## stronger highlight.
-##
-## To use multi-line regexes, use the start="regex" end="regex"
-## [start="regex" end="regex"...] format.
-##
-## If your system supports transparency, not specifying a background
-## color will use a transparent color.  If you don't want this, be sure
-## to set the background color to black or white.
-##
-## All regexes should be extended regular expressions.
-##
-## If you wish, you may put your syntax definitions in separate files.
-## You can make use of such files as follows:
-##
-## include "/path/to/syntax_file.nanorc"
-##
-## Unless otherwise noted, the name of the syntax file (without the
-## ".nanorc" extension) should be the same as the "short description"
-## name inside that file.  These names are kept fairly short to make
-## them easier to remember and faster to type using nano's -Y option.
-##
-## To include all existing syntax definitions, you can do:
 include "/usr/share/nano/*.nanorc"
 
 
 ## Key bindings.
-## See nanorc(5) (section REBINDING KEYS) for more details on this.
-##
 ## The following five functions are not bound to any key by default.
 ## You may wish to choose different keys than the ones suggested here.
 # bind ^S savefile main
@@ -246,6 +99,5 @@ include "/usr/share/nano/*.nanorc"
 # bind M-W findnext main
 # bind M-B cutwordleft main
 # bind M-N cutwordright main
-
 ## Set this if your Backspace key sends Del most of the time.
 # bind Del backspace all

.ssh/authorized_keys

@@ -1 +1,2 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCtsRUCRcju+l1TrfwGQ/PCcXBwN8bTCcmS0PYbdu13XJQ9DijTZsU7m2k8pi2fFU0VG5+C57i4FhkV3J7Ngpu0XDM4CPuoq2agRTEMXZlHu0aO8mEaPBli5oEkx/m1yinL0FapDfxMkeLDp3eHL0Gw2I0G6Kg8j4jl0pz4uYPLrrMbcWgEin+ijUE71lRXXJ2U6whCFBz991XDTkyX9a3CMAKIjYq0qTMyBGWUzHVNVPCXXa1bcK6Jj6jlkW1oowfccof3mDtm5Tef54pFAWS6yYSM+XkmCStknDInKI/fL54LnH6PZxEz2wdRXArMNk80gNyzLbOqEddnaoTaSowTIcXOUyzMrgyf/c2WZp9Ss05kgt6e+sTFqEREt1oslGP8s2rtvhRCyAaQM0X5TutqycLeNbm7duKmb4FuYvRqbi6ECqrUZ5roz5ushrtEvUY74xmo3Wt5/6piDV7VTCLUqNJNcB+rPFLG+LYUS+G1w4HZGXXgIERcHHDdvt4LQm0= Darren 'Tadgy' Austin <darren@afterdark.org.uk>
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICsx4EY4vbDt0TXGZsW9UjOxj+s/mVeytJ7lW5rAu0gS Darren 'Tadgy' Austin <darren@afterdark.org.uk>

.ssh/config

@@ -1,8 +1,6 @@
 Host phil lil tommy
   ForwardAgent			yes
-#  ForwardX11			yes
   ForwardX11Trusted		yes
-  HostName			%h.afterdark.lan
 
 Host bender bender.open-source.co.uk
   ForwardAgent			yes
@@ -30,7 +28,6 @@ Host *
   # ControlPath			~/.ssh/%u@%l->%r@%h:%p
   # ControlPersist		7200
   ExitOnForwardFailure		yes
-  ForwardX11Trusted		no
   SendEnv			LANG LC_* TERM
   # StrictHostKeyChecking	no
   # VerifyHostKeyDNS		yes