Improve install script

9 files changed, 69 insertions, 81 deletions

diff --git a/.i3/config b/.i3/config
index 2a75b68..53d1fe0 100644
--- a/.i3/config
+++ b/.i3/config
@@ -27,7 +27,7 @@ font pango:DejaVu Sans Mono 8
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec i3-sensible-terminal
+bindsym $mod+Return exec --no-startup-id i3-sensible-terminal
 
 # kill focused window
 bindsym $mod+d kill
@@ -109,8 +109,8 @@ bindsym $mod+Shift+plus move container to workspace number 9
 bindsym $mod+Shift+bracketright move container to workspace number 10
 
 # Keybindings for create and move
-bindsym $mod+n exec workspace n
-bindsym $mod+m exec workspace m
+bindsym $mod+n exec --no-startup-id workspace n
+bindsym $mod+Shift+n exec --no-startup-id workspace m
 
 # reload the configuration file
 bindsym $mod+Shift+c reload
@@ -157,8 +157,8 @@ bindsym $mod+comma workspace prev
 bindsym $mod+period workspace next
 
 # Programs shortcuts
-bindsym $mod+b exec uzbl-browser
-bindsym $mod+at exec chromium-browser
+bindsym $mod+b exec --no-startup-id uzbl-browser
+bindsym $mod+i exec --no-startup-id vimin
 
 # Configuration
 # bindsym F1 exec $HOME/.xinitrc
diff --git a/.mr/mrconfig b/.mr/mrconfig
index 33ea339..95f874e 100644
--- a/.mr/mrconfig
+++ b/.mr/mrconfig
@@ -1,24 +1,24 @@
-[dotfiles]
+[.]
 checkout = git clone 'git@github.com:uvaes/dotfiles' 'dotfiles'
 
-[dotfiles/.personal]
+[.personal]
 checkout = git clone 'git@github.com:uvaes/personal' '.personal'
 
-[dotfiles/.vim/vim-plug]
+[.vim/vim-plug]
 checkout = git clone 'https://github.com/junegunn/vim-plug' 'vim-plug'
 skip = [ "$1" = push ]
 
-[dotfiles/.mutt/solarized]
+[.mutt/solarized]
 checkout = git clone 'https://github.com/altercation/mutt-colors-solarized' 'solarized'
 skip = [ "$1" = push ]
 
-[dotfiles/.zsh/zgen]
+[.zsh/zgen]
 checkout = git clone 'https://github.com/tarjoilija/zgen' 'zgen'
 skip = [ "$1" = push ]
 
-[dotfiles/.passwords]
+[.passwords]
 checkout = git clone 'urbain@urbainvaes.com:git/passwords.git' '.passwords'
 
-[dotfiles/.urxvt/ext]
+[.urxvt/ext]
 checkout = git clone 'https://github.com/muennich/urxvt-perls' 'ext'
 skip = [ "$1" = push ]
diff --git a/.mutt/muttrc b/.mutt/muttrc
index 3b413ec..8b48345 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -77,12 +77,12 @@ bind pager k previous-entry
 bind pager R group-reply
 
 # Hooks
-send-hook '~t .*@imperial\.ac\.uk$' 'source ~/.mutt/id_work'
-reply-hook '~t .*@imperial\.ac\.uk$' 'source ~/.mutt/id_work'
+# send-hook '~t .*@imperial\.ac\.uk$' 'source ~/.mutt/id_work'
+# reply-hook '~t .*@imperial\.ac\.uk$' 'source ~/.mutt/id_work'
 
 folder-hook 'Main*'     'source ~/.mutt/id_main'
 folder-hook 'Informal*' 'source ~/.mutt/id_informal'
-folder-hook 'Personal*'  'source ~/.mutt/id_personal'
+folder-hook 'Personal*' 'source ~/.mutt/id_personal'
 folder-hook 'Work*'     'source ~/.mutt/id_work'
 
 # Source mutt solarized
diff --git a/.uzbl/config b/.uzbl/config
index 436f73f..23d07ea 100644
--- a/.uzbl/config
+++ b/.uzbl/config
@@ -439,7 +439,9 @@ sync_spawn_exec @scripts_dir/load_cookies.sh
 sync_spawn_exec @scripts_dir/load_cookies.sh @data_home/uzbl/session-cookies.txt
 
 # Set the "home" page.
-# set uri = google.co.uk
+set uri = ""
+
+@cbind  <Ctrl>e = event SET_CURSOR_POS -1
 
 @on_event DOWNLOAD_COMPLETE spawn @scripts_dir/downloadviewer.sh %s
 # vim: set fdm=syntax:
diff --git a/bin/clean b/bin/clean
deleted file mode 100755
index 19a0455..0000000
--- a/bin/clean
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/bash
-dotdir=/home/urbain/dotfiles && cd $dotdir
-for file in `ls -A --ignore="Makefile" --ignore="README.md" --ignore=".git*"`; do
-    if [[ -f $file/Makefile ]]; then
-        cd $file && make clean && cd $dotdir
-    else
-        rm -f $HOME/$file
-    fi
-done
diff --git a/bin/dot b/bin/dot
index 905e0c1..2e94da1 100755
--- a/bin/dot
+++ b/bin/dot
@@ -7,51 +7,49 @@ import yaml
 # Colors for terminal
 from termcolor import colored
 
-
 # Path of dotfiles
-dotpath = '/home/urbain/dotfiles'
+homepath = '/home/urbain'
+dotpath = homepath + '/dotfiles'
 
 # Load yaml configuration file
 with open(dotpath + "/install.yaml", 'r') as stream:
     config = yaml.load(stream)
 
-# Special symlinks
+# Special and default symlinks
 special_symlinks = set(config['special'].keys())
-
-# All files in dir
-normal_symlinks = set(os.listdir(dotpath)) - set(config['exclude'])
+normal_symlinks = set(config['default'])
 
 
 def perform(action):
 
-    # Command to execute
-    command = config['commands'][action]
-
     for f in special_symlinks | normal_symlinks:
 
         # Print filename
         print('[' + colored(f, 'green') + ']')
 
-        if f in config['pre']:
-            print(config['pre'][f])
-            os.system(config['pre'][f])
+        if f in config['pre'] and action == 'up':
+
+            # Format command
+            command = config['pre'][f]
+            formatted = command.format(file=f, path=dotpath)
+
+            # Print & execute
+            print(formatted)
+            os.system(formatted)
 
         # Target of symlink
         if f in special_symlinks:
             t = config['special'][f]
         elif f in normal_symlinks:
-            t = config['default'].format(file=f)
-
-        if t != "":
-            # Formatted command
-            formatted = command.format(file=f, path=dotpath, target=t)
+            t = homepath + '/' + f
 
-            # Print & execute command
-            print(formatted)
-            os.system(formatted)
+        # Command to execute
+        command = config['commands'][action]
+        formatted = command.format(file=f, path=dotpath, target=t)
 
-        else:
-            print("Nothing to do!")
+        # Print & execute command
+        print(formatted)
+        os.system(formatted)
 
         print('\n')
 
diff --git a/bin/install b/bin/install
deleted file mode 100755
index bc21136..0000000
--- a/bin/install
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/bash
-dotdir=/home/urbain/dotfiles && cd $dotdir
-for file in `ls -A --ignore="Makefile" --ignore="README.md" --ignore=".git*"`; do
-    if [[ -f $file/Makefile ]]; then
-        cd $file && make && cd $dotdir
-    else
-        rm -f $HOME/$file && ln -s $dotdir/$file $HOME/$file
-    fi
-done
diff --git a/bin/vimin b/bin/vimin
new file mode 100755
index 0000000..905b30f
--- /dev/null
+++ b/bin/vimin
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+tempfile=$(mktemp)
+urxvt -e vim ${tempfile}
+cat ${tempfile} | xclip -i
diff --git a/install.yaml b/install.yaml
index ee91571..21f2982 100644
--- a/install.yaml
+++ b/install.yaml
@@ -1,47 +1,49 @@
-exclude:
-    - '.personal'
-    - '.git'
-    - '.gitignore'
-    - 'install.yaml'
-    - 'README.md'
-
 # Commands to install / uninstall symlinks
 commands:
     up: rm -rf {target} && ln -s {path}/{file} {target}
     down: rm -rf {target}
 
-# Default target
-default: ~/{file}
+
+# Default targets
+default:
+    - bin
+    - .bashrc
+    - .gitconfig
+    - .git_template
+    - .inputrc
+    - .latexmkrc
+    - .ncmpcpp
+    - .surfraw.bookmarks
+    - .urxvt
+    - .vim
+    - .vifm
+    - .xinitrc
+    - .Xresources
+    - .zsh
 
 # Special targets
 special:
-
     .i3: ~/.config/i3
-
     .mr/mrconfig: ~/.mrconfig
     .mr/mrtrust: ~/.mrtrust
-
-    .offlineimap: ""
+    .msmtprc: ~/.msmptprc
     .offlineimap/offlineimaprc: ~/.offlineimaprc
     .offlineimap/offlineimap.py: ~/.offlineimap.py
-
-    .vim/.vimrc: ~/.vimrc
-    .zathurarc: ~/.config/zathura/zathurarc
-
-    .zsh/zgen: ~/.zgen
-    .zsh/zshrc: ~/.zshrc
-
+    .tmux.conf: ~/.tmux.conf
+    .vim/vimrc: ~/.vimrc
     .uzbl: ~/.config/uzbl
     .uzbl/bookmarks: ~/.local/share/uzbl/bookmarks
-
     .passwords: ~/.password-store
+    .zathurarc: ~/.config/zathura/zathurarc
+    .zsh/zgen: ~/.zgen
+    .zsh/zshrc: ~/.zshrc
 
 # Additional actions before symlink
 pre:
     .mutt: |
-        mkdir -p .mutt/temp
-        mkdir -p .mutt/cache
-        mkdir -p .mutt/bodies
+        mkdir -p {path}/.mutt/temp
+        mkdir -p {path}/.mutt/cache
+        mkdir -p {path}/.mutt/bodies
 
     .vim: |
-        mkdir -p .vim/vimundo
+        mkdir -p {path}/.vim/vimundo