Merge branch 'master' of urbainvaes.com:git/dotfiles

7 files changed, 264 insertions, 33 deletions

diff --git a/.dunstrc b/.dunstrc
new file mode 100644
index 0000000..3fcc5be
--- /dev/null
+++ b/.dunstrc
@@ -0,0 +1,245 @@
+[global]
+    font = Monospace 8
+    
+    # Allow a small subset of html markup:
+    #   <b>bold</b>
+    #   <i>italic</i>
+    #   <s>strikethrough</s>
+    #   <u>underline</u>
+    # 
+    # For a complete reference see
+    # <http://developer.gnome.org/pango/stable/PangoMarkupFormat.html>.
+    # If markup is not allowed, those tags will be stripped out of the
+    # message.
+    allow_markup = yes
+    
+    # The format of the message.  Possible variables are:
+    #   %a  appname
+    #   %s  summary
+    #   %b  body
+    #   %i  iconname (including its path)
+    #   %I  iconname (without its path)
+    #   %p  progress value if set ([  0%] to [100%]) or nothing
+    # Markup is allowed
+    format = "<b>%s</b>\n%b"
+    
+    # Sort messages by urgency.
+    sort = yes
+    
+    # Show how many messages are currently hidden (because of geometry).
+    indicate_hidden = yes
+    
+    # Alignment of message text.
+    # Possible values are "left", "center" and "right".
+    alignment = left
+    
+    # The frequency with wich text that is longer than the notification
+    # window allows bounces back and forth.
+    # This option conflicts with "word_wrap".
+    # Set to 0 to disable.
+    bounce_freq = 0
+    
+    # Show age of message if message is older than show_age_threshold
+    # seconds.
+    # Set to -1 to disable.
+    show_age_threshold = 60
+    
+    # Split notifications into multiple lines if they don't fit into
+    # geometry.
+    word_wrap = yes
+    
+    # Ignore newlines '\n' in notifications.
+    ignore_newline = no
+    
+    
+    # The geometry of the window:
+    #   [{width}]x{height}[+/-{x}+/-{y}]
+    # The geometry of the message window.
+    # The height is measured in number of notifications everything else
+    # in pixels.  If the width is omitted but the height is given
+    # ("-geometry x2"), the message window expands over the whole screen
+    # (dmenu-like).  If width is 0, the window expands to the longest
+    # message displayed.  A positive x is measured from the left, a
+    # negative from the right side of the screen.  Y is measured from
+    # the top and down respectevly.
+    # The width can be negative.  In this case the actual width is the
+    # screen width minus the width defined in within the geometry option.
+    geometry = "300x5-30+20"
+    
+    # Shrink window if it's smaller than the width.  Will be ignored if
+    # width is 0.
+    shrink = no
+    
+    # The transparency of the window.  Range: [0; 100].
+    # This option will only work if a compositing windowmanager is
+    # present (e.g. xcompmgr, compiz, etc.).
+    transparency = 0
+    
+    # Don't remove messages, if the user is idle (no mouse or keyboard input)
+    # for longer than idle_threshold seconds.
+    # Set to 0 to disable.
+    idle_threshold = 120
+    
+    # Which monitor should the notifications be displayed on.
+    monitor = 0
+    
+    # Display notification on focused monitor.  Possible modes are:
+    #   mouse: follow mouse pointer
+    #   keyboard: follow window with keyboard focus
+    #   none: don't follow anything
+    # 
+    # "keyboard" needs a windowmanager that exports the
+    # _NET_ACTIVE_WINDOW property.
+    # This should be the case for almost all modern windowmanagers.
+    # 
+    # If this option is set to mouse or keyboard, the monitor option
+    # will be ignored.
+    follow = mouse
+    
+    # Should a notification popped up from history be sticky or timeout
+    # as if it would normally do.
+    sticky_history = yes
+    
+    # Maximum amount of notifications kept in history
+    history_length = 20
+    
+    # Display indicators for URLs (U) and actions (A).
+    show_indicators = yes
+    
+    # The height of a single line.  If the height is smaller than the
+    # font height, it will get raised to the font height.
+    # This adds empty space above and under the text.
+    line_height = 0
+    
+    # Draw a line of "separatpr_height" pixel height between two
+    # notifications.
+    # Set to 0 to disable.
+    separator_height = 2
+    
+    # Padding between text and separator.
+    padding = 8
+    
+    # Horizontal padding.
+    horizontal_padding = 8
+    
+    # Define a color for the separator.
+    # possible values are:
+    #  * auto: dunst tries to find a color fitting to the background;
+    #  * foreground: use the same color as the foreground;
+    #  * frame: use the same color as the frame;
+    #  * anything else will be interpreted as a X color.
+    separator_color = frame
+    
+    # Print a notification on startup.
+    # This is mainly for error detection, since dbus (re-)starts dunst
+    # automatically after a crash.
+    startup_notification = false
+    
+    # dmenu path.
+    dmenu = /usr/bin/dmenu -p dunst:
+    
+    # Browser for opening urls in context menu.
+    browser = /usr/bin/firefox -new-tab
+
+    # Align icons left/right/off
+    icon_position = off
+
+    # Paths to default icons.
+    icon_folders = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
+
+[frame]
+    width = 3
+    color = "#aaaaaa"
+
+[shortcuts]
+
+    # Shortcuts are specified as [modifier+][modifier+]...key
+    # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2",
+    # "mod3" and "mod4" (windows-key).
+    # Xev might be helpful to find names for keys.
+    
+    # Close notification.
+    close = ctrl+space
+    
+    # Close all notifications.
+    close_all = ctrl+shift+space
+    
+    # Redisplay last message(s).
+    # On the US keyboard layout "grave" is normally above TAB and left
+    # of "1".
+    history = ctrl+grave
+    
+    # Context menu.
+    context = ctrl+shift+period
+
+[urgency_low]
+    # IMPORTANT: colors have to be defined in quotation marks.
+    # Otherwise the "#" and following would be interpreted as a comment.
+    background = "#222222"
+    foreground = "#888888"
+    timeout = 10
+
+[urgency_normal]
+    background = "#285577"
+    foreground = "#ffffff"
+    timeout = 10
+
+[urgency_critical]
+    background = "#900000"
+    foreground = "#ffffff"
+    timeout = 0
+
+
+# Every section that isn't one of the above is interpreted as a rules to
+# override settings for certain messages.
+# Messages can be matched by "appname", "summary", "body", "icon", "category",
+# "msg_urgency" and you can override the "timeout", "urgency", "foreground",
+# "background", "new_icon" and "format".
+# Shell-like globbing will get expanded.
+#
+# SCRIPTING
+# You can specify a script that gets run when the rule matches by
+# setting the "script" option.
+# The script will be called as follows:
+#   script appname summary body icon urgency
+# where urgency can be "LOW", "NORMAL" or "CRITICAL".
+# 
+# NOTE: if you don't want a notification to be displayed, set the format
+# to "".
+# NOTE: It might be helpful to run dunst -print in a terminal in order
+# to find fitting options for rules.
+
+#[espeak]
+#    summary = "*"
+#    script = dunst_espeak.sh
+
+#[script-test]
+#    summary = "*script*"
+#    script = dunst_test.sh
+
+#[ignore]
+#    # This notification will not be displayed
+#    summary = "foobar"
+#    format = ""
+
+#[signed_on]
+#    appname = Pidgin
+#    summary = "*signed on*"
+#    urgency = low
+#
+#[signed_off]
+#    appname = Pidgin
+#    summary = *signed off*
+#    urgency = low
+#
+#[says]
+#    appname = Pidgin
+#    summary = *says*
+#    urgency = critical
+#
+#[twitter]
+#    appname = Pidgin
+#    summary = *twitter.com*
+#    urgency = normal
+#
+# vim: ft=cfg
diff --git a/.i3/config b/.i3/config
index 408336e..d0e9a54 100644
--- a/.i3/config
+++ b/.i3/config
@@ -181,6 +181,9 @@ bindsym XF86AudioMute exec amixer -D pulse sset Master 0%
 bindsym XF86MonBrightnessUp exec light -A 10
 bindsym XF86MonBrightnessDown exec light -U 10
 
+# Disable touchpad
+bindsym XF86AudioPlay exec $HOME/bin/touchpad
+
 # font pango:DejaVu Sans Mono 10
 bindsym F1 exec --no-startup-id feh --bg-fill --randomize /usr/share/backgrounds
 bindsym $mod+semicolon exec --no-startup-id $HOME/bin/run
diff --git a/.mbsyncrc b/.mbsyncrc
index ac61e81..9945cdc 100644
--- a/.mbsyncrc
+++ b/.mbsyncrc
@@ -1,4 +1,5 @@
 Create Both
+Expunge Both
 SyncState *
 
 IMAPAccount Main
diff --git a/.vim/vimrc b/.vim/vimrc
index 059e600..36b0c4f 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -39,7 +39,7 @@ Plug 'tpope/vim-surround'
 Plug 'tpope/vim-unimpaired'
 Plug 'tpope/vim-vinegar'
 Plug 'troydm/zoomwintab.vim'
-Plug 'Valloric/YouCompleteMe', { 'do' : './install.py --clang-completer' }
+Plug 'Valloric/YouCompleteMe', { 'do' : 'python2 install.py --clang-completer' }
 call plug#end()
 
 let g:vimtex_fold_enabled=0
diff --git a/.zsh/aliases b/.zsh/aliases
index 86ab2a9..8f9e340 100644
--- a/.zsh/aliases
+++ b/.zsh/aliases
@@ -1,22 +1,7 @@
 #!/bin/zsh
 
-# Apps for filetypes
-alias -s vim=$EDITOR
-alias -s cpp=$EDITOR
-alias -s c=$EDITOR
-alias -s tex=$EDITOR
-alias -s pdf=zathura
-
 # Directories
-alias books='cd ~/Dropbox/phd/books'
 alias cdd='cd ~/dotfiles'
-alias papers='cd ~/Dropbox/phd/papers'
-alias report='cd ~/Dropbox/phd/reports/9\ months'
-alias u='cd ~/Dropbox/phd'
-alias uc='cd ~/Dropbox/phd/programs'
-alias ul='cd ~/Dropbox/phd/literature'
-alias up='cd ~/Dropbox/phd/presentations'
-alias ur='cd ~/Dropbox/phd/reports'
 
 # Commands
 alias a='vifm . .'
@@ -24,29 +9,15 @@ alias c='clear'
 alias ca='printf "\ec"'
 alias g='git'
 alias m='mutt'
-alias mail='offlineimap -u quiet &'
 alias mc='make clean'
 alias mca='make clean-all'
 alias n='nvim'
-alias pushs='git push --recurse-submodules=check'
 alias v='vim'
 alias vims="vim -S Session.vim"
 alias vimtex='vim -S Session.vim --servername SYNC'
-alias x='sh ~/.xmodmap'
 alias youtube='mpsyt'
 alias notes='vim ~/dotfiles/.notes'
 
-# Configuration
-alias em="$EDITOR ~/.mutt/muttrc"
-alias en="$EDITOR ~/.nvimrc"
-alias eo="$EDITOR ~/.offlineimaprc"
-alias et="$EDITOR ~/.tmux.conf"
-alias ev="$EDITOR ~/.vimrc"
-alias evi="$EDITOR ~/.vifm/vifmrc"
-alias ex="$EDITOR ~/.xmodmap"
-alias ez="$EDITOR ~/.zshrc"
-alias eza="$EDITOR ~/.zathurarc"
-
 # Tmux
 alias son="tmux set -g status on"
 alias soff="tmux set -g status off"
diff --git a/bin/touchpad b/bin/touchpad
new file mode 100755
index 0000000..17649fa
--- /dev/null
+++ b/bin/touchpad
@@ -0,0 +1,9 @@
+#! /usr/bin/env bash
+
+# Touchpad status
+status=$(synclient -l | grep TouchpadOff)
+if [[ $status = *1 ]]; then
+    synclient TouchpadOff=0
+elif [[ $status = *0 ]]; then
+    synclient TouchpadOff=1
+fi
diff --git a/install.yaml b/install.yaml
index fa93411..b2e883c 100644
--- a/install.yaml
+++ b/install.yaml
@@ -1,6 +1,6 @@
 # Commands to install / uninstall symlinks
 commands:
-    up: rm -rf {target} && ln -s {path}/{file} {target}
+    up: rm -rf {target} && mkdir -p $(dirname {target}) && ln -s {path}/{file} {target}
     down: rm -rf {target}
 
 
@@ -13,8 +13,11 @@ default:
     - .inputrc
     - .latexmkrc
     - .mbsyncrc
+    - .mutt
+    - .msmtprc
     - .ncmpcpp
     - .surfraw.bookmarks
+    - .tmux.conf
     - .urxvt
     - .vim
     - .vifm
@@ -24,12 +27,11 @@ default:
 
 # Special targets
 special:
+    .dunstrc: ~/.config/dunst/dunstrc
     .i3/config: ~/.config/i3/config
     .i3/i3status.conf: ~/.config/i3status/config
     .mr/mrconfig: ~/.mrconfig
     .mr/mrtrust: ~/.mrtrust
-    .msmtprc: ~/.msmptprc
-    .tmux.conf: ~/.tmux.conf
     .vim/vimrc: ~/.vimrc
     .uzbl: ~/.config/uzbl
     .uzbl/bookmarks: ~/.local/share/uzbl/bookmarks