Merge branch 'master' of github.com:bixel/dotfiles

.gitignore

@@ -5,3 +5,4 @@ atom/blob-store/
 atom/compile-cache/
 atom/storage/
 atom/packages/
+tags

ctags

@@ -1 +1,5 @@
 -I noexcept
+
+--langdef=bib
+--langmap=bib:.bib
+--regex-bib=/^@[A-Za-z]+\{([^,]*)/\1/b,bib/

gitignore_global

@@ -40,3 +40,4 @@ Thumbs.db
 # Development remnants #
 ########################
 env/
+tags

install

@@ -11,4 +11,8 @@ BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 cd "${BASEDIR}"
 git submodule update --init --recursive "${DOTBOT_DIR}"
 
-"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}"
+"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}"
+
+if [[ -n "${@}" ]]; then
+     "${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "install_${@}.conf.yaml"
+fi

install.conf.yaml

@@ -3,7 +3,6 @@
 - shell:
     - [git submodule update --init --recursive, Installing submodules]
     - ["mkdir -p ~/.config/nvim/{backup,swap,undo}", Creating nvim backup dirs]
-    - [defaults write com.apple.loginwindow LoginHook osx_startup_script.sh, setup login hook to remap keys]
 
 - link:
     ~/.dotfiles: ''
@@ -12,6 +11,7 @@
     ~/.zshrc: zshrc
     ~/.tmux.conf: tmux.conf
     ~/.clang-format: clang-format
+    ~/.ctags: ctags
     ~/.config/flake8: flake8
     ~/.config/nvim/init.vim: nvimrc
     ~/.config/nvim/after/ftplugin:
@@ -27,7 +27,6 @@
     ~/.zprezto:
         relink: true
         path: external/prezto/
-    /usr/local/bin/syncIgnore: scripts/syncIgnore
     ~/.ssh/rc: sshrc
     ~/.atom:
         relink: true

install_arch.conf.yaml

@@ -0,0 +1,2 @@
+- link:
+    ~/.xinitrc: xinitrc

install_osx.conf.yaml

@@ -0,0 +1,10 @@
+- shell:
+    -
+      command: sudo defaults read com.apple.loginwindow || sudo defaults write com.apple.loginwindow LoginHook $PWD/osx_startup_script.sh && sudo ./osx_startup_script.sh
+      description: setup login hook to remap keys
+      stderr: true
+      stout: true
+      stin: true
+
+- link:
+    /usr/local/bin/syncIgnore: scripts/syncIgnore

nvimrc

@@ -5,7 +5,9 @@ Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
 Plug 'zchee/deoplete-jedi'
 Plug 'zchee/deoplete-clang'
 Plug 'majutsushi/tagbar'
+Plug 'ludovicchabant/vim-gutentags'
 Plug 'scrooloose/nerdtree'
+Plug 'Xuyuanp/nerdtree-git-plugin'
 Plug 'tpope/vim-fugitive'
 Plug 'airblade/vim-gitgutter'
 Plug 'mhinz/vim-startify'
@@ -26,7 +28,6 @@ Plug 'lervag/vimtex'
 Plug 'ap/vim-css-color'
 Plug 'mattn/emmet-vim'
 Plug 'ctrlpvim/ctrlp.vim'
-"Plug 'scrooloose/nerdcommenter'
 Plug 'tpope/vim-commentary'
 Plug 'pangloss/vim-javascript'
 Plug 'easymotion/vim-easymotion'
@@ -111,15 +112,6 @@ set backupdir=~/.config/nvim/backup//
 set directory=~/.config/nvim/swap//
 set undodir=~/.config/nvim/undo//
 
-" YCM Configuration
-" dont use python-mode autocomplete obsolete now, because of YCM
-let g:ycm_filetype_whitelist = {'cpp': 1, 'py': 1, 'python': 1, 'arduino': 1, 'js': 1}
-" set ycm_extra_conf
-let g:ycm_global_ycm_extra_conf = '~/.ycm.py'
-" turn off the ycm diagnostic because of struggling with root
-let g:ycm_autoclose_preview_window_after_insertion = 1
-let g:ycm_autoclose_preview_window_after_completion = 1
-
 " NERDTree Configuration
 " hide some fileextenxions
 let NERDTreeIgnore = ['\.pyc$']

osx_startup_script.sh

@@ -1,3 +1,5 @@
+#! /bin/bash
+
 hidutil property --set '{
     "UserKeyMapping": [
         {

xinitrc

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+
+    xrdb -merge $sysresources
+
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+
+    xrdb -merge "$userresources"
+
+fi
+
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+# start some nice programs
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+ for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+  [ -x "$f" ] && . "$f"
+ done
+ unset f
+fi
+
+twm &
+xclock -geometry 50x50-1+1 &
+xterm -geometry 80x50+494+51 &
+xterm -geometry 80x20+494-0 &
+exec xterm -geometry 80x66+0+0 -name login
+# exec gnome-session
+
+# user-defined stuff
+setxkbmap -option caps:swapescape

zshrc

@@ -34,7 +34,7 @@ printable-code()
   echo $doc | pandoc -o "$name.$oformat"
 }
 
-# mount a remote's ($1) host dir ($2) at /MountPoint/$1
+# mount a remote's ($1) host dir ($2) at $3/$2 or ~/mounts/$2 if $3 is not set
 mountremote () {
   # set the root mount dir
   mountroot="${3:-$HOME/mounts}";
@@ -45,6 +45,8 @@ mountremote () {
   fi
   mkdir -p $mountroot
   sshfs $1:$2 "$mountroot/$mountpoint" -o auto_cache,reconnect,volname=$mountpoint,no_readahead,noappledouble,nolocalcaches
+  unset mountroot
+  unset mountpoint
 }
 
 # use the symlinked ssh-auth-sock if available