diff --git a/bin/itunes.applescript b/bin/itunes.scpt old mode 100644 new mode 100755 similarity index 100% rename from bin/itunes.applescript rename to bin/itunes.scpt diff --git a/bin/mail.scpt b/bin/mail.scpt new file mode 100755 index 0000000..d18d753 --- /dev/null +++ b/bin/mail.scpt @@ -0,0 +1,65 @@ +#!/usr/bin/osascript +property defaultAccount : "Pollen" +property defaultMailbox : "INBOX" + +on run args + set justUnread to false + set theAccount to missing value + set theMailbox to missing value + + if defaultAccount = missing value then set defaultAccount to "-g" + if defaultMailbox = missing value then set defaultMailbox to "INBOX" + + set theCount to the count of args + + if theCount > 0 then + if item 1 of args = "-u" then + set justUnread to true + set theCount to theCount - 1 + set args to the rest of args + else if item 1 of args = "-ug" or item 1 of args = "-gu" then + set justUnread to true + set item 1 of args to "-g" + else if theCount > 1 and ¬ + item 1 of args = "-g" and item 2 of args = "-u" then + set justUnread to true + set theCount to theCount - 1 + set args to the rest of args + set item 1 of args to "-g" + end if + end if + + tell application "Mail" + if theCount = 0 then + set theAccount to defaultAccount + set theMailbox to defaultMailbox + else if theCount = 1 then + set theAccount to item 1 of args + set theMailbox to defaultMailbox + else if theCount = 2 then + set theAccount to item 1 of args + set theMailbox to item 2 of args + else + error character id 10 ¬ + & "Usage: inbox-count [-u] [[account] mailbox]" & character id 10 ¬ + & " inbox-count [-u] -g [mailbox]" + end if + + set mailboxValue to missing value + if theAccount = "-g" then + if theMailbox = "INBOX" then + set mailboxValue to inbox + else + set mailboxValue to mailbox theMailbox + end if + else + set mailboxValue to mailbox theMailbox of account theAccount + end if + + if justUnread then + return the unread count of mailboxValue + else + return the count of messages of mailboxValue + end if + end tell +end run diff --git a/bin/rdio.applescript b/bin/rdio.scpt old mode 100644 new mode 100755 similarity index 100% rename from bin/rdio.applescript rename to bin/rdio.scpt diff --git a/bin/spotify.applescript b/bin/spotify.scpt old mode 100644 new mode 100755 similarity index 100% rename from bin/spotify.applescript rename to bin/spotify.scpt diff --git a/tmux/tmux.conf.symlink b/tmux/tmux.conf.symlink index 15d813d..70650c4 100644 --- a/tmux/tmux.conf.symlink +++ b/tmux/tmux.conf.symlink @@ -101,7 +101,7 @@ bind -t vi-copy 'y' copy-selection #### COLOUR # default statusbar colors -set-option -g status-bg colour234 +set-option -g status-bg colour232 set-option -g status-fg colour26 set-option -g status-attr default @@ -120,7 +120,7 @@ set-option -g pane-border-fg colour245 set-option -g pane-active-border-fg colour240 # message text -set-option -g message-bg colour234 +set-option -g message-bg colour232 set-option -g message-fg colour26 # pane number display @@ -134,23 +134,23 @@ set-window-option -g clock-mode-colour colour26 #### Plugins ##### ################## -# current Spotify track -spotify_track='#[fg=colour2]#(osascript ~/.dotfiles/bin/spotify.applescript)' -# current iTunes track -itunes_track='#[fg=colour27]#(osascript ~/.dotfiles/bin/itunes.applescript)' -# current Rdio track -rdio_track='#[fg=colour127]#(osascript ~/.dotfiles/bin/rdio.applescript)' +tm_spotify_track='#[fg=colour2]#(osascript ~/.dotfiles/bin/spotify.scpt)' +tm_itunes_track='#[fg=colour27]#(osascript ~/.dotfiles/bin/itunes.scpt)' +tm_rdio_track='#[fg=colour127]#(osascript ~/.dotfiles/bin/rdio.scpt)' tm_date='#[fg=colour245] %R %d %b' -tm_host='#[fg=colour198,bg=colour234,bold]#h' +tm_host='#[fg=colour198,bg=colour232,bold]#h' +tm_session_name='#[fg=colour198,bg=colour232,bold] ❤ #S' +tm_mail='#[fg=colour196,bold]✉ #(~/.dotfiles/bin/mail.scpt -ug)' set -g status-left-length 32 set -g status-right-length 150 -set -g status-interval 20 -set -g window-status-format "#[fg=colour239,bg=colour234] #I #W " +set -g status-interval 5 +set -g window-status-format "#[fg=colour239,bg=colour232] #I #W " -set -g window-status-current-format "#[fg=colour234,bg=colour26]#[fg=colour16,bg=colour26,noreverse,bold] #I #W #[fg=colour26,bg=colour234,nobold]" -set -g status-left '#[fg=colour198,bg=colour234,bold] #S' -set -g status-right $itunes_track' '$spotify_track' '$tm_date' '$tm_host +# set -g window-status-current-format "#[fg=colour232,bg=colour26]#[fg=colour16,bg=colour26,noreverse,bold] #I #W #[fg=colour26,bg=colour232,nobold]" +set -g window-status-current-format "#[fg=colour232,bg=colour26]#[fg=colour16,bg=colour26,noreverse,bold] #I #W #[fg=colour26,bg=colour232,nobold]" +set -g status-left $tm_session_name +set -g status-right $tm_itunes_track' '$tm_spotify_track' '$tm_mail' '$tm_date' '$tm_host diff --git a/vim/vim.symlink/colors/ir_black.vim b/vim/vim.symlink/colors/ir_whack.vim similarity index 100% rename from vim/vim.symlink/colors/ir_black.vim rename to vim/vim.symlink/colors/ir_whack.vim diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink index 11af46c..219c222 100644 --- a/vim/vimrc.symlink +++ b/vim/vimrc.symlink @@ -114,7 +114,7 @@ set tm=500 syntax on set background=dark -colorscheme smyck +colorscheme ir_whack " set number " show line numbers set relativenumber " show relative line numbers