ansible/playbooks/setup.yml

@@ -4,54 +4,54 @@
   vars_files:
     - ../ansible-packages.yml
   vars:
-    DOTFILES: "$HOME/.dotfiles"
+    DOTFILES: '$HOME/.dotfiles'
 
   tasks:
     - name: Install required system packages (debian)
       apt:
         install_recommends: no
         update_cache: yes
-        pkg: "{{ packages + packages_debian }}"
+        pkg: '{{ packages + packages_debian }}'
       when: ansible_facts['os_family'] == "Debian"
 
-    - name: Install required system packages (arch)
+    - name: Install required system packages (debian)
       pacman:
         update_cache: yes
-        name: "{{ packages + packages_archlinux }}"
+        name: '{{ packages + packages_archlinux }}'
       when: ansible_facts['os_family'] == "Archlinux"
 
     - name: dotfiles repo
       git:
         repo: https://git.decapod.one/brethil/dotfiles
-        dest: "{{ DOTFILES }}"
+        dest: '{{ DOTFILES }}'
         version: master
       when: local_development is not defined
 
     - name: directories
       file:
-        dest: "{{ item }}"
+        dest: '{{ item }}'
         state: directory
         mode: 0700
-      loop: "{{ directories }}"
+      loop: '{{ directories }}'
       vars:
         directories:
-          - "$HOME/bin"
+          - '$HOME/bin'
-          - "$HOME/projects"
+          - '$HOME/projects'
-          - "$HOME/git"
+          - '$HOME/git'
-          - "$HOME/.config/git"
+          - '$HOME/.config/git'
 
     - name: antibody # TODO: antibody is available on apt(debian)/brew/pacman
       shell: |
         set -euo pipefail
         curl -sfL https://git.io/antibody | sh -s - -b $HOME/bin/
-        $HOME/bin/antibody bundle "{{ DOTFILES }}/antibody_plugins.txt"
+        /opt/homebrew/bin/antibody bundle "{{ DOTFILES }}/antibody_plugins.txt"
       args:
         executable: /bin/bash
         creates: /usr/local/bin/antibody
 
     - name: zsh as default shell
       user:
-        name: "{{ ansible_user }}"
+        name: '{{ ansible_user }}'
         shell: /usr/bin/zsh
 
     - name: zsh config
@@ -61,23 +61,22 @@
         block: |
           export DOTFILES={{ DOTFILES }}
           source $DOTFILES/brethil_dotfile.sh
-        create: true
 
     - name: dotfiles symlink
       file:
-        src: "{{ DOTFILES }}/{{ item.key }}"
+        src: '{{ DOTFILES }}/{{ item.key }}'
-        dest: "{{ item.value }}"
+        dest: '{{ item.value }}'
         state: link
         force: yes
-      loop: "{{ files | dict2items }}"
+      loop: '{{ files | dict2items }}'
       vars:
         files:
-          "tmux.conf": "~/.tmux.conf"
+          'tmux.conf': '~/.tmux.conf'
-          "vim/vimrc": "~/.vimrc"
+          'vim/vimrc': '~/.vimrc'
-          "pdbrc.py": "~/.pdbrc.py"
+          'pdbrc.py': '~/.pdbrc.py'
           # "ipython": "~/.ipython" # FIXME: ipython config is more complex
-          "ansible/ansible.cfg": "~/.ansible.cfg"
+          'ansible/ansible.cfg': '~/.ansible.cfg'
-          "gitignore": "~/.config/git/ignore"
+          'gitignore': '~/.git/config/ignore'
 
     - name: check undodir_migration
       stat: path=${HOME}/.vim_runtime/temp_dirs/undodir
@@ -93,16 +92,16 @@
 
     - name: git config facts
       community.general.git_config:
-        name: "include.path"
+        name: 'include.path'
         scope: global
       register: config_value
     - debug:
-        msg: "Git config include.path={{ config_value }}"
+        msg: 'Git config include.path={{ config_value }}'
 
     - name: git config
       community.general.git_config:
-        name: "include.path"
+        name: 'include.path'
-        value: "{{ DOTFILES }}/gitconfig"
+        value: '{{ DOTFILES }}/gitconfig'
         scope: global
       when: config_value is not defined
 
@@ -110,7 +109,7 @@
       copy:
         src: ../../gitignore
         dest: ~/.gitignore
-        mode: "0600"
+        mode: '0600'
         backup: yes
 
     - name: annoyances

vim/shortcuts.vim

@@ -61,8 +61,7 @@ nnoremap <leader>\ :0Git<CR>
 nnoremap <leader>d :Gvdiffsplit<CR>
 nnoremap <leader>b :Git blame<CR>
 nnoremap <leader>gp :Git push<CR>
-nnoremap <leader>gl :Commits<CR>
+nnoremap <leader>gl :vert Git log %<CR>
-nnoremap <leader>gL :BCommits<CR>
 nnoremap <leader>gc :Git commit<CR>
 nnoremap <leader>gpf :Git push --force-with-lease<CR>